i18n. Fix for Bug #1034663 (Split msgid "Text" for menu Effects).

Translations. inkscape.pot and French translation update.

(bzr r11606)

4 files changed, 27 insertions, 27 deletions

diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index cbce222e1..3d1b97b04 100644
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -65,7 +65,7 @@ type2term(GType type)
     if (type == SP_TYPE_BOX3D)
         { return _("3D Box"); }
     if (type == SP_TYPE_TEXT)
-        { return _("Text"); }
+        { return C_("Object", "Text"); }
     if (type == SP_TYPE_USE)
         // TRANSLATORS: "Clone" is a noun, type of object
         { return C_("Object", "Clone"); }
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 0237a5ca0..aab8ccc04 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -371,7 +371,7 @@ void InkscapePreferences::initPageTools()
     AddGradientCheckbox(_page_zoom, "/tools/zoom", false);
 
     //Measure
-    this->AddPage(_page_measure, C_("Measurement tool", "Measure"), iter_tools, PREFS_PAGE_TOOLS_MEASURE);
+    this->AddPage(_page_measure, C_("ContextVerb", "Measure"), iter_tools, PREFS_PAGE_TOOLS_MEASURE);
     PrefCheckButton* cb = Gtk::manage( new PrefCheckButton);
     cb->init ( _("Ignore first and last points"), "/tools/measure/ignore_1st_and_last", true);
     _page_measure.add_line( false, "", *cb, "", _("The start and end of the measurement tool's control line will not be considered for calculating lengths. Only lengths between actual curve intersections will be displayed."));
@@ -429,7 +429,7 @@ void InkscapePreferences::initPageTools()
                             _("If on, each newly created object will be selected (deselecting previous selection)"));
 
     //Text
-    this->AddPage(_page_text, _("Text"), iter_tools, PREFS_PAGE_TOOLS_TEXT);
+    this->AddPage(_page_text, C_("ContextVerb", "Text"), iter_tools, PREFS_PAGE_TOOLS_TEXT);
     this->AddSelcueCheckbox(_page_text, "/tools/text", true);
     this->AddGradientCheckbox(_page_text, "/tools/text", true);
     {
diff --git a/src/verbs.cpp b/src/verbs.cpp
index ae9e53cbe..7769a45f4 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2508,51 +2508,51 @@ Verb *Verb::_base_verbs[] = {
                  N_("Remove clipping path from selection"), NULL),
 
     // Tools
-    new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", N_("Select"),
+    new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", NC_("ContextVerb", "Select"),
                     N_("Select and transform objects"), INKSCAPE_ICON("tool-pointer")),
-    new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", N_("Node Edit"),
+    new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", NC_("ContextVerb", "Node Edit"),
                     N_("Edit paths by nodes"), INKSCAPE_ICON("tool-node-editor")),
-    new ContextVerb(SP_VERB_CONTEXT_TWEAK, "ToolTweak", N_("Tweak"),
+    new ContextVerb(SP_VERB_CONTEXT_TWEAK, "ToolTweak", NC_("ContextVerb", "Tweak"),
                     N_("Tweak objects by sculpting or painting"), INKSCAPE_ICON("tool-tweak")),
-    new ContextVerb(SP_VERB_CONTEXT_SPRAY, "ToolSpray", N_("Spray"),
+    new ContextVerb(SP_VERB_CONTEXT_SPRAY, "ToolSpray", NC_("ContextVerb", "Spray"),
                     N_("Spray objects by sculpting or painting"), INKSCAPE_ICON("tool-spray")),
-    new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", N_("Rectangle"),
+    new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", NC_("ContextVerb", "Rectangle"),
                     N_("Create rectangles and squares"), INKSCAPE_ICON("draw-rectangle")),
-    new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", N_("3D Box"),
+    new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", NC_("ContextVerb", "3D Box"),
                     N_("Create 3D boxes"), INKSCAPE_ICON("draw-cuboid")),
-    new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", N_("Ellipse"),
+    new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", NC_("ContextVerb", "Ellipse"),
                     N_("Create circles, ellipses, and arcs"), INKSCAPE_ICON("draw-ellipse")),
-    new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", N_("Star"),
+    new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", NC_("ContextVerb", "Star"),
                     N_("Create stars and polygons"), INKSCAPE_ICON("draw-polygon-star")),
-    new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", N_("Spiral"),
+    new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", NC_("ContextVerb", "Spiral"),
                     N_("Create spirals"), INKSCAPE_ICON("draw-spiral")),
-    new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", N_("Pencil"),
+    new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", NC_("ContextVerb", "Pencil"),
                     N_("Draw freehand lines"), INKSCAPE_ICON("draw-freehand")),
-    new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", N_("Pen"),
+    new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", NC_("ContextVerb", "Pen"),
                     N_("Draw Bezier curves and straight lines"), INKSCAPE_ICON("draw-path")),
-    new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligraphic", N_("Calligraphy"),
+    new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligraphic", NC_("ContextVerb", "Calligraphy"),
                     N_("Draw calligraphic or brush strokes"), INKSCAPE_ICON("draw-calligraphic")),
-    new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", N_("Text"),
+    new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", NC_("ContextVerb", "Text"),
                     N_("Create and edit text objects"), INKSCAPE_ICON("draw-text")),
-    new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", N_("Gradient"),
+    new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient",  NC_("ContextVerb", "Gradient"),
                     N_("Create and edit gradients"), INKSCAPE_ICON("color-gradient")),
-    new ContextVerb(SP_VERB_CONTEXT_MESH, "ToolMesh", N_("Mesh"),
+    new ContextVerb(SP_VERB_CONTEXT_MESH, "ToolMesh",  NC_("ContextVerb", "Mesh"),
                     N_("Create and edit meshes"), INKSCAPE_ICON("mesh-gradient")),
-    new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"),
+    new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom",  NC_("ContextVerb", "Zoom"),
                     N_("Zoom in or out"), INKSCAPE_ICON("zoom")),
-    new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", NC_("Measurement tool", "Measure"),
+    new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", NC_("ContextVerb", "Measure"),
                     N_("Measurement tool"), INKSCAPE_ICON("tool-measure")),
-    new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"),
+    new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", NC_("ContextVerb", "Dropper"),
                     N_("Pick colors from image"), INKSCAPE_ICON("color-picker")),
-    new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"),
+    new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", NC_("ContextVerb", "Connector"),
                     N_("Create diagram connectors"), INKSCAPE_ICON("draw-connector")),
-    new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", N_("Paint Bucket"),
+    new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", NC_("ContextVerb", "Paint Bucket"),
                     N_("Fill bounded areas"), INKSCAPE_ICON("color-fill")),
-    new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", N_("LPE Edit"),
+    new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", NC_("ContextVerb", "LPE Edit"),
                     N_("Edit Path Effect parameters"), NULL),
-    new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", N_("Eraser"),
+    new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", NC_("ContextVerb", "Eraser"),
                     N_("Erase existing paths"), INKSCAPE_ICON("draw-eraser")),
-    new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", N_("LPE Tool"),
+    new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", NC_("ContextVerb", "LPE Tool"),
                     N_("Do geometric constructions"), "draw-geometry"),
     // Tool prefs
     new ContextVerb(SP_VERB_CONTEXT_SELECT_PREFS, "SelectPrefs", N_("Selector Preferences"),
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 4d2fd4738..49eb82de7 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -599,7 +599,7 @@ Glib::RefPtr<VerbAction> VerbAction::create(Inkscape::Verb* verb, Inkscape::Verb
 }
 
 VerbAction::VerbAction(Inkscape::Verb* verb, Inkscape::Verb* verb2, Inkscape::UI::View::View *view) :
-    Gtk::Action(Glib::ustring(verb->get_id()), Gtk::StockID(verb->get_image()), Glib::ustring(_(verb->get_name())), Glib::ustring(_(verb->get_tip()))),
+    Gtk::Action(Glib::ustring(verb->get_id()), Gtk::StockID(verb->get_image()), Glib::ustring(g_dpgettext2(NULL, "ContextVerb", verb->get_name())), Glib::ustring(_(verb->get_tip()))),
     verb(verb),
     verb2(verb2),
     view(view),