Update to trunk

22 files changed, 30 insertions, 22 deletions

diff --git a/share/extensions/Barcode/Code128.py b/share/extensions/Barcode/Code128.py
index b90e3bcf6..4af788bbe 100644
--- a/share/extensions/Barcode/Code128.py
+++ b/share/extensions/Barcode/Code128.py
@@ -73,9 +73,9 @@ class Code128(Barcode):
         blocks = []
         block = ''
 
-        # Split up into sections of numbers, or charicters
-        # This makes sure that all the charicters are encoded
-        # In the best way posible for Code128
+        # Split up into sections of numbers, or characters
+        # This makes sure that all the characters are encoded
+        # In the best way possible for Code128
         for datum in re.findall(r'(?:(?:\d\d){2,})|(?:^\d\d)|.', text):
             if len(datum) == 1:
                 block = block + datum
diff --git a/share/extensions/Barcode/Code39.py b/share/extensions/Barcode/Code39.py
index 0d4d445b1..cfe619bb0 100644
--- a/share/extensions/Barcode/Code39.py
+++ b/share/extensions/Barcode/Code39.py
@@ -73,7 +73,7 @@ class Code39(Barcode):
     def encode(self, text):
         self.text = text.upper()
         result = ''
-        # It isposible for us to encode code39
+        # It is possible for us to encode code39
         # into full ascii, but this feature is
         # not enabled here
         for char in '*' + self.text + '*':
diff --git a/share/extensions/Barcode/Code93.py b/share/extensions/Barcode/Code93.py
index 939a739dd..d09971fe7 100644
--- a/share/extensions/Barcode/Code93.py
+++ b/share/extensions/Barcode/Code93.py
@@ -91,7 +91,7 @@ class Code93(Barcode):
 
         return PALLET[check % 47]
 
-    # Some charicters need re-ENCODE into the code93 specification
+    # Some characters need re-ENCODE into the code93 specification
     def encode_ascii(self, text):
         result = []
         for char in text:
diff --git a/share/extensions/bezmisc.py b/share/extensions/bezmisc.py
index c36e8e1b4..1119b85e2 100755
--- a/share/extensions/bezmisc.py
+++ b/share/extensions/bezmisc.py
@@ -113,7 +113,7 @@ def bezierslopeatt(((bx0,by0),(bx1,by1),(bx2,by2),(bx3,by3)),t):
 
 def beziertatslope(((bx0,by0),(bx1,by1),(bx2,by2),(bx3,by3)),(dy,dx)):
     ax,ay,bx,by,cx,cy,x0,y0=bezierparameterize(((bx0,by0),(bx1,by1),(bx2,by2),(bx3,by3)))
-    #quadratic coefficents of slope formula
+    #quadratic coefficients of slope formula
     if dx:
         slope = 1.0*(dy/dx)
         a=3*ay-3*ax*slope
diff --git a/share/filters/README b/share/filters/README
index ac45826b8..2cdb43e79 100644
--- a/share/filters/README
+++ b/share/filters/README
@@ -9,6 +9,6 @@ inkscape:menu  is the submenu under Effects > Filters
 inkscape:menu-tooltip is the menu command's tooltip in the statusbar
 
 These are then put into filters.svg.h in order to make them translatable.
-They should appear as a normal translation to translaters through the
+They should appear as a normal translation to translators through the
 gettext system.
 
diff --git a/share/icons/hicolor/scalable/actions/feBlend-icon.svg b/share/icons/hicolor/scalable/actions/feBlend-icon.svg
index dca97f107..1a5cffc60 100644
--- a/share/icons/hicolor/scalable/actions/feBlend-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feBlend-icon.svg
@@ -43,7 +43,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feColorMatrix-icon.svg b/share/icons/hicolor/scalable/actions/feColorMatrix-icon.svg
index ed33b0158..0aea1b545 100644
--- a/share/icons/hicolor/scalable/actions/feColorMatrix-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feColorMatrix-icon.svg
@@ -54,7 +54,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feComposite-icon.svg b/share/icons/hicolor/scalable/actions/feComposite-icon.svg
index d3bd7511e..d8dc0a9d1 100644
--- a/share/icons/hicolor/scalable/actions/feComposite-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feComposite-icon.svg
@@ -43,7 +43,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feConvolveMatrix-icon.svg b/share/icons/hicolor/scalable/actions/feConvolveMatrix-icon.svg
index 5fa369e0c..c87a5bda1 100644
--- a/share/icons/hicolor/scalable/actions/feConvolveMatrix-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feConvolveMatrix-icon.svg
@@ -34,7 +34,7 @@
 <rdf:li>ConvolveMatrix filter primitive example</rdf:li>
 </rdf:Bag>
 </dc:subject>
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:publisher>
 <cc:Agent>
 <dc:title>Felipe Corrêa da Silva Sanches</dc:title>
diff --git a/share/icons/hicolor/scalable/actions/feDisplacementMap-icon.svg b/share/icons/hicolor/scalable/actions/feDisplacementMap-icon.svg
index aba251e47..66f886d13 100644
--- a/share/icons/hicolor/scalable/actions/feDisplacementMap-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feDisplacementMap-icon.svg
@@ -51,7 +51,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feFlood-icon.svg b/share/icons/hicolor/scalable/actions/feFlood-icon.svg
index c7cafac7b..75cd33589 100644
--- a/share/icons/hicolor/scalable/actions/feFlood-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feFlood-icon.svg
@@ -42,7 +42,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feGaussianBlur-icon.svg b/share/icons/hicolor/scalable/actions/feGaussianBlur-icon.svg
index 92f87e75c..c906a5f4a 100644
--- a/share/icons/hicolor/scalable/actions/feGaussianBlur-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feGaussianBlur-icon.svg
@@ -31,7 +31,7 @@
 <rdf:li>hexamines icon</rdf:li>
 </rdf:Bag>
 </dc:subject>
-<dc:description>this is an image originaly intended to be used in the hexamines game</dc:description>
+<dc:description>this is an image originally intended to be used in the hexamines game</dc:description>
 <dc:publisher>
 <cc:Agent>
 <dc:title>Felipe Corrêa da Silva Sanches</dc:title>
diff --git a/share/icons/hicolor/scalable/actions/feImage-icon.svg b/share/icons/hicolor/scalable/actions/feImage-icon.svg
index 2203c16b8..b40e84d56 100644
--- a/share/icons/hicolor/scalable/actions/feImage-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feImage-icon.svg
@@ -31,7 +31,7 @@
 <rdf:li>Image filter primitive example</rdf:li>
 </rdf:Bag>
 </dc:subject>
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:publisher>
 <cc:Agent>
 <dc:title>Felipe Corrêa da Silva Sanches</dc:title>
diff --git a/share/icons/hicolor/scalable/actions/feMerge-icon.svg b/share/icons/hicolor/scalable/actions/feMerge-icon.svg
index 14070373e..d3b34564e 100644
--- a/share/icons/hicolor/scalable/actions/feMerge-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feMerge-icon.svg
@@ -43,7 +43,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feMorphology-icon.svg b/share/icons/hicolor/scalable/actions/feMorphology-icon.svg
index 15f215508..5cbf580dd 100644
--- a/share/icons/hicolor/scalable/actions/feMorphology-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feMorphology-icon.svg
@@ -40,7 +40,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feOffset-icon.svg b/share/icons/hicolor/scalable/actions/feOffset-icon.svg
index 6b2d87681..e8a4808dd 100644
--- a/share/icons/hicolor/scalable/actions/feOffset-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feOffset-icon.svg
@@ -36,7 +36,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in the hexamines game</dc:description>
+<dc:description>this is an image originally intended to be used in the hexamines game</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/feTurbulence-icon.svg b/share/icons/hicolor/scalable/actions/feTurbulence-icon.svg
index 37d986d36..cc0d0c714 100644
--- a/share/icons/hicolor/scalable/actions/feTurbulence-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feTurbulence-icon.svg
@@ -40,7 +40,7 @@
 </rdf:Bag>
 </dc:subject>
 <dc:coverage />
-<dc:description>this is an image originaly intended to be used in Inkscape</dc:description>
+<dc:description>this is an image originally intended to be used in Inkscape</dc:description>
 <dc:contributor>
 <cc:Agent>
 <dc:title />
diff --git a/share/icons/hicolor/scalable/actions/stroke-join-bevel.svg b/share/icons/hicolor/scalable/actions/stroke-join-bevel.svg
index 2784c7070..1d493023c 100644
--- a/share/icons/hicolor/scalable/actions/stroke-join-bevel.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-join-bevel.svg
@@ -7,7 +7,7 @@
    height="24"
   >
   <g id="stroke-join-bevel" inkscape:label="#join_bevel">
-    <!-- Corner exagerated -->
+    <!-- Corner exaggerated -->
     <path d="m 0.5,24 0,-13 10.5,-10.5 13,0   0,17 -6.5,0 0,6.5 z" style="fill:#99b6d4"/>
     <path d="m 0.5,24 0,-13 10.5,-10.5 13,0 m 0,17 -6.5,0 0,6.5  " style="fill:none;stroke:black"/>
     <path d="m 9,24 0,-15 15,0" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2;stroke-dashoffset:2"/>
diff --git a/share/icons/hicolor/scalable/actions/stroke-join-round.svg b/share/icons/hicolor/scalable/actions/stroke-join-round.svg
index d604d2f0a..06cbeb745 100644
--- a/share/icons/hicolor/scalable/actions/stroke-join-round.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-join-round.svg
@@ -8,7 +8,7 @@
   >
 
   <g id="stroke-join-round" inkscape:label="#join_round">
-    <!-- Corner exagerated -->
+    <!-- Corner exaggerated -->
     <path d="m 0.5,24 0,-11 a 12.5,12.5 0 0 1 12.5,-12.5 l 11,0   0,17 -6.5,0 0,6.5 z" style="fill:#99b6d4"/>
     <path d="m 0.5,24 0,-11 a 12.5,12.5 0 0 1 12.5,-12.5 l 11,0 m 0,17 -6.5,0 0,6.5  " style="fill:none;stroke:black"/>
     <path d="m 9,24 0,-15 15,0" style="fill:none;stroke:white;stroke-width:2px;stroke-dasharray:2 2;stroke-dashoffset:2"/>
diff --git a/share/symbols/BalloonSymbols.svg b/share/symbols/BalloonSymbols.svg
index b2563e47a..e9a76fafb 100644
--- a/share/symbols/BalloonSymbols.svg
+++ b/share/symbols/BalloonSymbols.svg
@@ -36,7 +36,7 @@
 	    <rdf:li>balloon</rdf:li>
 	    <rdf:li>comic</rdf:li>
 	    <rdf:li>cartoon</rdf:li>
-	    <rdf:li>speach</rdf:li>
+	    <rdf:li>speech</rdf:li>
 	    <rdf:li>exclaim</rdf:li>
 	  </rdf:Bag>
 	</dc:subject>
diff --git a/share/ui/menus.xml b/share/ui/menus.xml
index bc1d19587..5bcaca8cf 100644
--- a/share/ui/menus.xml
+++ b/share/ui/menus.xml
@@ -120,6 +120,13 @@
          <!--verb verb-id="ViewColorModePrintColorsPreview" radio="yes"/-->
          <!--verb verb-id="DialogPrintColorsPreview" /-->
        </submenu>
+       <submenu _name="_Canvas orientation">
+         <verb verb-id="FlipHorizontal"/>
+         <verb verb-id="FlipVertical"/>
+         <verb verb-id="FlipNone"/>
+         <separator/>
+         <verb verb-id="RotateZero"/>
+       </submenu>
        <separator/>
        <verb verb-id="ToggleGrid" check="yes" />
        <verb verb-id="ToggleGuides" check="yes" />
diff --git a/share/ui/select-toolbar.ui b/share/ui/select-toolbar.ui
index 122c52a2c..d3f35393c 100644
--- a/share/ui/select-toolbar.ui
+++ b/share/ui/select-toolbar.ui
@@ -140,6 +140,7 @@
     <separator />
     <toolitem action='measure_units_label' />
     <toolitem action='MeasureUnitsAction' />
+    <toolitem action='MeasureOnlySelected' />
     <toolitem action='MeasureIgnore1stAndLast' />
     <toolitem action='MeasureInBettween' />
     <toolitem action='MeasureShowHidden' />