textual patch from bug 408093

diff --git a/share/extensions/draw_from_triangle.inx b/share/extensions/draw_from_triangle.inx
index 7973cda8a6ec048972bebaf4467e5a5bfcadf252..341388dc35ee6195b7a2eef8e461c8dd850b6e1e 100644 (file)
--- a/share/extensions/draw_from_triangle.inx
+++ b/share/extensions/draw_from_triangle.inx
@@ -35,14 +35,14 @@
             </param>
             <param name="cust_str"      type="string"  _gui-text="Point At">cos(a_a):cos(a_b):cos(a_c)</param>
             <param name="cust_pt"       type="boolean" _gui-text="Draw Marker At This Point"></param>
-            <param name="cust_radius"   type="boolean" _gui-text="Draw Circle About This Point"></param>
+            <param name="cust_radius"   type="boolean" _gui-text="Draw Circle Around This Point"></param>
             <param name="radius"        type="string"  _gui-text="Radius / px">s_a*s_b*s_c/(4*area)</param>
             <param name="isogonal_conj" type="boolean" _gui-text="Draw Isogonal Conjugate"></param>
             <param name="isotomic_conj" type="boolean" _gui-text="Draw Isotomic Conjugate"></param>
             <param name="report" type="boolean" _gui-text="Report this triangle's properties"></param>
         </page>
         <page name="Help" _gui-text="Help">
-            <param name="instructions"   type="description">This extension draws constructions about a triangle defined by the first 3 nodes of a selected path. You may select one of preset objects or create your own ones.
+            <_param name="instructions" type="description" xml:space="preserve">This extension draws constructions about a triangle defined by the first 3 nodes of a selected path. You may select one of preset objects or create your own ones.
             
 All units are the Inkscape's pixel unit. Angles are all in radians.
 You can specify a point by trilinear coordinates or by a triangle centre function.
@@ -63,7 +63,7 @@ Also available are the inverse trigonometric functions:
 sec(x); csc(x); cot(x)
 
 You can specify the radius of a circle about a custom point using an formula, which may also contain the side lengths, angles, etc. You can also plot the isogonal and isotomic conjugate of the point. Be aware that this may cause a divide-by-zero error for certain points.
-            </param>
+            </_param>
         </page>
     </param>
     <effect>

diff --git a/share/extensions/draw_from_triangle.py b/share/extensions/draw_from_triangle.py
index 196bc3c9e8a373d8f530ebd29f37bb372167b4ab..38843210c885832e3fdd5389acc95eae73e0a140 100644 (file)
--- a/share/extensions/draw_from_triangle.py
+++ b/share/extensions/draw_from_triangle.py
@@ -175,7 +175,7 @@ def report_properties( params ):#report to the Inkscape console using errormsg
     inkex.errormsg(_("Side Length 'a'/px: " + str( params[0][0] ) ))
     inkex.errormsg(_("Side Length 'b'/px: " + str( params[0][1] ) ))
     inkex.errormsg(_("Side Length 'c'/px: " + str( params[0][2] ) ))
-    inkex.errormsg(_("Angle 'A'/radians:" + str( params[1][0] ) ))
+    inkex.errormsg(_("Angle 'A'/radians: " + str( params[1][0] ) ))
     inkex.errormsg(_("Angle 'B'/radians: " + str( params[1][1] ) ))
     inkex.errormsg(_("Angle 'C'/radians: " + str( params[1][2] ) ))
     inkex.errormsg(_("Semiperimeter/px: " + str( params[4][1] ) ))

diff --git a/share/extensions/dxf_input.inx b/share/extensions/dxf_input.inx
index 5ad63c565d4f1274547a22ccf4a1ff20b9d7a3da..70aae46d506b91114c21e7e8acf0daf043de5dff 100644 (file)
--- a/share/extensions/dxf_input.inx
+++ b/share/extensions/dxf_input.inx
@@ -17,12 +17,11 @@
                        </param>
                </page>
                <page name="help" _gui-text="Help">
-                       <_param name="inputhelp" type="description">- AutoCAD Release 13 and newer.
+                       <_param name="inputhelp" type="description" xml:space="preserve">- AutoCAD Release 13 and newer.
 - assume dxf drawing is in mm.
 - assume svg drawing is in pixels, at 90 dpi.
-- layers are preserved only on File-&gt;Open, not Import.
-- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed.
-               </_param>
+- layers are preserved only on File->Open, not Import.
+- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed.</_param>
                </page>
        </param>
        <input>

diff --git a/share/extensions/dxf_outlines.inx b/share/extensions/dxf_outlines.inx
index a557deb94155e9711d5dc37ef8f81a69888c7ace..1693850013a1d2783e522d272627a54713b023f0 100644 (file)
--- a/share/extensions/dxf_outlines.inx
+++ b/share/extensions/dxf_outlines.inx
@@ -10,12 +10,11 @@
                        <param name="ROBO" type="boolean" _gui-text="enable ROBO-Master output">false</param>
                </page>
                <page name="help" _gui-text="Help">
-                       <_param name="inputhelp" type="description">- AutoCAD Release 13 format.
+                       <_param name="inputhelp" type="description" xml:space="preserve">- AutoCAD Release 13 format.
 - assume svg drawing is in pixels, at 90 dpi.
 - assume dxf drawing is in mm.
 - only LWPOLYLINE and SPLINE elements are supported.
-- ROBO-Master option is a specialized spline readable only by ROBO-Master and AutoDesk viewers, not Inkscape.
-               </_param>
+- ROBO-Master option is a specialized spline readable only by ROBO-Master and AutoDesk viewers, not Inkscape.</_param>
                </page>
        </param>
        <output>

diff --git a/share/extensions/extractimage.py b/share/extensions/extractimage.py
index 38f9298465d66191fd3eb9718dd08fb5f8a0c21c..8b47de958598ece6f223b2592c0e64a2e7b2f774 100644 (file)
--- a/share/extensions/extractimage.py
+++ b/share/extensions/extractimage.py
@@ -63,7 +63,7 @@ class MyEffect(inkex.Effect):
                                 open(path,'wb').write(data)
                                 node.set(inkex.addNS('href','xlink'),os.path.realpath(path)) #absolute for making in-mem cycles work
                             else:
-                                inkex.errormsg(_('Difficulty finding the image data.'))
+                                inkex.errormsg(_('Unable to find image data.'))
                             break
 
 if __name__ == '__main__':

diff --git a/share/extensions/extrude.inx b/share/extensions/extrude.inx
index ee5fa9c2ef6752ed61085a581480090834d5ab6b..b282fe0d9899913dc97f3a96f98b216305654645 100644 (file)
--- a/share/extensions/extrude.inx
+++ b/share/extensions/extrude.inx
@@ -5,8 +5,8 @@
        <dependency type="executable" location="extensions">extrude.py</dependency>
        <dependency type="executable" location="extensions">inkex.py</dependency>
   <param name="mode" type="optiongroup" _gui-text="Mode:">
-     <option>Lines</option>
-     <option>Polygons</option>
+     <_option>Lines</_option>
+     <_option>Polygons</_option>
   </param>
     <effect>
                <object-type>path</object-type>

diff --git a/share/extensions/pathalongpath.inx b/share/extensions/pathalongpath.inx
index 4fc7287ff7bd79ce90ac9ad33439c4f5a67ce685..a4ee408525609d73f64dbac55b3233478df96570 100644 (file)
--- a/share/extensions/pathalongpath.inx
+++ b/share/extensions/pathalongpath.inx
@@ -5,7 +5,7 @@
   <dependency type="executable" location="extensions">pathmodifier.py</dependency>
   <dependency type="executable" location="extensions">pathalongpath.py</dependency>
   <dependency type="executable" location="extensions">inkex.py</dependency>
-  <_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="title" type="description">This effect bends a pattern object along arbitrary "skeleton" paths. The pattern is the topmost 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>

diff --git a/share/extensions/pathscatter.inx b/share/extensions/pathscatter.inx
index 88cf0e2c949cf1368c3fbb8af7d459bca23b5ff2..fe52828b8f2b8533051feb50066d62a41334ea2b 100644 (file)
--- a/share/extensions/pathscatter.inx
+++ b/share/extensions/pathscatter.inx
@@ -5,7 +5,7 @@
   <dependency type="executable" location="extensions">pathmodifier.py</dependency>
   <dependency type="executable" location="extensions">pathscatter.py</dependency>
   <dependency type="executable" location="extensions">inkex.py</dependency>
-  <_param name="title" type="description">This effect scatters a pattern along arbitrary "skeleton" paths. The pattern is the top most object in the selection. (groups of paths/shapes/clones... allowed)</_param>
+  <_param name="title" type="description">This effect scatters a pattern along arbitrary "skeleton" paths. The pattern is the topmost object in the selection. (groups of paths/shapes/clones... allowed)</_param>
   <param name="follow" type="boolean" _gui-text="Follow path orientation">false</param>
   <param name="stretch" type="boolean" _gui-text="Stretch spaces to fit skeleton length">false</param>
   <param name="space" type="float" _gui-text="Space between copies:" min="-10000.0" max="10000.0">0.0</param>

diff --git a/share/extensions/polyhedron_3d.inx b/share/extensions/polyhedron_3d.inx
index 4f1de90c7506be6ed760aac3bd1bf767c5612998..e7807b46938c2e07edc59cf51f459f94afd9835e 100644 (file)
--- a/share/extensions/polyhedron_3d.inx
+++ b/share/extensions/polyhedron_3d.inx
@@ -10,7 +10,7 @@
                 <_option value="cube">Cube</_option>
                 <_option value="trunc_cube">Truncated Cube</_option>
                 <_option value="snub_cube">Snub Cube</_option>
-                <_option value="cuboct">Cuboctohedron</_option>
+                <_option value="cuboct">Cuboctahedron</_option>
                 <_option value="tet">Tetrahedron</_option>
                 <_option value="trunc_tet">Truncated Tetrahedron</_option>
                 <_option value="oct">Octahedron</_option>
@@ -65,9 +65,9 @@
         </page>
         <page name="style" _gui-text="Style">
             <param name="scl"    type="float"   min="0"    max="10000" _gui-text="Scaling Factor">100</param>
-            <param name="f_r"  type="int"   min="0" max="255" _gui-text="Fill Colour (Red)">255</param>
-            <param name="f_g"  type="int"   min="0" max="255" _gui-text="Fill Colour (Green)">0</param>
-            <param name="f_b"  type="int"   min="0" max="255" _gui-text="Fill Colour (Blue)">0</param>
+            <param name="f_r"  type="int"   min="0" max="255" _gui-text="Fill Color (Red)">255</param>
+            <param name="f_g"  type="int"   min="0" max="255" _gui-text="Fill Color (Green)">0</param>
+            <param name="f_b"  type="int"   min="0" max="255" _gui-text="Fill Color (Blue)">0</param>
             <param name="f_opac" type="int" min="0" max="100" _gui-text="Fill Opacity/ %">100</param>
             <param name="s_opac" type="int" min="0" max="100" _gui-text="Stroke Opacity/ %">100</param>
             <param name="th"   type="float" min="0" max="100" _gui-text="Line Thickness / px">2</param>
@@ -75,7 +75,9 @@
             <param name="lv_x" type="float" min="-100" max="100" _gui-text="Light x-Position">1</param>
             <param name="lv_y" type="float" min="-100" max="100" _gui-text="Light y-Position">1</param>
             <param name="lv_z" type="float" min="-100" max="100" _gui-text="Light z-Position">-2</param>
-            <param name="show" type="optiongroup" appearance="minimal" _gui-text="Show:">
+<!-- TRANSLATORS: only translate "string" in "context|string".
+For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS -->
+            <param name="show" type="optiongroup" appearance="minimal" _gui-text="polyhedron|Show:">
                 <_option value="vtx">Vertices</_option>
                 <_option value="edg">Edges</_option>
                 <_option value="fce">Faces</_option></param>

diff --git a/share/extensions/polyhedron_3d.py b/share/extensions/polyhedron_3d.py
index ae73d6b27925c9da5f65274993bdfcee5a9f0e46..514ace94a8bd1a9d6ef8ff02895e262de4353f07 100644 (file)
--- a/share/extensions/polyhedron_3d.py
+++ b/share/extensions/polyhedron_3d.py
@@ -57,7 +57,7 @@ _ = gettext.gettext
 try:
     from numpy import *
 except:
-    inkex.errormsg(_("Failed to import the numpy module. This module is required by this extension. Please install them and try again.  On a Debian-like system this can be done with the command, sudo apt-get install python-numpy."))
+    inkex.errormsg(_("Failed to import the numpy module. This module is required by this extension. Please install it and try again.  On a Debian-like system this can be done with the command, sudo apt-get install python-numpy."))
     sys.exit()
 
 #FILE IO ROUTINES

diff --git a/share/extensions/printing-marks.inx b/share/extensions/printing-marks.inx
index 256f97e85ff13301942b646a98fabc07d2674a89..40954380f11a2986dfee2757f943f0ce48e7741e 100644 (file)
--- a/share/extensions/printing-marks.inx
+++ b/share/extensions/printing-marks.inx
@@ -11,13 +11,12 @@
       <param name="bleed_marks"         type="boolean"    _gui-text="Bleed Marks">false</param>
       <param name="registration_marks"  type="boolean"    _gui-text="Registration Marks">true</param>
       <param name="star_target"         type="boolean"    _gui-text="Star Target">false</param>
-      <param name="colour_bars"         type="boolean"    _gui-text="Colour Bars">true</param>
+      <param name="colour_bars"         type="boolean"    _gui-text="Color Bars">true</param>
       <param name="page_info"           type="boolean"    _gui-text="Page Information">false</param>
     </page>
     <page name="tab" _gui-text="Positioning">
       <param name="where" type="enum" _gui-text="Set crop marks to">
            <_item value="canvas">Canvas</_item>
-        <_item value="selection">Selection</_item>
       </param>
       <param name="unit" _gui-text="Unit" type="optiongroup" appearance="minimal">
            <option value="px">px</option>

diff --git a/share/extensions/restack.inx b/share/extensions/restack.inx
index 07d222a168797465f2b45b166512935dbc186419..cd79860af5112f20cd6e6dd6d330eb91568d4482 100644 (file)
--- a/share/extensions/restack.inx
+++ b/share/extensions/restack.inx
@@ -15,14 +15,16 @@
     </param>
        <param name="angle" type="float" min="0.0" max="360.0" _gui-text="Angle">0.00</param>
     <param name="xanchor" type="optiongroup"  appearance="minimal" _gui-text="Horizontal Point:">
-        <_option value="l">Left</_option>
-        <_option value="m">Middle</_option>
-        <_option value="r">Right</_option>
+<!-- TRANSLATORS: only translate "string" in "context|string".
+For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS -->
+        <_option value="l">restack|Left</_option>
+        <_option value="m">restack|Middle</_option>
+        <_option value="r">restack|Right</_option>
     </param>
     <param name="yanchor" type="optiongroup"  appearance="minimal" _gui-text="Vertical Point:">
-        <_option value="t">Top</_option>
-        <_option value="m">Middle</_option>
-        <_option value="b">Bottom</_option>
+        <_option value="t">restack|Top</_option>
+        <_option value="m">restack|Middle</_option>
+        <_option value="b">restack|Bottom</_option>
     </param>
     <effect>
        <object-type>path</object-type>

diff --git a/share/extensions/summersnight.py b/share/extensions/summersnight.py
index 7c76d71626145d1e85ae85ae4693c3cd8c686787..f14b400cd44ea274273c4f2bbd47819b2dfa9186 100755 (executable)
--- a/share/extensions/summersnight.py
+++ b/share/extensions/summersnight.py
@@ -33,9 +33,7 @@ class Project(inkex.Effect):
             inkex.Effect.__init__(self)
     def effect(self):
         if len(self.options.ids) < 2:
-            inkex.errormsg(_("This extension requires two selected paths.")
-                           + "  "
-                           + _("The second path must be exactly four nodes long."))
+            inkex.errormsg(_("This extension requires two selected paths. \nThe second path must be exactly four nodes long."))
             exit()
 
         #obj is selected second

diff --git a/share/extensions/svgcalendar.inx b/share/extensions/svgcalendar.inx
index 8eaf747e51e4322b9a6673f254b5316a4807fa64..fd1af0544201627be2d6ba48b4e64cdfd8d651fb 100644 (file)
--- a/share/extensions/svgcalendar.inx
+++ b/share/extensions/svgcalendar.inx
@@ -38,8 +38,8 @@
     </page>
     <page name="tab" _gui-text="Localization">
       <_param name="l10n-help" type="description">You may change the names for other languages:</_param>
-      <_param name="month-names"  type="string" _gui-text="Month names">January February March April May June July August September October November December</_param>
-      <_param name="day-names"  type="string" _gui-text="Day names">Sun Mon Tue Wed Thu Fri Sat</_param>
+      <_param name="month-names"  type="string" _gui-text="Month names" xml:space="preserve">January February March April May June July August September October November December</_param>
+      <_param name="day-names"  type="string" _gui-text="Day names" xml:space="preserve">Sun Mon Tue Wed Thu Fri Sat</_param>
       <_param name="day-names-help" type="description">(The day names list must start from Sunday)</_param>
       <param name="encoding" _gui-text="Char Encoding" type="optiongroup" appearance="minimal">
                <option value="arabic">arabic</option>

diff --git a/share/extensions/web-set-att.inx b/share/extensions/web-set-att.inx
index e8caa94ea4933b4dad80739e961e56b10e7b1b40..5bb14d2850c6f06acde81504a88229ef2ed51c46 100644 (file)
--- a/share/extensions/web-set-att.inx
+++ b/share/extensions/web-set-att.inx
@@ -8,9 +8,9 @@
   <_param name="sep1" type="description">••••••••••••••••••••••••••••••••••••••••••••••••</_param>
   <_param name="help" type="description">This effect sets one or more attributes in the second selected element, when a defined event occurs on the first selected element.</_param>
   <_param name="sep2" type="description">••••••••••••••••••••••••••••••••••••••••••••••••</_param>
-  <_param name="help" type="description">If you want to set more then one attribute, you must separate this with a space, and only with a space.</_param>
+  <_param name="help" type="description">If you want to set more than one attribute, you must separate this with a space, and only with a space.</_param>
   <param name="att" type="string" _gui-text="Attribute to set">fill stroke stroke-width</param>
-  <param name="when" type="enum" _gui-text="When the set must be done?">
+  <param name="when" type="enum" _gui-text="When should the set be done?">
     <_item value="onclick">on click</_item>
     <_item value="onfocusin">on focus</_item>
     <_item value="onfocusout">on blur</_item>
@@ -22,7 +22,7 @@
     <_item value="onmouseout">on mouse out</_item>
     <_item value="onload">on element loaded</_item>
   </param>
-  <_param name="help" type="description">The list of values must have the same size of the attributes list.</_param>
+  <_param name="help" type="description">The list of values must have the same size as the attributes list.</_param>
   <param name="val" type="string" _gui-text="Value to set">red black 5px</param>
   <param name="compatibility" type="enum" _gui-text="Compatibility with previews code to this event">
     <_item value="append">Run it after</_item>
@@ -32,7 +32,7 @@
   <_param name="help" type="description">The next parameter is useful when you select more than two elements</_param>
   <param name="from-and-to" type="enum" _gui-text="Source and destination of setting">
     <_item value="g-to-one">All selected ones set an attribute in the last one</_item>
-    <_item value="one-to-g">The first selected set an attribute in all others</_item>
+    <_item value="one-to-g">The first selected sets an attribute in all others</_item>
   </param>
   <effect>
     <object-type>all</object-type>

diff --git a/share/extensions/web-transmit-att.inx b/share/extensions/web-transmit-att.inx
index c1d5895b3f53633d71a0ac68dcdf5cadd0b7bf01..caf284b938c87b407ad1581f2e635347a5e2a7c8 100644 (file)
--- a/share/extensions/web-transmit-att.inx
+++ b/share/extensions/web-transmit-att.inx
@@ -6,7 +6,7 @@
   <dependency type="executable" location="extensions">inkex.py</dependency>
   <_param name="intro" type="description">This effect adds a feature visible (or usable) only on a SVG enabled web browser (like Firefox).</_param>
   <_param name="sep1" type="description">••••••••••••••••••••••••••••••••••••••••••••••••</_param>
-  <_param name="help" type="description">This effect transmits one or more attributes from the first selected element to the second when a event occurs.</_param>
+  <_param name="help" type="description">This effect transmits one or more attributes from the first selected element to the second when an event occurs.</_param>
   <_param name="sep2" type="description">••••••••••••••••••••••••••••••••••••••••••••••••</_param>
   <_param name="help" type="description">If you want to transmit more than one attribute, you should separate this with a space, and only with a space.</_param>
   <param name="att" type="string" _gui-text="Attribute to transmit">fill</param>
@@ -29,7 +29,7 @@
   </param>
   <_param name="help" type="description">The next parameter is useful when you select more than two elements</_param>
   <param name="from-and-to" type="enum" _gui-text="Source and destination of transmitting">
-    <_item value="g-to-one">All selected ones transmits to the last one</_item>
+    <_item value="g-to-one">All selected ones transmit to the last one</_item>
     <_item value="one-to-g">The first selected transmits to all others</_item>
   </param>
   <effect>

diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 4a13890d78c4137b8c5aa6dd9e2662d4d5299ded..e8d7c4baf3f53b198120e4da24011ef49c5649b0 100644 (file)
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -131,7 +131,7 @@ ExecutionEnv::createWorkingDialog (void) {
         return;
     Gtk::Window *window = Glib::wrap(GTK_WINDOW(toplevel), false);
 
-    gchar * dlgmessage = g_strdup_printf(_("'%s' working, please wait..."), _effect->get_name());
+    gchar * dlgmessage = g_strdup_printf(_("'%s' working, please wait..."), _(_effect->get_name()));
     _visibleDialog = new Gtk::MessageDialog(*window,
                                dlgmessage,
                                false, // use markup

diff --git a/src/live_effects/lpe-rough-hatches.cpp b/src/live_effects/lpe-rough-hatches.cpp
index 4df1064ced4cf2c6b7b01d1a97e1d1bd8fd0f9b0..bcfd0f3736d845bc544f928169d9429e06b65fe7 100644 (file)
--- a/src/live_effects/lpe-rough-hatches.cpp
+++ b/src/live_effects/lpe-rough-hatches.cpp
@@ -226,24 +226,24 @@ LPERoughHatches::LPERoughHatches(LivePathEffectObject *lpeobject) :
     dist_rdm(_("Frequency randomness"), _("Variation of distance between hatches, in %."), "dist_rdm", &wr, this, 75),
     growth(_("Growth"), _("Growth of distance between hatches."), "growth", &wr, this, 0.),
 //FIXME: top/bottom names are inverted in the UI/svg and in the code!!
-    scale_tf(_("Half turns smoothness: 1st side, in"), _("Set smoothness/sharpness of path when reaching a 'bottom' halfturn. 0=sharp, 1=default"), "scale_bf", &wr, this, 1.),
-    scale_tb(_("1st side, out"), _("Set smoothness/sharpness of path when leaving a 'bottom' halfturn. 0=sharp, 1=default"), "scale_bb", &wr, this, 1.),
-    scale_bf(_("2nd side, in"), _("Set smoothness/sharpness of path when reaching a 'top' halfturn. 0=sharp, 1=default"), "scale_tf", &wr, this, 1.),
-    scale_bb(_("2nd side, out"), _("Set smoothness/sharpness of path when leaving a 'top' halfturn. 0=sharp, 1=default"), "scale_tb", &wr, this, 1.),
-    top_edge_variation(_("Magnitude jitter: 1st side"), _("Randomly moves 'bottom' halfsturns to produce magnitude variations."), "bottom_edge_variation", &wr, this, 0),
-    bot_edge_variation(_("2nd side"), _("Randomly moves 'top' halfsturns to produce magnitude variations."), "top_edge_variation", &wr, this, 0),
-    top_tgt_variation(_("Parallelism jitter: 1st side"), _("Add direction randomness by moving 'bottom' halfsturns tangentially to the boundary."), "bottom_tgt_variation", &wr, this, 0),
-    bot_tgt_variation(_("2nd side"), _("Add direction randomness by randomly moving 'top' halfsturns tangentially to the boundary."), "top_tgt_variation", &wr, this, 0),
-    top_smth_variation(_("Variance: 1st side"), _("Randomness of 'bottom' halfturns smoothness"), "top_smth_variation", &wr, this, 0),
-    bot_smth_variation(_("2nd side"), _("Randomness of 'top' halfturns smoothness"), "bottom_smth_variation", &wr, this, 0),
+    scale_tf(_("Half-turns smoothness: 1st side, in"), _("Set smoothness/sharpness of path when reaching a 'bottom' half-turn. 0=sharp, 1=default"), "scale_bf", &wr, this, 1.),
+    scale_tb(_("1st side, out"), _("Set smoothness/sharpness of path when leaving a 'bottom' half-turn. 0=sharp, 1=default"), "scale_bb", &wr, this, 1.),
+    scale_bf(_("2nd side, in"), _("Set smoothness/sharpness of path when reaching a 'top' half-turn. 0=sharp, 1=default"), "scale_tf", &wr, this, 1.),
+    scale_bb(_("2nd side, out"), _("Set smoothness/sharpness of path when leaving a 'top' half-turn. 0=sharp, 1=default"), "scale_tb", &wr, this, 1.),
+    top_edge_variation(_("Magnitude jitter: 1st side"), _("Randomly moves 'bottom' half-turns to produce magnitude variations."), "bottom_edge_variation", &wr, this, 0),
+    bot_edge_variation(_("2nd side"), _("Randomly moves 'top' half-turns to produce magnitude variations."), "top_edge_variation", &wr, this, 0),
+    top_tgt_variation(_("Parallelism jitter: 1st side"), _("Add direction randomness by moving 'bottom' half-turns tangentially to the boundary."), "bottom_tgt_variation", &wr, this, 0),
+    bot_tgt_variation(_("2nd side"), _("Add direction randomness by randomly moving 'top' half-turns tangentially to the boundary."), "top_tgt_variation", &wr, this, 0),
+    top_smth_variation(_("Variance: 1st side"), _("Randomness of 'bottom' half-turns smoothness"), "top_smth_variation", &wr, this, 0),
+    bot_smth_variation(_("2nd side"), _("Randomness of 'top' half-turns smoothness"), "bottom_smth_variation", &wr, this, 0),
 //
-    fat_output(_("Generate thick/thin path"), _("Simulate a stroke of varrying width"), "fat_output", &wr, this, true),
+    fat_output(_("Generate thick/thin path"), _("Simulate a stroke of varying width"), "fat_output", &wr, this, true),
     do_bend(_("Bend hatches"), _("Add a global bend to the hatches (slower)"), "do_bend", &wr, this, true),
-    stroke_width_top(_("Thickness: at 1st side"), _("Width at 'bottom' half turns"), "stroke_width_top", &wr, this, 1.),
-    stroke_width_bot(_("at 2nd side"), _("Width at 'top' halfturns"), "stroke_width_bottom", &wr, this, 1.),
+    stroke_width_top(_("Thickness: at 1st side"), _("Width at 'bottom' half-turns"), "stroke_width_top", &wr, this, 1.),
+    stroke_width_bot(_("at 2nd side"), _("Width at 'top' half-turns"), "stroke_width_bottom", &wr, this, 1.),
 //
-    front_thickness(_("from 2nd to 1st side"), _("Width of paths from 'top' to 'bottom' halfturns"), "front_thickness", &wr, this, 1.),
-    back_thickness(_("from 1st to 2nd side"), _("Width of paths from 'top' to 'bottom' halfturns"), "back_thickness", &wr, this, .25),
+    front_thickness(_("from 2nd to 1st side"), _("Width from 'top' to 'bottom'"), "front_thickness", &wr, this, 1.),
+    back_thickness(_("from 1st to 2nd side"), _("Width from 'bottom' to 'top'"), "back_thickness", &wr, this, .25),
 
     direction(_("Hatches width and dir"), _("Defines hatches frequency and direction"), "direction", &wr, this, Geom::Point(50,0)),
 //

diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index 32fb763d3ca57377aad6eb27d7e5846f95119230..7fd0ac0b493c1ee4258747f7dc005af6829a55f0 100644 (file)
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -49,7 +49,7 @@ LPEVonKoch::LPEVonKoch(LivePathEffectObject *lpeobject) :
     similar_only(_("Use uniform transforms only"), _("2 consecutive segments are used to reverse/preserve orientation only (otherwise, they define a general transform)."), "similar_only", &wr, this, false),
     drawall(_("Draw all generations"), _("If unchecked, draw only the last generation"), "drawall", &wr, this, true),
     //,draw_boxes(_("Display boxes"), _("Display boxes instead of paths only"), "draw_boxes", &wr, this, true)
-    ref_path(_("Reference segment"), _("The reference segment. Defaults to bbox diameter."), "ref_path", &wr, this, "M0,0 L10,0"),
+    ref_path(_("Reference segment"), _("The reference segment. Defaults to the horizontal midline of the bbox."), "ref_path", &wr, this, "M0,0 L10,0"),
     //refA(_("Ref Start"), _("Left side middle of the reference box"), "refA", &wr, this),
     //refB(_("Ref End"), _("Right side middle of the reference box"), "refB", &wr, this),
     //FIXME: a path is used here instead of 2 points to work around path/point param incompatibility bug.

diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index c8e3ab204d069c1ca51c1f4c459e1f9c13b7b575..6b83413e481c184a2a0745f7d8381e2a1a4fadcf 100644 (file)
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -930,7 +930,7 @@ ArcKnotHolder::ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRelea
                       _("Adjust ellipse <b>height</b>, with <b>Ctrl</b> to make circle"),
                       SP_KNOT_SHAPE_SQUARE, SP_KNOT_MODE_XOR);
     entity_start->create(desktop, item, this,
-                         _("Position the <b>start point</b> of the arc or segment; with <b>Ctrl</b>"
+                         _("Position the <b>start point</b> of the arc or segment; with <b>Ctrl</b> "
                            "to snap angle; drag <b>inside</b> the ellipse for arc, <b>outside</b> for segment"),
                          SP_KNOT_SHAPE_CIRCLE, SP_KNOT_MODE_XOR);
     entity_end->create(desktop, item, this,

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 662dc1cac7370d3007ac135aace282407e0905d5..3950482803a544b3efe179f976b39ad03204de72 100644 (file)
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -1062,7 +1062,7 @@ sp_item_description(SPItem *item)
             const gchar *label = SP_OBJECT_STYLE(item)->filter.href->getObject()->label();
             gchar *snew;
             if (label) {
-                snew = g_strdup_printf (_("%s; <i>filtered (%s)</i>"), s, label);
+                snew = g_strdup_printf (_("%s; <i>filtered (%s)</i>"), s, _(label));
             } else {
                 snew = g_strdup_printf (_("%s; <i>filtered</i>"), s);
             }

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 9b6d9e0847bde98e24e5ba718af1d4971f4fa91f..438371b8ca9ed49cdb6fc79741908d9d6ad20beb 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -220,11 +220,11 @@ void InkscapePreferences::initPageSnapping()
 
     _snap_delay.init("/options/snapdelay/value", 0, 1000, 50, 100, 300, 0);
     _page_snapping.add_line( false, _("Delay (in ms):"), _snap_delay, "",
-                             _("Postpone snapping as long as the mouse is moving, and then wait an additional fraction of a second. This additional delay is specified here. When set to zero or to a very small number, snapping will be immediate"), true);
+                             _("Postpone snapping as long as the mouse is moving, and then wait an additional fraction of a second. This additional delay is specified here. When set to zero or to a very small number, snapping will be immediate."), true);
 
     _snap_closest_only.init( _("Only snap the node closest to the pointer"), "/options/snapclosestonly/value", false);
     _page_snapping.add_line( false, "", _snap_closest_only, "",
-                             _("Only try to snap the node that is initialy closest to the mouse pointer"));
+                             _("Only try to snap the node that is initially closest to the mouse pointer"));
 
     _snap_weight.init("/options/snapweight/value", 0, 1, 0.1, 0.2, 0.5, 1);
     _page_snapping.add_line( false, _("Weight factor:"), _snap_weight, "",

diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 80a551f6a660b2b3358d016d655ebba14fc9822b..916e4363c9dbf5c0511cb7a4a746cd0ea934a67e 100644 (file)
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -303,7 +303,7 @@ void ColorICCSelector::init()
 
 
     _profileSel = gtk_combo_box_new_text();
-    gtk_combo_box_append_text( GTK_COMBO_BOX(_profileSel), "<none>" );
+    gtk_combo_box_append_text( GTK_COMBO_BOX(_profileSel), _("<none>") );
     gtk_widget_show( _profileSel );
     gtk_combo_box_set_active( GTK_COMBO_BOX(_profileSel), 0 );
     gtk_table_attach( GTK_TABLE(t), _profileSel, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, XPAD, YPAD );
@@ -576,7 +576,7 @@ void ColorICCSelector::_profilesChanged( std::string const & name )
         gtk_combo_box_remove_text( combo, 0 );
     }
 
-    gtk_combo_box_append_text( combo, "<none>");
+    gtk_combo_box_append_text( combo, _("<none>"));
 
     gtk_combo_box_set_active( combo, 0 );