Update to trunk r13580

(bzr r13341.1.255)

11 files changed, 13 insertions, 20 deletions

diff --git a/share/extensions/gcodetools_area.inx b/share/extensions/gcodetools_area.inx
index ad27ecee4..b487f2c54 100644
--- a/share/extensions/gcodetools_area.inx
+++ b/share/extensions/gcodetools_area.inx
@@ -88,7 +88,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_dxf_points.inx b/share/extensions/gcodetools_dxf_points.inx
index e4534e8af..4367353b9 100644
--- a/share/extensions/gcodetools_dxf_points.inx
+++ b/share/extensions/gcodetools_dxf_points.inx
@@ -34,7 +34,7 @@ Also you can manually select object, open XML editor (Shift+Ctrl+X) and add or r
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_engraving.inx b/share/extensions/gcodetools_engraving.inx
index 6885f32fd..a488f45a1 100644
--- a/share/extensions/gcodetools_engraving.inx
+++ b/share/extensions/gcodetools_engraving.inx
@@ -46,7 +46,7 @@ ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4</_param>
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_graffiti.inx b/share/extensions/gcodetools_graffiti.inx
index 7253b8fa4..bcaec76d4 100644
--- a/share/extensions/gcodetools_graffiti.inx
+++ b/share/extensions/gcodetools_graffiti.inx
@@ -73,7 +73,7 @@ Now press apply to create control points (independent set for each layer).
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_lathe.inx b/share/extensions/gcodetools_lathe.inx
index d3c6916fd..c74ae267c 100644
--- a/share/extensions/gcodetools_lathe.inx
+++ b/share/extensions/gcodetools_lathe.inx
@@ -68,7 +68,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/gcodetools_path_to_gcode.inx b/share/extensions/gcodetools_path_to_gcode.inx
index 8a79d6aae..39cc6571b 100644
--- a/share/extensions/gcodetools_path_to_gcode.inx
+++ b/share/extensions/gcodetools_path_to_gcode.inx
@@ -48,7 +48,7 @@ For depth function c=color intensity from 0.0 (white) to 1.0 (black), d is the d
 				<_item value="G20 (All units in inches)">in</_item>
 			</param>
 			<param name="postprocessor" type="enum" _gui-text="Post-processor:">
-				<_item value=" ">None</_item>
+				<_item msgctxt="GCode postprocessor" value=" ">None</_item>
 				<_item value="parameterize();">Parameterize Gcode</_item>
 				<_item value="flip(y);parameterize();">Flip y axis and parameterize Gcode</_item>
 				<_item value="round(4);">Round all values to 4 digits</_item>
diff --git a/share/extensions/grid_polar.inx b/share/extensions/grid_polar.inx
index ee468fa34..ffc64a3d5 100644
--- a/share/extensions/grid_polar.inx
+++ b/share/extensions/grid_polar.inx
@@ -6,7 +6,7 @@
   <dependency type="executable" location="extensions">inkex.py</dependency>
   <param name="c_dot_dia"    type="float" min="1" max="1000" _gui-text="Centre Dot Diameter (px):">5.0</param>
   <param name="a_labels"     type="enum"  _gui-text="Circumferential Labels:">
-    <_item value="none">None</_item>
+    <_item msgctxt="Label" value="none">None</_item>
     <_item value="deg">Degrees</_item>
   </param>
   <param name="a_label_size"   type="int"   min="1" max="1000" _gui-text="Circumferential Label Size (px):">18</param>
diff --git a/share/extensions/guides_creator.inx b/share/extensions/guides_creator.inx
index 4d032e024..baaa093c3 100644
--- a/share/extensions/guides_creator.inx
+++ b/share/extensions/guides_creator.inx
@@ -39,7 +39,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="footer_margin" type="enum" appearance="minimal" _gui-text="Footer margin:">
         <item value="10">1/10</item>
@@ -51,7 +51,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="left_margin" type="enum" appearance="minimal" _gui-text="Left margin:">
         <item value="10">1/10</item>
@@ -63,7 +63,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="right_margin" type="enum" appearance="minimal" _gui-text="Right margin:">
         <item value="10">1/10</item>
@@ -75,7 +75,7 @@
         <item value="4">1/4</item>
         <item value="3">1/3</item>
         <item value="2">1/2</item>
-        <_item value="0">None</_item>
+        <_item msgctxt="Margin" value="0">None</_item>
       </param>
       <param name="vertical_subdivisions"    type="int"   min="1" max="1000" _gui-text="Columns:">2</param>
       <param name="horizontal_subdivisions"  type="int"   min="1" max="1000" _gui-text="Rows:">3</param>
diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx
index 4ed5ce9de..80543f02a 100644
--- a/share/extensions/plotter.inx
+++ b/share/extensions/plotter.inx
@@ -31,7 +31,7 @@
         <_item value="xonxoff">Software (XON/XOFF)</_item>
         <_item value="rtscts">Hardware (RTS/CTS)</_item>
         <_item value="dsrdtrrtscts">Hardware (DSR/DTR + RTS/CTS)</_item>
-        <_item value="">None</_item>
+        <_item msgctxt="Flow control" value="">None</_item>
       </param>
       <param name="commandLanguage" type="enum" _gui-text="Command language:" _gui-description="The command language to use (Default: HPGL)">
         <_item value="HPGL">HPGL</_item>
diff --git a/share/extensions/scour.inx b/share/extensions/scour.inx
index ee245b149..45719deeb 100644
--- a/share/extensions/scour.inx
+++ b/share/extensions/scour.inx
@@ -22,7 +22,7 @@
       	    <param name="indent" type="enum" _gui-text="XML indentation (pretty-printing):">
                 <_item value="space">Space</_item>
                 <_item value="tab">Tab</_item>
-                <_item value="none">None</_item>
+                <_item msgctxt="Indent" value="none">None</_item>
             </param>
         </page>
         <page name="Ids" _gui-text="Ids">            
diff --git a/share/ui/menus-bars.xml b/share/ui/menus-bars.xml
index ade758788..5ff7f5b83 100644
--- a/share/ui/menus-bars.xml
+++ b/share/ui/menus-bars.xml
@@ -173,13 +173,6 @@
       <separator/>
       <menuitem action='RemoveManualKerns'/>
     </menu>
-	<menu action='MenuWhiteboard'>
-	  <menuitem action='DialogWhiteboardConnect'/>
-	  <separator/>
-	  <menuitem action='DialogWhiteboardShareWithUser'/>
-	  <menuitem action='DialogWhiteboardShareWithChat'/>
-	  <separator/>
-	</menu>
     <menu action='MenuHelp'>
       <menuitem action='KeysAndMouse'/>
       <menu action='Tutorials'>