Translation. More disambiguations (see Bug #832560).

Fixed bugs:
  - https://launchpad.net/bugs/832560

(bzr r11234)

6 files changed, 62 insertions, 42 deletions

diff --git a/po/fr.po b/po/fr.po
index 94af132ad..ac353d478 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inkscape\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-11 21:30+0200\n"
+"POT-Creation-Date: 2012-04-13 16:27+0200\n"
 "PO-Revision-Date: 2012-04-11 21:21+0100\n"
 "Last-Translator: Nicolas Dufour <nicoduf@yahoo.fr>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -5257,12 +5257,12 @@ msgid "nodeAsInXMLdialogTooltip|Delete node"
 msgstr "Supprimer le nœud"
 
 #: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:131
-#: ../src/ui/dialog/xml-tree.cpp:952
+#: ../src/ui/dialog/xml-tree.cpp:950
 msgid "Duplicate node"
 msgstr "Dupliquer le nœud"
 
 #: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:184
-#: ../src/ui/dialog/xml-tree.cpp:989
+#: ../src/ui/dialog/xml-tree.cpp:987
 msgid "Delete attribute"
 msgstr "Supprimer l’attribut"
 
@@ -5275,22 +5275,22 @@ msgid "Drag to reorder nodes"
 msgstr "Cliquer-déplacer pour réorganiser les nœuds"
 
 #: ../src/ui/dialog/xml-tree.cpp:145 ../src/ui/dialog/xml-tree.cpp:146
-#: ../src/ui/dialog/xml-tree.cpp:1110
+#: ../src/ui/dialog/xml-tree.cpp:1108
 msgid "Unindent node"
 msgstr "Désindenter le nœud"
 
 #: ../src/ui/dialog/xml-tree.cpp:150 ../src/ui/dialog/xml-tree.cpp:151
-#: ../src/ui/dialog/xml-tree.cpp:1088
+#: ../src/ui/dialog/xml-tree.cpp:1086
 msgid "Indent node"
 msgstr "Indenter le nœud"
 
 #: ../src/ui/dialog/xml-tree.cpp:155 ../src/ui/dialog/xml-tree.cpp:156
-#: ../src/ui/dialog/xml-tree.cpp:1039
+#: ../src/ui/dialog/xml-tree.cpp:1037
 msgid "Raise node"
 msgstr "Monter le nœud"
 
 #: ../src/ui/dialog/xml-tree.cpp:160 ../src/ui/dialog/xml-tree.cpp:161
-#: ../src/ui/dialog/xml-tree.cpp:1057
+#: ../src/ui/dialog/xml-tree.cpp:1055
 msgid "Lower node"
 msgstr "Descendre le nœud"
 
@@ -5321,35 +5321,35 @@ msgstr ""
 "Attribut <b>%s</b> sélectionné. Appuyer sur <b>Ctrl+Enter</b> après édition "
 "pour valider."
 
-#: ../src/ui/dialog/xml-tree.cpp:560
+#: ../src/ui/dialog/xml-tree.cpp:559
 msgid "Drag XML subtree"
 msgstr "Déplacer la sous-arborescence XML"
 
-#: ../src/ui/dialog/xml-tree.cpp:859
+#: ../src/ui/dialog/xml-tree.cpp:857
 msgid "New element node..."
 msgstr "Nouveau nœud élément..."
 
-#: ../src/ui/dialog/xml-tree.cpp:881
+#: ../src/ui/dialog/xml-tree.cpp:879
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/ui/dialog/xml-tree.cpp:887
+#: ../src/ui/dialog/xml-tree.cpp:885
 msgid "Create"
 msgstr "Créer"
 
-#: ../src/ui/dialog/xml-tree.cpp:918
+#: ../src/ui/dialog/xml-tree.cpp:916
 msgid "Create new element node"
 msgstr "Créer un nouveau nœud élément"
 
-#: ../src/ui/dialog/xml-tree.cpp:934
+#: ../src/ui/dialog/xml-tree.cpp:932
 msgid "Create new text node"
 msgstr "Créer un nouveau nœud texte"
 
-#: ../src/ui/dialog/xml-tree.cpp:970
+#: ../src/ui/dialog/xml-tree.cpp:968
 msgid "nodeAsInXMLinHistoryDialog|Delete node"
 msgstr "Supprimer le nœud"
 
-#: ../src/ui/dialog/xml-tree.cpp:1013
+#: ../src/ui/dialog/xml-tree.cpp:1011
 msgid "Change attribute"
 msgstr "Modifier l’attribut"
 
@@ -7781,8 +7781,6 @@ msgid "Narrow"
 msgstr "Étroit"
 
 #: ../src/extension/internal/filter/distort.h:81
-#: ../src/ui/widget/selected-style.cpp:170
-#: ../src/ui/widget/style-swatch.cpp:303
 msgid "No fill"
 msgstr "Aucun remplissage"
 
@@ -17231,7 +17229,7 @@ msgstr "Zoom"
 
 #. Measure
 #: ../src/ui/dialog/inkscape-preferences.cpp:366 ../src/verbs.cpp:2513
-#: ../share/extensions/measure.inx.h:23
+msgctxt "Measurement tool"
 msgid "Measure"
 msgstr "Mesurer"
 
@@ -21402,11 +21400,19 @@ msgstr "Aucune sélection"
 
 #: ../src/ui/widget/selected-style.cpp:167
 #: ../src/ui/widget/style-swatch.cpp:301
+msgctxt "Fill and stroke"
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
 #: ../src/ui/widget/selected-style.cpp:170
 #: ../src/ui/widget/style-swatch.cpp:303
+msgctxt "Fill and stroke"
+msgid "No fill"
+msgstr "Aucun remplissage"
+
+#: ../src/ui/widget/selected-style.cpp:170
+#: ../src/ui/widget/style-swatch.cpp:303
+msgctxt "Fill and stroke"
 msgid "No stroke"
 msgstr "Aucun contour"
 
@@ -29970,6 +29976,10 @@ msgstr "Longueur"
 msgid "Length Unit:"
 msgstr "Unité de longueur :"
 
+#: ../share/extensions/measure.inx.h:23
+msgid "Measure"
+msgstr "Mesurer"
+
 #: ../share/extensions/measure.inx.h:24
 msgid "Measure Path"
 msgstr "Mesurer un chemin"
diff --git a/po/inkscape.pot b/po/inkscape.pot
index 76373526e..d4d214f55 100644
--- a/po/inkscape.pot
+++ b/po/inkscape.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-11 21:30+0200\n"
+"POT-Creation-Date: 2012-04-13 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4974,12 +4974,12 @@ msgid "nodeAsInXMLdialogTooltip|Delete node"
 msgstr ""
 
 #: ../src/ui/dialog/xml-tree.cpp:73 ../src/ui/dialog/xml-tree.cpp:131
-#: ../src/ui/dialog/xml-tree.cpp:952
+#: ../src/ui/dialog/xml-tree.cpp:950
 msgid "Duplicate node"
 msgstr ""
 
 #: ../src/ui/dialog/xml-tree.cpp:79 ../src/ui/dialog/xml-tree.cpp:184
-#: ../src/ui/dialog/xml-tree.cpp:989
+#: ../src/ui/dialog/xml-tree.cpp:987
 msgid "Delete attribute"
 msgstr ""
 
@@ -4992,22 +4992,22 @@ msgid "Drag to reorder nodes"
 msgstr ""
 
 #: ../src/ui/dialog/xml-tree.cpp:145 ../src/ui/dialog/xml-tree.cpp:146
-#: ../src/ui/dialog/xml-tree.cpp:1110
+#: ../src/ui/dialog/xml-tree.cpp:1108
 msgid "Unindent node"
 msgstr ""
 
 #: ../src/ui/dialog/xml-tree.cpp:150 ../src/ui/dialog/xml-tree.cpp:151
-#: ../src/ui/dialog/xml-tree.cpp:1088
+#: ../src/ui/dialog/xml-tree.cpp:1086
 msgid "Indent node"
 msgstr ""
 
 #: ../src/ui/dialog/xml-tree.cpp:155 ../src/ui/dialog/xml-tree.cpp:156
-#: ../src/ui/dialog/xml-tree.cpp:1039
+#: ../src/ui/dialog/xml-tree.cpp:1037
 msgid "Raise node"
 msgstr ""
 
 #: ../src/ui/dialog/xml-tree.cpp:160 ../src/ui/dialog/xml-tree.cpp:161
-#: ../src/ui/dialog/xml-tree.cpp:1057
+#: ../src/ui/dialog/xml-tree.cpp:1055
 msgid "Lower node"
 msgstr ""
 
@@ -5034,35 +5034,35 @@ msgid ""
 "commit changes."
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:560
+#: ../src/ui/dialog/xml-tree.cpp:559
 msgid "Drag XML subtree"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:859
+#: ../src/ui/dialog/xml-tree.cpp:857
 msgid "New element node..."
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:881
+#: ../src/ui/dialog/xml-tree.cpp:879
 msgid "Cancel"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:887
+#: ../src/ui/dialog/xml-tree.cpp:885
 msgid "Create"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:918
+#: ../src/ui/dialog/xml-tree.cpp:916
 msgid "Create new element node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:934
+#: ../src/ui/dialog/xml-tree.cpp:932
 msgid "Create new text node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:970
+#: ../src/ui/dialog/xml-tree.cpp:968
 msgid "nodeAsInXMLinHistoryDialog|Delete node"
 msgstr ""
 
-#: ../src/ui/dialog/xml-tree.cpp:1013
+#: ../src/ui/dialog/xml-tree.cpp:1011
 msgid "Change attribute"
 msgstr ""
 
@@ -7428,8 +7428,6 @@ msgid "Narrow"
 msgstr ""
 
 #: ../src/extension/internal/filter/distort.h:81
-#: ../src/ui/widget/selected-style.cpp:170
-#: ../src/ui/widget/style-swatch.cpp:303
 msgid "No fill"
 msgstr ""
 
@@ -16250,7 +16248,7 @@ msgstr ""
 
 #. Measure
 #: ../src/ui/dialog/inkscape-preferences.cpp:366 ../src/verbs.cpp:2513
-#: ../share/extensions/measure.inx.h:23
+msgctxt "Measurement tool"
 msgid "Measure"
 msgstr ""
 
@@ -20087,11 +20085,19 @@ msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:167
 #: ../src/ui/widget/style-swatch.cpp:301
+msgctxt "Fill and stroke"
 msgid "<i>None</i>"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:170
 #: ../src/ui/widget/style-swatch.cpp:303
+msgctxt "Fill and stroke"
+msgid "No fill"
+msgstr ""
+
+#: ../src/ui/widget/selected-style.cpp:170
+#: ../src/ui/widget/style-swatch.cpp:303
+msgctxt "Fill and stroke"
 msgid "No stroke"
 msgstr ""
 
@@ -28178,6 +28184,10 @@ msgstr ""
 msgid "Length Unit:"
 msgstr ""
 
+#: ../share/extensions/measure.inx.h:23
+msgid "Measure"
+msgstr ""
+
 #: ../share/extensions/measure.inx.h:24
 msgid "Measure Path"
 msgstr ""
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 6d76f5784..b038ae60d 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -363,7 +363,7 @@ void InkscapePreferences::initPageTools()
     AddGradientCheckbox(_page_zoom, "/tools/zoom", false);
 
     //Measure
-    this->AddPage(_page_measure, _("Measure"), iter_tools, PREFS_PAGE_TOOLS_MEASURE);
+    this->AddPage(_page_measure, C_("Measurement tool", "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."));
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index faf518bbd..c81385dd7 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -164,10 +164,10 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
         _na[i].show_all();
         __na[i] = (_("Nothing selected"));
 
-        _none[i].set_markup (_("<i>None</i>"));
+        _none[i].set_markup (C_("Fill and stroke", "<i>None</i>"));
         sp_set_font_size_smaller (GTK_WIDGET(_none[i].gobj()));
         _none[i].show_all();
-        __none[i] = (i == SS_FILL)? (_("No fill")) : (_("No stroke"));
+        __none[i] = (i == SS_FILL)? (C_("Fill and stroke", "No fill")) : (C_("Fill and stroke", "No stroke"));
 
         _pattern[i].set_markup (_("Pattern"));
         sp_set_font_size_smaller (GTK_WIDGET(_pattern[i].gobj()));
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index 0ecf2dd5e..1ee26e803 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -298,9 +298,9 @@ StyleSwatch::setStyle(SPStyle *query)
             place->set_tooltip_text(tip);
             g_free (tip);
         } else if (paint->set && paint->isNone()) {
-            _value[i].set_markup(_("<i>None</i>"));
+            _value[i].set_markup(C_("Fill and stroke", "<i>None</i>"));
             place->add(_value[i]);
-            place->set_tooltip_text((i == SS_FILL)? (_("No fill")) : (_("No stroke")));
+            place->set_tooltip_text((i == SS_FILL)? (C_("Fill and stroke", "No fill")) : (C_("Fill and stroke", "No stroke")));
             if (i == SS_STROKE) has_stroke = false;
         } else if (!paint->set) {
             _value[i].set_markup(_("<b>Unset</b>"));
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 913cec837..d4ac35b33 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2510,7 +2510,7 @@ Verb *Verb::_base_verbs[] = {
                     N_("Create and edit gradients"), INKSCAPE_ICON("color-gradient")),
     new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"),
                     N_("Zoom in or out"), INKSCAPE_ICON("zoom")),
-    new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", N_("Measure"),
+    new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", NC_("Measurement tool", "Measure"),
                     N_("Measurement tool"), INKSCAPE_ICON("tool-measure")),
     new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"),
                     N_("Pick colors from image"), INKSCAPE_ICON("color-picker")),