i18n. Strings disambiguation (thanks, Maren!).

Translation. Translation template update.
Translation. French translation update.

(bzr r14440)

4 files changed, 46 insertions, 46 deletions

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 14eaa65aa..fec49d484 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -601,7 +601,7 @@ void InkscapePreferences::initPageUI()
                               _("Set the language for menus and number formats"), false);
 
     {
-        Glib::ustring sizeLabels[] = {_("Large"), _("Small"), _("Smaller")};
+        Glib::ustring sizeLabels[] = {C_("Icon size", "Large"), C_("Icon size", "Small"), C_("Icon size", "Smaller")};
         int sizeValues[] = {0, 1, 2};
 
         _misc_small_tools.init( "/toolbox/tools/small", sizeLabels, sizeValues, G_N_ELEMENTS(sizeLabels), 0 );
@@ -686,7 +686,7 @@ void InkscapePreferences::initPageUI()
     _win_ontop_agressive.init ( _("Aggressive"), "/options/transientpolicy/value", 2, false, &_win_ontop_none);
 
     {
-        Glib::ustring defaultSizeLabels[] = {_("Small"), _("Large"), _("Maximized")};
+        Glib::ustring defaultSizeLabels[] = {C_("Window size", "Small"), C_("Window size", "Large"), C_("Window size", "Maximized")};
         int defaultSizeValues[] = {0, 1, 2};
 
         _win_default_size.init( "/options/defaultwindowsize/value", defaultSizeLabels, defaultSizeValues, G_N_ELEMENTS(defaultSizeLabels), 1 );
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 835ecf35b..d72dda028 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -1614,11 +1614,11 @@ ObjectsPanel::ObjectsPanel() :
     _pending(0),
     _toggleEvent(0),
     _defer_target(),
-    _visibleHeader(_("V")),
-    _lockHeader(_("L")),
-    _typeHeader(_("T")),
-    _clipmaskHeader(_("CM")),
-    _highlightHeader(_("HL")),
+    _visibleHeader(C_("Visibility", "V")),
+    _lockHeader(C_("Lock", "L")),
+    _typeHeader(C_("Type", "T")),
+    _clipmaskHeader(C_("Clip and mask", "CM")),
+    _highlightHeader(C_("Highlight", "HL")),
     _nameHeader(_("Label")),
     _composite_vbox(false, 0),
     _opacity_vbox(false, 0),
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index 5d1e40971..62598dead 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -35,41 +35,41 @@ namespace Widget {
 
   FontVariants::FontVariants () :
     Gtk::VBox (),
-    _ligatures_frame          ( Glib::ustring(_("Ligatures"    )) ),
-    _ligatures_common         ( Glib::ustring(_("Common"       )) ),
-    _ligatures_discretionary  ( Glib::ustring(_("Discretionary")) ),
-    _ligatures_historical     ( Glib::ustring(_("Historical"   )) ),
-    _ligatures_contextual     ( Glib::ustring(_("Contextual"   )) ),
-
-    _position_frame           ( Glib::ustring(_("Position"     )) ),
-    _position_normal          ( Glib::ustring(_("Normal"       )) ),
-    _position_sub             ( Glib::ustring(_("Subscript"    )) ),
-    _position_super           ( Glib::ustring(_("Superscript"  )) ),
-
-    _caps_frame               ( Glib::ustring(_("Capitals"     )) ),
-    _caps_normal              ( Glib::ustring(_("Normal"       )) ),
-    _caps_small               ( Glib::ustring(_("Small"        )) ),
-    _caps_all_small           ( Glib::ustring(_("All small"    )) ),
-    _caps_petite              ( Glib::ustring(_("Petite"       )) ),
-    _caps_all_petite          ( Glib::ustring(_("All petite"   )) ),
-    _caps_unicase             ( Glib::ustring(_("Unicase"      )) ),
-    _caps_titling             ( Glib::ustring(_("Titling"      )) ),
-
-    _numeric_frame            ( Glib::ustring(_("Numeric"      )) ),
-    _numeric_lining           ( Glib::ustring(_("Lining"       )) ),
-    _numeric_old_style        ( Glib::ustring(_("Old Style"    )) ),
-    _numeric_default_style    ( Glib::ustring(_("Default Style")) ),
-    _numeric_proportional     ( Glib::ustring(_("Proportional" )) ),
-    _numeric_tabular          ( Glib::ustring(_("Tabular"      )) ),
-    _numeric_default_width    ( Glib::ustring(_("Default Width")) ),
-    _numeric_diagonal         ( Glib::ustring(_("Diagonal"     )) ),
-    _numeric_stacked          ( Glib::ustring(_("Stacked"      )) ),
-    _numeric_default_fractions( Glib::ustring(_("Default Fractions")) ),
-    _numeric_ordinal          ( Glib::ustring(_("Ordinal"      )) ),
-    _numeric_slashed_zero     ( Glib::ustring(_("Slashed Zero" )) ),
-
-    _feature_frame            ( Glib::ustring(_("Feature Settings")) ),
-    _feature_label            ( Glib::ustring(_("Selection has different Feature Settings!")) ),
+    _ligatures_frame          ( Glib::ustring(C_("Font variant", "Ligatures"    )) ),
+    _ligatures_common         ( Glib::ustring(C_("Font variant", "Common"       )) ),
+    _ligatures_discretionary  ( Glib::ustring(C_("Font variant", "Discretionary")) ),
+    _ligatures_historical     ( Glib::ustring(C_("Font variant", "Historical"   )) ),
+    _ligatures_contextual     ( Glib::ustring(C_("Font variant", "Contextual"   )) ),
+
+    _position_frame           ( Glib::ustring(C_("Font variant", "Position"     )) ),
+    _position_normal          ( Glib::ustring(C_("Font variant", "Normal"       )) ),
+    _position_sub             ( Glib::ustring(C_("Font variant", "Subscript"    )) ),
+    _position_super           ( Glib::ustring(C_("Font variant", "Superscript"  )) ),
+
+    _caps_frame               ( Glib::ustring(C_("Font variant", "Capitals"     )) ),
+    _caps_normal              ( Glib::ustring(C_("Font variant", "Normal"       )) ),
+    _caps_small               ( Glib::ustring(C_("Font variant", "Small"        )) ),
+    _caps_all_small           ( Glib::ustring(C_("Font variant", "All small"    )) ),
+    _caps_petite              ( Glib::ustring(C_("Font variant", "Petite"       )) ),
+    _caps_all_petite          ( Glib::ustring(C_("Font variant", "All petite"   )) ),
+    _caps_unicase             ( Glib::ustring(C_("Font variant", "Unicase"      )) ),
+    _caps_titling             ( Glib::ustring(C_("Font variant", "Titling"      )) ),
+
+    _numeric_frame            ( Glib::ustring(C_("Font variant", "Numeric"      )) ),
+    _numeric_lining           ( Glib::ustring(C_("Font variant", "Lining"       )) ),
+    _numeric_old_style        ( Glib::ustring(C_("Font variant", "Old Style"    )) ),
+    _numeric_default_style    ( Glib::ustring(C_("Font variant", "Default Style")) ),
+    _numeric_proportional     ( Glib::ustring(C_("Font variant", "Proportional" )) ),
+    _numeric_tabular          ( Glib::ustring(C_("Font variant", "Tabular"      )) ),
+    _numeric_default_width    ( Glib::ustring(C_("Font variant", "Default Width")) ),
+    _numeric_diagonal         ( Glib::ustring(C_("Font variant", "Diagonal"     )) ),
+    _numeric_stacked          ( Glib::ustring(C_("Font variant", "Stacked"      )) ),
+    _numeric_default_fractions( Glib::ustring(C_("Font variant", "Default Fractions")) ),
+    _numeric_ordinal          ( Glib::ustring(C_("Font variant", "Ordinal"      )) ),
+    _numeric_slashed_zero     ( Glib::ustring(C_("Font variant", "Slashed Zero" )) ),
+
+    _feature_frame            ( Glib::ustring(C_("Font variant", "Feature Settings")) ),
+    _feature_label            ( Glib::ustring(C_("Font variant", "Selection has different Feature Settings!")) ),
     
     _ligatures_changed( false ),
     _position_changed( false ),
diff --git a/src/widgets/tweak-toolbar.cpp b/src/widgets/tweak-toolbar.cpp
index a5d90fc3d..e2c0daf6e 100644
--- a/src/widgets/tweak-toolbar.cpp
+++ b/src/widgets/tweak-toolbar.cpp
@@ -288,7 +288,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
                                                       NULL,
                                                       Inkscape::ICON_SIZE_DECORATION );
         //TRANSLATORS:  "H" here stands for hue
-        g_object_set( act, "short_label", _("H"), NULL );
+        g_object_set( act, "short_label", C_("Hue", "H"), NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_doh), desktop );
         gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/tweak/doh", true) );
@@ -304,7 +304,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
                                                       NULL,
                                                       Inkscape::ICON_SIZE_DECORATION );
         //TRANSLATORS: "S" here stands for Saturation
-        g_object_set( act, "short_label", _("S"), NULL );
+        g_object_set( act, "short_label", C_("Saturation", "S"), NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_dos), desktop );
         gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/tweak/dos", true) );
@@ -320,7 +320,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
                                                       NULL,
                                                       Inkscape::ICON_SIZE_DECORATION );
         //TRANSLATORS: "L" here stands for Lightness
-        g_object_set( act, "short_label", _("L"), NULL );
+        g_object_set( act, "short_label", C_("Lightness", "L"), NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_dol), desktop );
         gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/tweak/dol", true) );
@@ -336,7 +336,7 @@ void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
                                                       NULL,
                                                       Inkscape::ICON_SIZE_DECORATION );
         //TRANSLATORS: "O" here stands for Opacity
-        g_object_set( act, "short_label", _("O"), NULL );
+        g_object_set( act, "short_label", C_("Opacity", "O"), NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(tweak_toggle_doo), desktop );
         gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/tweak/doo", true) );