diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-09-24 22:17:24 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-09-24 22:17:24 +0000 |
| commit | bcca22a25ae98f70c36fff6292f0a8fe4e578d89 (patch) | |
| tree | a18d382d32f471b7119b9b7b2782cec04d6da43f /src/sp-flowregion.cpp | |
| parent | Refactored SPUse. (diff) | |
| parent | Fix my email address through codebase (diff) | |
| download | inkscape-bcca22a25ae98f70c36fff6292f0a8fe4e578d89.tar.gz inkscape-bcca22a25ae98f70c36fff6292f0a8fe4e578d89.zip | |
Merged from trunk (r12588).
(bzr r11608.1.129)
Diffstat (limited to 'src/sp-flowregion.cpp')
| -rw-r--r-- | src/sp-flowregion.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/sp-flowregion.cpp b/src/sp-flowregion.cpp index 3a0aef6be..ed17f1948 100644 --- a/src/sp-flowregion.cpp +++ b/src/sp-flowregion.cpp @@ -188,14 +188,11 @@ Inkscape::XML::Node *SPFlowregion::write(Inkscape::XML::Document *xml_doc, Inksc return repr; } -gchar* SPFlowregion::description() { +const char* SPFlowregion::displayName() { // TRANSLATORS: "Flow region" is an area where text is allowed to flow - return g_strdup_printf(_("Flow region")); + return _("Flow Region"); } -/* - * - */ SPFlowregionExclude::SPFlowregionExclude() : SPItem() { this->computed = NULL; } @@ -338,18 +335,14 @@ Inkscape::XML::Node *SPFlowregionExclude::write(Inkscape::XML::Document *xml_doc return repr; } -gchar* SPFlowregionExclude::description() { +const char* SPFlowregionExclude::displayName() { /* TRANSLATORS: A region "cut out of" a flow region; text is not allowed to flow inside the * flow excluded region. flowRegionExclude in SVG 1.2: see * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegion-elem and * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegionExclude-elem. */ - return g_strdup_printf(_("Flow excluded region")); + return _("Flow Excluded Region"); } -/* - * - */ - static void UnionShape(Shape **base_shape, Shape const *add_shape) { if (*base_shape == NULL) |