merge from trunk (r12322)

(bzr r11668.1.69)

5 files changed, 26 insertions, 26 deletions

diff --git a/share/extensions/color_HSL_adjust.inx b/share/extensions/color_HSL_adjust.inx
index b5a18c419..bf86a9856 100644
--- a/share/extensions/color_HSL_adjust.inx
+++ b/share/extensions/color_HSL_adjust.inx
@@ -7,11 +7,11 @@
   <dependency type="executable" location="extensions">simplestyle.py</dependency>
   <param name="tab" type="notebook">
     <page name="Options" _gui-text="Options">
-      <param name="hue"        type="int" appearance="full" min="-360" max="360" indent="0" _gui-text="Hue (°):">0</param>
+      <param name="hue"        type="int" appearance="full" min="-360" max="360" indent="0" _gui-text="Hue (°)">0</param>
       <param name="random_h"   type="boolean" _gui-text="Random hue">false</param>
-      <param name="saturation" type="int" appearance="full" min="-100" max="100" indent="0" _gui-text="Saturation (%):">0</param>
+      <param name="saturation" type="int" appearance="full" min="-100" max="100" indent="0" _gui-text="Saturation (%)">0</param>
       <param name="random_s"   type="boolean" _gui-text="Random saturation">false</param>
-      <param name="lightness"  type="int" appearance="full" min="-100" max="100" indent="0" _gui-text="Lightness (%):">0</param>
+      <param name="lightness"  type="int" appearance="full" min="-100" max="100" indent="0" _gui-text="Lightness (%)">0</param>
       <param name="random_l"   type="boolean" _gui-text="Random lightness">false</param>
     </page>
     <page name="Help" _gui-text="Help">
diff --git a/share/extensions/guillotine.inx b/share/extensions/guillotine.inx
index 6e2aa000e..3cf34cc5e 100644
--- a/share/extensions/guillotine.inx
+++ b/share/extensions/guillotine.inx
@@ -8,9 +8,9 @@
 	<dependency type="executable" location="extensions">guillotine.py</dependency>
 	<dependency type="executable" location="extensions">inkex.py</dependency>
 	
-	<param name="directory" type="string" _gui-text="Directory to save images to">~/</param>
-	<param name="image" type="string" _gui-text="Image name (without extension)">guillotined</param>
-	<param name="ignore" type="boolean" _gui-text="Ignore these settings and use export hints?">false</param>
+	<param name="directory" type="string" _gui-text="Directory to save images to:">~/</param>
+	<param name="image" type="string" _gui-text="Image name (without extension):">guillotined</param>
+	<param name="ignore" type="boolean" _gui-text="Ignore these settings and use export hints">false</param>
 	
     <effect needs-live-preview="false">
                 <object-type>all</object-type>
diff --git a/share/extensions/hpgl_output.inx b/share/extensions/hpgl_output.inx
index 492df0b0d..2ce284200 100644
--- a/share/extensions/hpgl_output.inx
+++ b/share/extensions/hpgl_output.inx
@@ -7,9 +7,9 @@
     <dependency type="executable" location="extensions">inkex.py</dependency>
     <_param name="introduction" type="description">Please make sure that all objects you want to plot are converted to paths. The plot will automatically be aligned to the zero point.</_param>
     <param name="horizontal_guide" type="description">—————————————————————————————</param>
-    <param name="resolution" type="int" min="90" max="2048" _gui-text="Resolution (dpi)" _gui-description="The amount of steps the cutter moves if it moves for 1 inch, either get this value from your plotter manual or learn it by trial and error (Standard: '1016')">1016</param>
-    <param name="pen" type="int" min="1" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
-    <param name="angle" type="optiongroup" appearance="minimal" _gui-text="Orientation" _gui-description="Orientation of the plot, change this if your plotter is plotting horizontal instead of vertical (Standard: '90°')">
+    <param name="resolution" type="int" min="90" max="2048" _gui-text="Resolution (dpi):" _gui-description="The amount of steps the cutter moves if it moves for 1 inch, either get this value from your plotter manual or learn it by trial and error (Standard: '1016')">1016</param>
+    <param name="pen" type="int" min="1" max="10" _gui-text="Pen number:" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param>
+    <param name="angle" type="optiongroup" appearance="minimal" _gui-text="Orientation:" _gui-description="Orientation of the plot, change this if your plotter is plotting horizontal instead of vertical (Standard: '90°')">
         <option value="90">90°</option>
         <option value="-90">-90°</option>
         <option value="0">0°</option>
@@ -17,22 +17,22 @@
     </param>
     <param name="mirror" type="boolean" _gui-text="Mirror Y-axis" _gui-description="Whether to mirror the Y axis. Some plotters need this, some not. Look in your plotter manual or learn it by trial and error (Standard: 'False')">false</param>
     <param name="center" type="boolean" _gui-text="Center Zero Point" _gui-description="Whether the plotter needs the zero point to be in the center of the drawing. Some plotters need this, some not. Look in your plotter manual or learn it by trial and error (Standard: 'False')">false</param>
-    <param name="flat" type="float" min="0.1" max="10.0" precision="1" _gui-text="Curve flatness" _gui-description="Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Standard: '1.2')">1.2</param>
+    <param name="flat" type="float" min="0.1" max="10.0" precision="1" _gui-text="Curve flatness:" _gui-description="Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Standard: '1.2')">1.2</param>
     <param name="horizontal_guide" type="description">—————————————————————————————</param>
     <param name="useOvercut" type="boolean" _gui-text="Use Overcut" _gui-description="Whether the overcut will be used, if not the 'Overcut' parameter is unused (Standard: 'True')">true</param>
-    <param name="overcut" type="float" min="0.0" max="100.0" precision="2" _gui-text="Overcut (mm)" _gui-description="The distance in mm that will be cut over the starting point of the path to prevent open paths (Standard: '1.00')">1.00</param>
+    <param name="overcut" type="float" min="0.0" max="100.0" precision="2" _gui-text="Overcut (mm):" _gui-description="The distance in mm that will be cut over the starting point of the path to prevent open paths (Standard: '1.00')">1.00</param>
     <param name="horizontal_guide" type="description">—————————————————————————————</param>
     <param name="correctToolOffset" type="boolean" _gui-text="Correct tool offset" _gui-description="Whether the tool offset should be corrected, if not the 'Tool offset' and 'Return Factor' parameters are unused (Standard: 'True')">true</param>
-    <param name="toolOffset" type="float" min="0.0" max="100.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Standard: '0.25')">0.25</param>
-    <param name="toolOffsetReturn" type="float" min="1.0" max="10.0" precision="2" _gui-text="Return Factor" _gui-description="The return factor multiplied by the tool offset is the length that is used to guide the tool back to the original path after an overcut is performed, you can only determine this value by experimentation (Standard: '2.50')">2.50</param>
+    <param name="toolOffset" type="float" min="0.0" max="100.0" precision="2" _gui-text="Tool offset (mm):" _gui-description="The offset from the tool tip to the tool axis in mm (Standard: '0.25')">0.25</param>
+    <param name="toolOffsetReturn" type="float" min="1.0" max="10.0" precision="2" _gui-text="Return Factor:" _gui-description="The return factor multiplied by the tool offset is the length that is used to guide the tool back to the original path after an overcut is performed, you can only determine this value by experimentation (Standard: '2.50')">2.50</param>
     <param name="horizontal_guide" type="description">—————————————————————————————</param>
-    <param name="xOffset" type="float" min="0.0" max="10000.0" precision="2" _gui-text="X offset (mm)" _gui-description="The offset to move your plot away from the zero point in mm (Standard: '0.00')">0.00</param>
-    <param name="yOffset" type="float" min="0.0" max="10000.0" precision="2" _gui-text="Y offset (mm)" _gui-description="The offset to move your plot away from the zero point in mm (Standard: '0.00')">0.00</param>
+    <param name="xOffset" type="float" min="0.0" max="10000.0" precision="2" _gui-text="X offset (mm):" _gui-description="The offset to move your plot away from the zero point in mm (Standard: '0.00')">0.00</param>
+    <param name="yOffset" type="float" min="0.0" max="10000.0" precision="2" _gui-text="Y offset (mm):" _gui-description="The offset to move your plot away from the zero point in mm (Standard: '0.00')">0.00</param>
     <param name="plotInvisibleLayers" type="boolean" _gui-text="Plot invisible layers" _gui-description="Plot invisible layers (Standard: 'False')">false</param>
     <param name="horizontal_guide" type="description">—————————————————————————————</param>
     <param name="sendToPlotter" type="boolean" _gui-text="Send to Plotter also" _gui-description="Sends the generated HPGL data also via serial connection to your plotter (Standard: 'False')">false</param>
-    <param name="port" type="string" _gui-text="Serial Port" _gui-description="The port of your serial connection, on Windows something like 'COM1', on Linux something like: '/dev/ttyUSB0' (Standard: 'COM1')">COM1</param>
-    <param name="baudRate" type="optiongroup" appearance="minimal" _gui-text="Baud Rate" _gui-description="The Baud rate of your serial connection (Standard: '9600')">
+    <param name="port" type="string" _gui-text="Serial Port:" _gui-description="The port of your serial connection, on Windows something like 'COM1', on Linux something like: '/dev/ttyUSB0' (Standard: 'COM1')">COM1</param>
+    <param name="baudRate" type="optiongroup" appearance="minimal" _gui-text="Baud Rate:" _gui-description="The Baud rate of your serial connection (Standard: '9600')">
         <option value="110">110</option>
         <option value="300">300</option>
         <option value="600">600</option>
diff --git a/share/extensions/param_curves.inx b/share/extensions/param_curves.inx
index 25018c5e5..53d4e1337 100644
--- a/share/extensions/param_curves.inx
+++ b/share/extensions/param_curves.inx
@@ -8,11 +8,11 @@
         <page name="sampling"  _gui-text="Range and Sampling">
             <param name="t_start"  type="float" min="-1000.0" max="1000.0" _gui-text="Start t-value:">0.0</param>
             <param name="t_end"    type="float" min="-1000.0" max="1000.0" _gui-text="End t-value:">1.0</param>
-            <param name="times2pi" type="boolean"                          _gui-text="Multiply t-range by 2*pi:">true</param>
-            <param name="xleft"    type="float" min="-1000.0" max="1000.0" _gui-text="x-value of rectangle's left:">-1.0</param>
-            <param name="xright"   type="float" min="-1000.0" max="1000.0" _gui-text="x-value of rectangle's right:">1.0</param>
-            <param name="ybottom"  type="float" min="-1000.0" max="1000.0" _gui-text="y-value of rectangle's bottom:">-1.0</param>
-            <param name="ytop"     type="float" min="-1000.0" max="1000.0" _gui-text="y-value of rectangle's top:">1.0</param>
+            <param name="times2pi" type="boolean"                          _gui-text="Multiply t-range by 2*pi">true</param>
+            <param name="xleft"    type="float" min="-1000.0" max="1000.0" _gui-text="X-value of rectangle's left:">-1.0</param>
+            <param name="xright"   type="float" min="-1000.0" max="1000.0" _gui-text="X-value of rectangle's right:">1.0</param>
+            <param name="ybottom"  type="float" min="-1000.0" max="1000.0" _gui-text="Y-value of rectangle's bottom:">-1.0</param>
+            <param name="ytop"     type="float" min="-1000.0" max="1000.0" _gui-text="Y-value of rectangle's top:">1.0</param>
             <param name="samples"  type="int"   min="2"       max="1000"   _gui-text="Samples:">30</param>
             <param name="isoscale" type="boolean" _gui-text="Isotropic scaling">false</param>
             <_param name="isoscaledesc" type="description">When set, Isotropic scaling uses smallest of width/xrange or height/yrange</_param>
@@ -33,8 +33,8 @@ cosh(x); sinh(x); tanh(x).
 The constants pi and e are also available.</_param>
         </page>
     </param>
-    <param name="fofx"     type="string"  _gui-text="x-Function:">cos(3*t)</param>
-    <param name="fofy"     type="string"  _gui-text="y-Function:">sin(5*t)</param>
+    <param name="fofx"     type="string"  _gui-text="X-Function:">cos(3*t)</param>
+    <param name="fofy"     type="string"  _gui-text="Y-Function:">sin(5*t)</param>
     <param name="remove"   type="boolean" _gui-text="Remove rectangle">true</param>
     <param name="drawaxis" type="boolean" _gui-text="Draw Axes">false</param>
     <effect>
diff --git a/share/extensions/replace_font.inx b/share/extensions/replace_font.inx
index 8ec90904b..265acdb0b 100644
--- a/share/extensions/replace_font.inx
+++ b/share/extensions/replace_font.inx
@@ -9,8 +9,8 @@
 
      <param name="action" type="notebook">
         <page name="find_replace" _gui-text="Find and Replace font">
-            <param name="fr_find" type="string" _gui-text="Find this font: "></param>
-            <param name="fr_replace" type="string" _gui-text="And replace with: "></param>
+            <param name="fr_find" type="string" _gui-text="Find font: "></param>
+            <param name="fr_replace" type="string" _gui-text="Replace with: "></param>
         </page>
         <page name="replace_all" _gui-text="Replace font">
             <param name="r_replace" type="string" _gui-text="Replace all fonts with: "></param>