Fix for Bug #982846 (untranslatable and unlocalized strings).

(bzr r11356)

3 files changed, 41 insertions, 109 deletions

diff --git a/po/inkscape.pot b/po/inkscape.pot
index 349da4c1f..fb7e863ab 100644
--- a/po/inkscape.pot
+++ b/po/inkscape.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-05-11 14:59+0200\n"
+"POT-Creation-Date: 2012-05-11 16:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6801,7 +6801,7 @@ msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:100
 #: ../src/extension/internal/filter/bumps.h:334
-#: ../share/extensions/measure.inx.h:27
+#: ../share/extensions/measure.inx.h:10
 msgid "Precision:"
 msgstr ""
 
@@ -11138,19 +11138,19 @@ msgid "_New"
 msgstr ""
 
 #. "       <verb verb-id=\"FileExportToOCAL\" />\n"
-#: ../src/menus-skeleton.h:45 ../src/verbs.cpp:2475 ../src/verbs.cpp:2481
+#: ../src/menus-skeleton.h:44 ../src/verbs.cpp:2475 ../src/verbs.cpp:2481
 msgid "_Edit"
 msgstr ""
 
-#: ../src/menus-skeleton.h:55 ../src/verbs.cpp:2259
+#: ../src/menus-skeleton.h:54 ../src/verbs.cpp:2259
 msgid "Paste Si_ze"
 msgstr ""
 
-#: ../src/menus-skeleton.h:67
+#: ../src/menus-skeleton.h:66
 msgid "Clo_ne"
 msgstr ""
 
-#: ../src/menus-skeleton.h:81
+#: ../src/menus-skeleton.h:80
 msgid "Selec_t Same"
 msgstr ""
 
@@ -14176,8 +14176,7 @@ msgstr ""
 #: ../share/extensions/jessyInk_view.inx.h:3
 #: ../share/extensions/layout_nup.inx.h:15
 #: ../share/extensions/lindenmayer.inx.h:23
-#: ../share/extensions/lorem_ipsum.inx.h:1
-#: ../share/extensions/measure.inx.h:19
+#: ../share/extensions/lorem_ipsum.inx.h:1 ../share/extensions/measure.inx.h:3
 #: ../share/extensions/pathalongpath.inx.h:5
 #: ../share/extensions/pathscatter.inx.h:6
 #: ../share/extensions/radiusrand.inx.h:1 ../share/extensions/split.inx.h:1
@@ -22036,7 +22035,7 @@ msgstr ""
 
 #. Dialogs
 #: ../src/verbs.cpp:2636
-msgid "In_kscape Preferences..."
+msgid "P_references..."
 msgstr ""
 
 #: ../src/verbs.cpp:2637
@@ -23716,7 +23715,7 @@ msgid "Visual"
 msgstr ""
 
 #: ../share/extensions/dimension.inx.h:5 ../share/extensions/dots.inx.h:13
-#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:38
+#: ../share/extensions/handles.inx.h:2 ../share/extensions/measure.inx.h:21
 msgid "Visualize Path"
 msgstr ""
 
@@ -26241,111 +26240,46 @@ msgid "solid"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:1
-msgid "Angle 0"
+msgid "Angle [with Fixed Angle option only] (°):"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:2
-msgid "Angle 120"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:3
-msgid "Angle 135"
+msgid "Font size (px):"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:4
-msgid "Angle 150"
+msgid "Length"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:5
-msgid "Angle 180"
+msgid "Length Unit:"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:6
-msgid "Angle 210"
+msgid "Measure"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:7
-msgid "Angle 225"
+msgid "Measure Path"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:8
-msgid "Angle 240"
+msgid "Measurement Type: "
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:9
-msgid "Angle 270"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:10
-msgid "Angle 30"
+msgid "Offset (px):"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:11
-msgid "Angle 300"
+msgid "Scale Factor (Drawing:Real Length) = 1:"
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:12
-msgid "Angle 315"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:13
-msgid "Angle 330"
+msgid "Text Orientation: "
 msgstr ""
 
 #: ../share/extensions/measure.inx.h:14
-msgid "Angle 45"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:15
-msgid "Angle 60"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:16
-msgid "Angle 90"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:17
-msgid "Display Format: "
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:18
-msgid "Font size (px):"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:20
-msgid "Length"
-msgstr ""
-
-#. <param name="unit" type="string" _gui-text="Unit {km|m|cm|mm|in|px|pt}">mm</param>
-#: ../share/extensions/measure.inx.h:22
-msgid "Length Unit:"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:23
-msgid "Measure"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:24
-msgid "Measure Path"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:25
-msgid "Measurement Type: "
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:26
-msgid "Offset (px):"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:28
-msgid "Scale Factor (Drawing:Real Length) = 1:"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:29
-msgid "Text On Path"
-msgstr ""
-
-#: ../share/extensions/measure.inx.h:31
 #, no-c-format
 msgid ""
 "This effect measures the length, or area, of the selected paths and adds it "
@@ -26364,11 +26298,21 @@ msgid ""
 "0.03%."
 msgstr ""
 
-#: ../share/extensions/measure.inx.h:39
+#: ../share/extensions/measure.inx.h:22
 msgctxt "measure extension"
 msgid "Area"
 msgstr ""
 
+#: ../share/extensions/measure.inx.h:23
+msgctxt "measure extension"
+msgid "Fixed Angle"
+msgstr ""
+
+#: ../share/extensions/measure.inx.h:24
+msgctxt "measure extension"
+msgid "Text On Path"
+msgstr ""
+
 #: ../share/extensions/motion.inx.h:1 ../share/extensions/restack.inx.h:1
 msgid "Angle:"
 msgstr ""
diff --git a/share/extensions/measure.inx b/share/extensions/measure.inx
index 67d44616f..cfbc3fce7 100644
--- a/share/extensions/measure.inx
+++ b/share/extensions/measure.inx
@@ -10,31 +10,15 @@
 				<_item value="length">Length</_item>
 				<_item msgctxt="measure extension" value="area">Area</_item>
 			</param>
-			<param name="format" type="enum" _gui-text="Display Format: ">
-				<_item value="textonpath">Text On Path</_item>
-				<_item value="0">Angle  0</_item>
-				<_item value="30">Angle 30</_item>
-				<_item value="45">Angle 45</_item>
-				<_item value="60">Angle 60</_item>
-				<_item value="90">Angle 90</_item>
-				<_item value="120">Angle 120</_item>
-				<_item value="135">Angle 135</_item>
-				<_item value="150">Angle 150</_item>
-				<_item value="180">Angle 180</_item>
-				<_item value="210">Angle 210</_item>
-				<_item value="225">Angle 225</_item>
-				<_item value="240">Angle 240</_item>
-				<_item value="270">Angle 270</_item>
-				<_item value="300">Angle 300</_item>
-				<_item value="315">Angle 315</_item>
-				<_item value="330">Angle 330</_item>
+			<param name="format" type="enum" _gui-text="Text Orientation: ">
+				<_item msgctxt="measure extension" value="textonpath">Text On Path</_item>
+				<_item msgctxt="measure extension" value="angle">Fixed Angle</_item>
 			</param>
+			<param name="angle" type="float" min="-360" max="360" _gui-text="Angle [with Fixed Angle option only] (°):">0</param>
 			<param name="fontsize" type="int" min="1" max="1000" _gui-text="Font size (px):">12</param>
 			<param name="offset" type="float" min="-10000" max="10000" _gui-text="Offset (px):">-6</param>
 			<param name="precision" type="int" min="0" max="25" _gui-text="Precision:">2</param>
 			<param name="scale" type="float" min="1e-8" max="1e10" _gui-text="Scale Factor (Drawing:Real Length) = 1:">1</param>
-			<!--<param name="orient" type="boolean" _gui-text="Keep text orientation upright">true</param>-->
-			<!--<param name="unit" type="string" _gui-text="Unit {km|m|cm|mm|in|px|pt}">mm</param>-->
 			<param name="unit" type="enum" _gui-text="Length Unit:">
 				<item value="px">px</item>
 				<item value="pt">pt</item>
diff --git a/share/extensions/measure.py b/share/extensions/measure.py
index 415b21898..a1ae00ce1 100755
--- a/share/extensions/measure.py
+++ b/share/extensions/measure.py
@@ -94,7 +94,11 @@ class Length(inkex.Effect):
         self.OptionParser.add_option("--format",
                         action="store", type="string", 
                         dest="format", default="textonpath",
-                        help="Display Format")
+                        help="Text Orientation")
+        self.OptionParser.add_option("--angle",
+                        action="store", type="float", 
+                        dest="angle", default=0,
+                        help="Angle")             
         self.OptionParser.add_option("-f", "--fontsize",
                         action="store", type="int", 
                         dest="fontsize", default=20,
@@ -161,9 +165,9 @@ class Length(inkex.Effect):
                         self.addTextOnPath(self.group, 0, 0, lenstr+' '+self.options.unit+'^2', id, 'start', '0%', self.options.offset)
                 else:
                     if self.options.type == "length":
-                        self.addTextWithTspan(self.group, p[0][0][1][0], p[0][0][1][1], lenstr+' '+self.options.unit, id, 'start', -int(self.options.format), self.options.offset + self.options.fontsize/2)
+                        self.addTextWithTspan(self.group, p[0][0][1][0], p[0][0][1][1], lenstr+' '+self.options.unit, id, 'start', -int(self.options.angle), self.options.offset + self.options.fontsize/2)
                     else:
-                        self.addTextWithTspan(self.group, p[0][0][1][0], p[0][0][1][1], lenstr+' '+self.options.unit+'^2', id, 'start', -int(self.options.format), -self.options.offset + self.options.fontsize/2)
+                        self.addTextWithTspan(self.group, p[0][0][1][0], p[0][0][1][1], lenstr+' '+self.options.unit+'^2', id, 'start', -int(self.options.angle), -self.options.offset + self.options.fontsize/2)
 
     def addTextOnPath(self, node, x, y, text, id, anchor, startOffset, dy = 0):
                 new = inkex.etree.SubElement(node,inkex.addNS('textPath','svg'))