Several different i18n issues fixed following report from a_b (adresses bug #215387...

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4accb3fb053e74c6cf6185ced8ac222f5bee2047..70b9cff4a98c08f214ff647dc3ad01a8a7b5f070 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -146,13 +146,13 @@ src/libgdl/gdl-i18n.h
 src/libgdl/gdl-switcher.c
 src/libnrtype/FontFactory.cpp
 src/live_effects/effect.cpp
+src/live_effects/lpe-bendpath.cpp
 src/live_effects/lpe-circle_with_radius.cpp
 src/live_effects/lpe-curvestitch.cpp
 src/live_effects/lpe-gears.cpp
 src/live_effects/lpe-knot.cpp
-src/live_effects/lpe-pathalongpath.cpp
+src/live_effects/lpe-patternalongpath.cpp
 src/live_effects/lpe-perspective_path.cpp
-src/live_effects/lpe-skeletalstrokes.cpp
 src/live_effects/lpe-skeleton.cpp
 src/live_effects/lpe-sketch.cpp
 src/live_effects/lpe-slant.cpp

diff --git a/share/extensions/pathalongpath.inx b/share/extensions/pathalongpath.inx
index 5ef27bb1ea6a12fb29e8cd83bc6072104908fc8e..fb4167fee67c0a674f7e9f9bb30216141fe05e7d 100644 (file)
--- a/share/extensions/pathalongpath.inx
+++ b/share/extensions/pathalongpath.inx
@@ -7,15 +7,15 @@
 <_param name="title" type="description">This effect bends a pattern object along arbitrary "skeleton" paths. The pattern is the top most object in the selection. (groups of paths/shapes/clones... allowed)</_param>
 
 <param name="copymode" type="enum" _gui-text="Copies of the pattern:">
-       <item value="Single">Single</item>
-       <item value="Single, stretched">Single, stretched</item>
-       <item value="Repeated">Repeated</item>
-       <item value="Repeated, stretched">Repeated, stretched</item>
+       <_item value="Single">Single</_item>
+       <_item value="Single, stretched">Single, stretched</_item>
+       <_item value="Repeated">Repeated</_item>
+       <_item value="Repeated, stretched">Repeated, stretched</_item>
 </param>
 
 <param name="kind" type="enum" _gui-text="Deformation type:">
-       <item value="Snake">Snake</item>
-       <item value="Ribbon">Ribbon</item>
+       <_item value="Snake">Snake</_item>
+       <_item value="Ribbon">Ribbon</_item>
 </param>
 
 <param name="space"     type="float"   _gui-text="Space between copies:" min="-10000.0" max="10000.0" >0.0</param>
@@ -34,5 +34,3 @@
         <command reldir="extensions" interpreter="python">pathalongpath.py</command>
     </script>
 </inkscape-extension>
-
-    

diff --git a/src/file.cpp b/src/file.cpp
index 51dce81cf7a8433a57dec6288bf3bb9584e9d151..eaf66d964c7446b8c2a6e58df134748a52ae6b50 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1315,7 +1315,7 @@ sp_file_export_to_ocal_dialog(Gtk::Window &parentWindow)
     remove(fileName.c_str());
     if (!success)
     {
-        gchar *text = g_strdup_printf(_("Error exporting the document. Verify if the server name, username and password are correct. If the server have support for webdav and verify if you didn't forget to choose a license too."));
+        gchar *text = g_strdup_printf(_("Error exporting the document. Verify if the server name, username and password are correct, if the server has support for webdav and verify if you didn't forget to choose a license."));
         sp_ui_error_dialog(text);
     }
     else

diff --git a/src/libgdl/gdl-dock-item.c b/src/libgdl/gdl-dock-item.c
index e8ae3d54b1cc343052af09c77b8f2b9fa8e9a58a..01a777bade149c9ae20897e4bcf2287d2226b9a4 100644 (file)
--- a/src/libgdl/gdl-dock-item.c
+++ b/src/libgdl/gdl-dock-item.c
@@ -302,7 +302,7 @@ gdl_dock_item_class_init (GdlDockItemClass *klass)
         g_object_class, PROP_RESIZE,
         g_param_spec_boolean ("resize", _("Resizable"),
                               _("If set, the dock item can be resized when "
-                                "docked in a paned"),
+                                "docked in a panel"),
                               TRUE,
                               G_PARAM_READWRITE));
                                      

diff --git a/src/libgdl/gdl-dock-placeholder.c b/src/libgdl/gdl-dock-placeholder.c
index c22ea038c5e301054e420b4965c65f7f98fc684e..967e48a85a28f4db01b01804b946645bc033e82c 100644 (file)
--- a/src/libgdl/gdl-dock-placeholder.c
+++ b/src/libgdl/gdl-dock-placeholder.c
@@ -189,14 +189,14 @@ gdl_dock_placeholder_class_init (GdlDockPlaceholderClass *klass)
        g_object_class_install_property (
         g_object_class, PROP_FLOAT_X,
         g_param_spec_int ("floatx", _("X-Coordinate"),
-                               _("X-Coordinate fow dock when floating"),
+                               _("X coordinate for dock when floating"),
                                -1, G_MAXINT, -1,
                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
                                GDL_DOCK_PARAM_EXPORT));
        g_object_class_install_property (
         g_object_class, PROP_FLOAT_Y,
         g_param_spec_int ("floaty", _("Y-Coordinate"),
-                               _("Y-Coordinate fow dock when floating"),
+                               _("Y coordinate for dock when floating"),
                                -1, G_MAXINT, -1,
                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
                                GDL_DOCK_PARAM_EXPORT));

diff --git a/src/live_effects/lpe-patternalongpath.cpp b/src/live_effects/lpe-patternalongpath.cpp
index 7d11a5172e7b53099dc9d155166ee7f692a4c5c5..eab3dd80ee50656b0a4acb4087cf3739393225a2 100644 (file)
--- a/src/live_effects/lpe-patternalongpath.cpp
+++ b/src/live_effects/lpe-patternalongpath.cpp
@@ -66,8 +66,8 @@ LPEPatternAlongPath::LPEPatternAlongPath(LivePathEffectObject *lpeobject) :
     spacing(_("Spacing"), _("Space between copies of the pattern. Negative values allowed, but are limited to -90% of pattern width."), "spacing", &wr, this, 0),
     normal_offset(_("Normal offset"), "", "normal_offset", &wr, this, 0),
     tang_offset(_("Tangential offset"), "", "tang_offset", &wr, this, 0),
-    prop_units(_("Offsets in unit of pattern size"), "Spacing, tangential and normal offset are expressed as a ratio of width/height", "prop_units", &wr, this, false),
-    vertical_pattern(_("Pattern is vertical"), "Rotate pattern 90 deg before applying", "vertical_pattern", &wr, this, false)
+    prop_units(_("Offsets in unit of pattern size"), _("Spacing, tangential and normal offset are expressed as a ratio of width/height"), "prop_units", &wr, this, false),
+    vertical_pattern(_("Pattern is vertical"), _("Rotate pattern 90 deg before applying"), "vertical_pattern", &wr, this, false)
 {
     registerParameter( dynamic_cast<Parameter *>(&pattern) );
     registerParameter( dynamic_cast<Parameter *>(&copytype) );

diff --git a/src/live_effects/lpe-sketch.cpp b/src/live_effects/lpe-sketch.cpp
index e4e7cddcc7a036a9aa39845fadd1b26c2c99c336..bb3fb31625952bbcad072750412320443ca256c7 100644 (file)
--- a/src/live_effects/lpe-sketch.cpp
+++ b/src/live_effects/lpe-sketch.cpp
@@ -46,7 +46,7 @@ LPESketch::LPESketch(LivePathEffectObject *lpeobject) :
     ends_tolerance(_("Max. ends tolerance"), 
                    _("Max. distance between original and approximated paths ends (relative to max. length)."), "ends_tolerance", &wr, this, .1),
     parallel_offset(_("Parallel offset"), 
-                    _("Average distance to original stroke(try 0.)."), "parallel_offset", &wr, this, 5.),
+                    _("Average distance to original stroke (try 0)."), "parallel_offset", &wr, this, 5.),
     tremble_size(_("Max. tremble"), 
                  _("Maximal tremble magnitude."), "tremble_size", &wr, this, 5.),
     tremble_frequency(_("Tremble frequency"), 

diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 0ae2c8dc594add56bd40eba48604cd13869aef15..09c086f468a405136c93aa8fdb5842cd6888b22f 100644 (file)
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -647,7 +647,8 @@ sp_selection_raise()
     }
 
     sp_document_done(sp_desktop_document(desktop), SP_VERB_SELECTION_RAISE,
-                     _("Raise"));
+                    //TRANSLATORS: Only put the word "Raise" in the translation. Means "to raise an object" in the undo history
+                     Q_("undo_action|Raise"));
 }
 
 void sp_selection_raise_to_top()

diff --git a/src/selection-describer.cpp b/src/selection-describer.cpp
index 1debd73e15e95206674d275db6b5b5fbfcf2940b..6d80cfe5c0152a1178ea7b23438e04d0d262e78f 100644 (file)
--- a/src/selection-describer.cpp
+++ b/src/selection-describer.cpp
@@ -39,7 +39,8 @@ const gchar *
 type2term(GType type)
 {
     if (type == SP_TYPE_ANCHOR)
-        { return _("Link"); }
+       // TRANSLATORS: only translate and put "Link" in the translation. It means internet link (anchor)
+        { return Q_("web|Link"); }
     if (type == SP_TYPE_CIRCLE)
         { return _("Circle"); }
     if (type == SP_TYPE_ELLIPSE)

diff --git a/src/tweak-context.cpp b/src/tweak-context.cpp
index f76694f25b456b1f2d45dc14e95ee533d1c2273c..aa5b2f3cceead3021178f86e7eb0aff2677d6c1b 100644 (file)
--- a/src/tweak-context.cpp
+++ b/src/tweak-context.cpp
@@ -988,6 +988,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
                            tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
                                                       ngettext("<b>Roughening %d</b> selected object",
                                                       "<b>Roughening %d</b> selected objects", num), num);
+                           break;
                         case TWEAK_MODE_COLORPAINT:
                            tc->_message_context->setF(Inkscape::NORMAL_MESSAGE,
                                                       ngettext("<b>Painting %d</b> selected object",
@@ -1060,6 +1061,7 @@ sp_tweak_context_root_handler(SPEventContext *event_context,
                 case TWEAK_MODE_COLORPAINT:
                     sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
                                      SP_VERB_CONTEXT_TWEAK, _("Color paint tweak"));
+                   break;
                 case TWEAK_MODE_COLORJITTER:
                     sp_document_done(sp_desktop_document(SP_EVENT_CONTEXT(tc)->desktop),
                                      SP_VERB_CONTEXT_TWEAK, _("Color jitter tweak"));

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 2767a32d198c30d765ca41b16bce655edbf99036..9b16320f365140f172a2b59f70f9e9192ca66f8a 100644 (file)
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -463,8 +463,8 @@ public:
         removeOverlapXGap.set_value(0);
         dialog.tooltips().set_tip(removeOverlapXGap,
                                   _("Minimum horizontal gap (in px units) between bounding boxes"));
-        /* TRANSLATORS: Horizontal gap */
-        removeOverlapXGapLabel.set_label(_("H:"));
+        /* TRANSLATORS: Horizontal gap. Only put "H:" equivalent in the translation */
+        removeOverlapXGapLabel.set_label(Q_("gap|H:"));
 
         removeOverlapYGap.set_digits(1);
         removeOverlapYGap.set_size_request(60, -1);

diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 19b739061d9c14b716f791857e0f1f70871f1cd0..729d09511c064357bb40ca01394c53e871f55fb1 100644 (file)
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -437,7 +437,7 @@ void FileImportFromOCALDialog::searchTagEntryChangedCallback()
 
     result = gnome_vfs_open (&from_handle, uri.c_str(), GNOME_VFS_OPEN_READ);
     if (result != GNOME_VFS_OK) {
-        sp_ui_error_dialog(_("Failed to receive the Open Clip Art Library RSS feed. Verify if the server name is correct in Configuration->Misc (e.g.: openclipart.org)"));
+        sp_ui_error_dialog(_("Failed to receive the Open Clip Art Library RSS feed. Verify if the server name is correct in Configuration->Import/Export (e.g.: openclipart.org)"));
         return;
     }
 

diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index c4c78dd85eedc5bbf9251419c365bef7a2b7fdc0..b90895df8ec1802317968ca2fb006645b6eb8622 100644 (file)
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -114,7 +114,8 @@ DualSpinSlider::DualSpinSlider(double value, double lower, double upper, double
     : AttrWidget(a),
       _s1(value, lower, upper, step_inc, climb_rate, digits, SP_ATTR_INVALID, tip_text1),
       _s2(value, lower, upper, step_inc, climb_rate, digits, SP_ATTR_INVALID, tip_text2),
-      _link(_("Link"))
+      //TRANSLATORS: Only translate the word "Link" - means to _link_ two sliders together
+      _link(Q_("sliders|Link"))
 {
     signal_value_changed().connect(signal_attr_changed().make_slot());
 

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 28a2e954947ec6c28811fad9fa6f7cbc47bd72b4..7c43f927e04f8ed0895c1edbd1b69ffb4295717d 100644 (file)
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -170,25 +170,25 @@ static struct {
     { "SPNodeContext",   "node_toolbox",   0, sp_node_toolbox_prep,              "NodeToolbar",
       SP_VERB_INVALID, 0, 0},
     { "SPTweakContext",   "tweak_toolbox",   0, sp_tweak_toolbox_prep,              "TweakToolbar",
-      SP_VERB_CONTEXT_TWEAK_PREFS, "tools.tweak", _("Color/opacity used for color tweaking")},
+      SP_VERB_CONTEXT_TWEAK_PREFS, "tools.tweak", N_("Color/opacity used for color tweaking")},
     { "SPZoomContext",   "zoom_toolbox",   0, sp_zoom_toolbox_prep,              "ZoomToolbar",
       SP_VERB_INVALID, 0, 0},
     { "SPStarContext",   "star_toolbox",   0, sp_star_toolbox_prep,              "StarToolbar",
-      SP_VERB_CONTEXT_STAR_PREFS,   "tools.shapes.star",     _("Style of new stars")},
+      SP_VERB_CONTEXT_STAR_PREFS,   "tools.shapes.star",     N_("Style of new stars")},
     { "SPRectContext",   "rect_toolbox",   0, sp_rect_toolbox_prep,              "RectToolbar",
-      SP_VERB_CONTEXT_RECT_PREFS,   "tools.shapes.rect",     _("Style of new rectangles")},
+      SP_VERB_CONTEXT_RECT_PREFS,   "tools.shapes.rect",     N_("Style of new rectangles")},
     { "Box3DContext",  "3dbox_toolbox",  0, box3d_toolbox_prep,             "3DBoxToolbar",
-      SP_VERB_CONTEXT_3DBOX_PREFS,  "tools.shapes.3dbox",    _("Style of new 3D boxes")},
+      SP_VERB_CONTEXT_3DBOX_PREFS,  "tools.shapes.3dbox",    N_("Style of new 3D boxes")},
     { "SPArcContext",    "arc_toolbox",    0, sp_arc_toolbox_prep,               "ArcToolbar",
-      SP_VERB_CONTEXT_ARC_PREFS,    "tools.shapes.arc",      _("Style of new ellipses")},
+      SP_VERB_CONTEXT_ARC_PREFS,    "tools.shapes.arc",      N_("Style of new ellipses")},
     { "SPSpiralContext", "spiral_toolbox", 0, sp_spiral_toolbox_prep,            "SpiralToolbar",
-      SP_VERB_CONTEXT_SPIRAL_PREFS, "tools.shapes.spiral",   _("Style of new spirals")},
+      SP_VERB_CONTEXT_SPIRAL_PREFS, "tools.shapes.spiral",   N_("Style of new spirals")},
     { "SPPencilContext", "pencil_toolbox", 0, sp_pencil_toolbox_prep,            "PencilToolbar",
-      SP_VERB_CONTEXT_PENCIL_PREFS, "tools.freehand.pencil", _("Style of new paths created by Pencil")},
+      SP_VERB_CONTEXT_PENCIL_PREFS, "tools.freehand.pencil", N_("Style of new paths created by Pencil")},
     { "SPPenContext", "pen_toolbox", 0, sp_pen_toolbox_prep,                     "PenToolbar",
-      SP_VERB_CONTEXT_PEN_PREFS,    "tools.freehand.pen",    _("Style of new paths created by Pen")},
+      SP_VERB_CONTEXT_PEN_PREFS,    "tools.freehand.pen",    N_("Style of new paths created by Pen")},
     { "SPDynaDrawContext", "calligraphy_toolbox", 0, sp_calligraphy_toolbox_prep,"CalligraphyToolbar",
-      SP_VERB_CONTEXT_CALLIGRAPHIC_PREFS, "tools.calligraphic", _("Style of new calligraphic strokes")},
+      SP_VERB_CONTEXT_CALLIGRAPHIC_PREFS, "tools.calligraphic", N_("Style of new calligraphic strokes")},
     { "SPTextContext",   "text_toolbox",   sp_text_toolbox_new, 0,               0,
       SP_VERB_INVALID, 0, 0},
     { "SPDropperContext", "dropper_toolbox", 0, sp_dropper_toolbox_prep,         "DropperToolbar",
@@ -198,7 +198,7 @@ static struct {
     { "SPConnectorContext", "connector_toolbox", 0, sp_connector_toolbox_prep,   "ConnectorToolbar",
       SP_VERB_INVALID, 0, 0},
     { "SPFloodContext",  "paintbucket_toolbox",  0, sp_paintbucket_toolbox_prep, "PaintbucketToolbar",
-      SP_VERB_CONTEXT_PAINTBUCKET_PREFS, "tools.paintbucket", _("Style of Paint Bucket fill objects")},
+      SP_VERB_CONTEXT_PAINTBUCKET_PREFS, "tools.paintbucket", N_("Style of Paint Bucket fill objects")},
     { NULL, NULL, NULL, NULL, NULL, SP_VERB_INVALID, NULL, NULL }
 };
 
@@ -1445,7 +1445,7 @@ setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
             gtk_table_attach( GTK_TABLE(holder), toolBar, 0, 1, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 0, 0 );
 
             if ( aux_toolboxes[i].swatch_verb_id != SP_VERB_INVALID ) {
-                Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch( NULL, aux_toolboxes[i].swatch_tip );
+                Inkscape::UI::Widget::StyleSwatch *swatch = new Inkscape::UI::Widget::StyleSwatch( NULL, _(aux_toolboxes[i].swatch_tip) );
                 swatch->setDesktop( desktop );
                 swatch->setClickVerb( aux_toolboxes[i].swatch_verb_id );
                 swatch->setWatchedTool( aux_toolboxes[i].swatch_tool, true );