textual patch from bug 408093

(bzr r8563)

16 files changed, 40 insertions, 41 deletions

diff --git a/share/extensions/draw_from_triangle.inx b/share/extensions/draw_from_triangle.inx
index 7973cda8a..341388dc3 100644
--- 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 196bc3c9e..38843210c 100644
--- 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 5ad63c565..70aae46d5 100644
--- 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 a557deb94..169385001 100644
--- 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 38f929846..8b47de958 100644
--- 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 ee5fa9c2e..b282fe0d9 100644
--- 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 4fc7287ff..a4ee40852 100644
--- 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 88cf0e2c9..fe52828b8 100644
--- 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 4f1de90c7..e7807b469 100644
--- 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 ae73d6b27..514ace94a 100644
--- 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 256f97e85..40954380f 100644
--- 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 07d222a16..cd79860af 100644
--- 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 7c76d7162..f14b400cd 100755
--- 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 8eaf747e5..fd1af0544 100644
--- 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 e8caa94ea..5bb14d285 100644
--- 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 c1d5895b3..caf284b93 100644
--- 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>