From 52f5519ad20ae01ad83978615173eac0080e7e1f Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Sun, 19 Oct 2014 12:45:53 +0200
Subject: Typo. Fixing typos in translatable strings. Translations. POT file
 and Italian translation update (by Firas Hanife).

(bzr r13626)
---
 share/extensions/gcodetools.py  | 4 ++--
 share/symbols/MapSymbolsNPS.svg | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'share')

diff --git a/share/extensions/gcodetools.py b/share/extensions/gcodetools.py
index b9e6348f2..12f438cca 100755
--- a/share/extensions/gcodetools.py
+++ b/share/extensions/gcodetools.py
@@ -3321,7 +3321,7 @@ class Gcodetools(inkex.Effect):
 				self.error(_("No paths are selected! Trying to work on all available paths."),"warning")
 
 			if self.selected_paths == {}:
-				self.error(_("Noting is selected. Please select something."),"warning")
+				self.error(_("Nothing is selected. Please select something."),"warning")
 			a = self.options.plasma_prepare_corners_tolerance
 			corner_tolerance = cross([1.,0.], [math.cos(a),math.sin(a)])
 
@@ -4664,7 +4664,7 @@ class Gcodetools(inkex.Effect):
 ################################################################################
 	def dxfpoints(self):
 		if self.selected_paths == {}:
-			self.error(_("Noting is selected. Please select something to convert to drill point (dxfpoint) or clear point sign."),"warning")
+			self.error(_("Nothing is selected. Please select something to convert to drill point (dxfpoint) or clear point sign."),"warning")
 		for layer in self.layers :
 			if layer in self.selected_paths :
 				for path in self.selected_paths[layer]:
diff --git a/share/symbols/MapSymbolsNPS.svg b/share/symbols/MapSymbolsNPS.svg
index 4a8a4bdba..81b24adde 100644
--- a/share/symbols/MapSymbolsNPS.svg
+++ b/share/symbols/MapSymbolsNPS.svg
@@ -309,7 +309,7 @@
     </symbol>
 
     <symbol id="FourWheelDriveRoad">
-      <title>Four Wheel Drive Road"</title>
+      <title>Four Wheel Drive Road</title>
       <path d="m 64.5,37.75 0,-7.25 c 0,-2 -1.5,-2.5 -2.5,-2.5 l -14.25,0 -5.25,-8.75 -3,0 5.25,8.75 -4,6.75 -9.25,0 c -3,-6.25 -9.5,-6 -9.5,-6 l -17,0 0,15.25 2.5,0 a 10.6,10.6 0 0 1 21,0 l 15,0 a 10.6,10.6 0 0 1 21,0 l 1,0 c 1,0 1.75,-0.75 1.75,-1.75 l 0,-4.5 z" style="stroke:none"/>
       <g style="fill:none;stroke-width:4">
 	<circle cx="18" cy="45.375" r="5"/>
@@ -318,7 +318,7 @@
     </symbol>
 
     <symbol id="FourWheelDriveRoad_Inv">
-      <title>Four Wheel Drive Road"</title>
+      <title>Four Wheel Drive Road</title>
       <rect x="0.5" y="0.5" width="71" height="71" ry="6" style="stroke:white"/>
       <path d="m 64.5,37.75 0,-7.25 c 0,-2 -1.5,-2.5 -2.5,-2.5 l -14.25,0 -5.25,-8.75 -3,0 5.25,8.75 -4,6.75 -9.25,0 c -3,-6.25 -9.5,-6 -9.5,-6 l -17,0 0,15.25 2.5,0 a 10.6,10.6 0 0 1 21,0 l 15,0 a 10.6,10.6 0 0 1 21,0 l 1,0 c 1,0 1.75,-0.75 1.75,-1.75 l 0,-4.5 z" style="fill:white;stroke:none"/>
       <g style="fill:none;stroke:white;stroke-width:4">
-- 
cgit v1.2.3


From 817c1153fa4607ce381565a1ff9322d2ea2b517d Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 19 Oct 2014 21:06:15 +0200
Subject: Fix a bug in stroke joins in symbolic icons miter toogled with bevel

(bzr r13629)
---
 share/icons/symbolic_icons.svg | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'share')

diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg
index c9eb469ff..cd06c902e 100644
--- a/share/icons/symbolic_icons.svg
+++ b/share/icons/symbolic_icons.svg
@@ -3342,7 +3342,7 @@
 <path sodipodi:nodetypes="ccsccccccscccccccc" inkscape:connector-curvature="0" id="path20410" d="m 1123.2589,965.26843 c 1.4446,2e-5 2.7254,0.37682 3.8422,1.1304 1.266,0.86352 1.8989,2.02531 1.8989,3.48539 0,1.22462 -0.3872,2.19016 -1.1616,2.89665 l -2.1386,1.68946 C 1125,974.95703 1125,975.48298 1125,976.36218 l -5,0 c -0.2552,-2.15311 0.5885,-2.7475 1.2437,-3.4226 0.1786,-0.18839 1.2937,-0.644 2.1715,-1.45396 0.5473,-0.50486 0.9829,-0.78499 0.9829,-1.3659 0,-0.40818 -0.1564,-0.73788 -0.469,-0.98909 -0.2979,-0.25119 -0.6554,-0.37679 -1.0724,-0.3768 -0.4615,10e-6 -1.8575,0.25336 -1.8797,1.8312 l 0.023,0.77715 -3.9998,-0.065 c 0,-0.94199 0.1786,-2.18228 0.5359,-2.87309 0.3426,-0.70649 0.8564,-1.30309 1.5415,-1.78981 1.1318,-0.81638 2.3204,-1.36587 4.1821,-1.36589" style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient19282);fill-opacity:1;stroke:none;font-family:Hegel-Black" />
 <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="text2490" d="m 1120.0496,978.36218 4.9504,0 -0.063,4.90625 -4.8876,0 0,-4.90625" style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient19282);fill-opacity:1;stroke:none;font-family:Hegel-Black" />
 </g>
-<g id="stroke-join-miter-16px" inkscape:label="#join_miter_16px" transform="translate(0,4.0004153)">
+<g id="stroke-join-bevel-16px" inkscape:label="#join_bevel_16px" transform="translate(0,4.0004153)">
 <g inkscape:label="stock-join-bevel" id="g13357" style="display:inline" transform="translate(962.9998,465.36218)">
 <rect style="opacity:0.3;fill:none;stroke:none" id="rect13323" width="16" height="16" x="-160" y="342" transform="translate(241.0002,217)" />
 <path style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" d="m 86.0002,561 -3,3 0,2 0,3 0,5 3,0 0,-10 2,0 1,0 6,0 0,-3 z m 3,6 0,7 3,0 0,-4 3,0 0,-3 z" id="rect13325" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccc" />
@@ -3356,9 +3356,8 @@
 <rect style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" id="rect13355" width="1" height="1" x="87.000198" y="573" />
 </g>
 </g>
-<g id="stroke-join-bevel-16px" inkscape:label="#g24395" transform="translate(4,4.0004153)">
+<g id="stroke-join-miter-16px" inkscape:label="#g24395" transform="translate(4,4.0004153)">
 <g inkscape:label="stock-join-miter" id="g13410" style="display:inline" transform="translate(977.9998,465.36218)">
-<g inkscape:label="stock-join-bevel" id="g13388" transform="translate(20,0)">
 <rect style="opacity:0.3;fill:none;stroke:none" id="rect13390" width="16" height="16" x="-160" y="342" transform="translate(241.0002,217)" />
 <path style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" d="m 86.0002,561 -3,0 0,5 0,3 0,5 3,0 0,-10 2,0 1,0 6,0 0,-3 z m 3,6 0,7 3,0 0,-4 3,0 0,-3 z" id="path13392" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccc" />
 <rect style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" id="rect13394" width="1" height="1" x="93.000198" y="565" />
@@ -3371,7 +3370,6 @@
 <rect style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" id="rect13408" width="1" height="1" x="87.000198" y="573" />
 </g>
 </g>
-</g>
 <g id="stroke-join-round-16px" inkscape:label="#g24409" transform="translate(7,4.0004153)">
 <g inkscape:label="stock-join-round" id="g13484" style="display:inline" transform="translate(990.9998,465.36218)">
 <rect style="opacity:0.3;fill:none;stroke:none" id="rect13427" width="16" height="16" x="121.0002" y="559" />
@@ -3387,7 +3385,7 @@
 <path transform="translate(241.0002,217)" style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" d="m -112,350 6,0 0,1.75 0,1.25 -3,0 0,4 -3,0 z" id="rect13481" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" />
 </g>
 </g>
-<g id="stroke-join-miter" inkscape:label="#join_miter" transform="translate(0,4.1533082e-4)">
+<g id="stroke-join-bevel" inkscape:label="#join_bevel" transform="translate(0,4.1533082e-4)">
 <rect style="opacity:0.3;fill:none;stroke:none" id="rect24338" width="24" height="24.000008" x="1044" y="997.36218" />
 <path style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" d="m 1052.25,998.47983 -6.25,7.72317 0,13.1592 5,0 0,-16 2.4375,0 1.5625,0 12,0 0,-4.88239 z m 2.75,8.88237 0,12 5,0 0,-7 7,0 0,-5 z" id="path24340" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccc" />
 <rect style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" id="rect24342" width="2" height="1.9999974" x="1055" y="1004.3622" />
@@ -3400,7 +3398,7 @@
 <rect style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" id="rect24501" width="2" height="1.9999974" x="1052" y="1013.3622" />
 <rect y="1016.3622" x="1052" height="1.9999974" width="2" id="rect24503" style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" />
 </g>
-<g id="stroke-join-bevel" inkscape:label="#join_bevel" transform="translate(0,4.1533082e-4)">
+<g id="stroke-join-miter" inkscape:label="#join_miter" transform="translate(0,4.1533082e-4)">
 <rect y="997.36218" x="1083" height="24.000008" width="24" id="rect24507" style="opacity:0.3;fill:none;stroke:none" />
 <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" id="path24509" d="m 1091.25,998.47983 -6.25,-0.11765 0,21.00002 5,0 0,-16 2.4375,0 1.5625,0 12,0 0,-4.88239 z m 2.75,8.88237 0,12 5,0 0,-7 7,0 0,-5 z" style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" />
 <rect y="1004.3622" x="1094" height="1.9999974" width="2" id="rect24511" style="fill:url(#linearGradient19282);fill-opacity:1;stroke:none" />
-- 
cgit v1.2.3


From 13aef9138410eeb3de3c6647a7201eb3dfeb3de7 Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Wed, 22 Oct 2014 17:16:58 -0400
Subject: use double precision Quantity::convert for units conversion in
 viewBox, instead of single-precision SVGLength.computed.

(bzr r13632)
---
 share/ui/units.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'share')

diff --git a/share/ui/units.xml b/share/ui/units.xml
index ef00aa9ce..286e9e62b 100644
--- a/share/ui/units.xml
+++ b/share/ui/units.xml
@@ -39,21 +39,21 @@
     <name>millimeter</name>
     <plural>millimeters</plural>
     <abbr>mm</abbr>
-    <factor>3.5433071</factor>
+    <factor>3.543307087</factor>
     <description>Millimeters (25.4 mm/in)</description>
 </unit>
 <unit type="LINEAR" pri="n">
     <name>centimeter</name>
     <plural>centimeters</plural>
     <abbr>cm</abbr>
-    <factor>35.433071</factor>
+    <factor>35.43307087</factor>
     <description>Centimeters (10 mm/cm)</description>
 </unit>
 <unit type="LINEAR" pri="n">
     <name>meter</name>
     <plural>meters</plural>
     <abbr>m</abbr>
-    <factor>3543.3071</factor>
+    <factor>3543.307087</factor>
     <description>Meters (100 cm/m)</description>
 </unit>
 <unit type="LINEAR" pri="n">
-- 
cgit v1.2.3