diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2012-04-13 17:54:11 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2012-04-13 17:54:11 +0000 |
| commit | ba5269e29bf844fe52429f8549b65d716d942ac4 (patch) | |
| tree | f8606e83b5690253d6570d2111bc7af9214d9464 /src | |
| parent | Replace deprecated GTK_TYPE macros (diff) | |
| download | inkscape-ba5269e29bf844fe52429f8549b65d716d942ac4.tar.gz inkscape-ba5269e29bf844fe52429f8549b65d716d942ac4.zip | |
Translation. More disambiguations (see Bug #832560).
Fixed bugs:
- https://launchpad.net/bugs/832560
(bzr r11234)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 2 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/style-swatch.cpp | 4 | ||||
| -rw-r--r-- | src/verbs.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
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")), |