diff --git a/bCNC.pot b/bCNC.pot
index 99a36b8e6..39e2bcaad 100644
--- a/bCNC.pot
+++ b/bCNC.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-30 01:00+0200\n"
+"POT-Creation-Date: 2016-06-12 10:48+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"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Days-interval to remind again for checking"
 msgstr ""
 
-#: Updates.py:105 Utils.py:450 bCNC.py:801 bCNC.py:1006 bCNC.py:1970
+#: Updates.py:105 Utils.py:452 bCNC.py:801 bCNC.py:1006 bCNC.py:1970
 msgid "Close"
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr ""
 msgid "Invalid command %s"
 msgstr ""
 
-#: Sender.py:585 ControlPage.py:378
+#: Sender.py:585 ControlPage.py:388
 #, python-format
 msgid "Set workspace %s to %s"
 msgstr ""
@@ -439,16 +439,20 @@ msgid "Spindle max (RPM)"
 msgstr ""
 
 #: ToolsPage.py:503
-msgid "Header gcode"
+msgid "DRO Zero padding"
 msgstr ""
 
 #: ToolsPage.py:504
+msgid "Header gcode"
+msgstr ""
+
+#: ToolsPage.py:505
 msgid "Footer gcode"
 msgstr ""
 
-#: ToolsPage.py:527 ToolsPage.py:553 ToolsPage.py:582 ToolsPage.py:608
-#: ToolsPage.py:633 ToolsPage.py:666 ToolsPage.py:692 ToolsPage.py:714
-#: ToolsPage.py:1240 lib/bFileDialog.py:295 plugins/sketch.py:40
+#: ToolsPage.py:528 ToolsPage.py:554 ToolsPage.py:583 ToolsPage.py:609
+#: ToolsPage.py:634 ToolsPage.py:667 ToolsPage.py:693 ToolsPage.py:715
+#: ToolsPage.py:1241 lib/bFileDialog.py:295 plugins/sketch.py:40
 #: plugins/pyrograph.py:39 plugins/heightmap.py:49 plugins/midi2cnc.py:50
 #: plugins/hilbert.py:88 plugins/gear.py:163 plugins/flatten.py:258
 #: plugins/driller.py:39 plugins/tile.py:35 plugins/spirograph.py:102
@@ -457,506 +461,526 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: ToolsPage.py:528
+#: ToolsPage.py:529
 msgid "Feed"
 msgstr ""
 
-#: ToolsPage.py:529
+#: ToolsPage.py:530
 msgid "Plunge Feed"
 msgstr ""
 
-#: ToolsPage.py:530 ToolsPage.py:611
+#: ToolsPage.py:531 ToolsPage.py:612
 msgid "Depth Increment"
 msgstr ""
 
-#: ToolsPage.py:554 lib/bFileDialog.py:296
+#: ToolsPage.py:555 lib/bFileDialog.py:296
 msgid "Type"
 msgstr ""
 
-#: ToolsPage.py:555
+#: ToolsPage.py:556
 msgid "Shape"
 msgstr ""
 
-#: ToolsPage.py:556 ToolsPage.py:583 ToolsPage.py:881
+#: ToolsPage.py:557 ToolsPage.py:584 ToolsPage.py:882
 msgid "Material"
 msgstr ""
 
-#: ToolsPage.py:557
+#: ToolsPage.py:558
 msgid "Coating"
 msgstr ""
 
-#: ToolsPage.py:558 plugins/bowl.py:109
+#: ToolsPage.py:559 plugins/bowl.py:109
 msgid "Diameter"
 msgstr ""
 
-#: ToolsPage.py:559
+#: ToolsPage.py:560
 msgid "Mount Axis"
 msgstr ""
 
-#: ToolsPage.py:560
+#: ToolsPage.py:561
 msgid "Flutes"
 msgstr ""
 
-#: ToolsPage.py:561
+#: ToolsPage.py:562
 msgid "Length"
 msgstr ""
 
-#: ToolsPage.py:562
+#: ToolsPage.py:563
 msgid "Angle"
 msgstr ""
 
-#: ToolsPage.py:563
+#: ToolsPage.py:564
 msgid "Stepover %"
 msgstr ""
 
-#: ToolsPage.py:584
+#: ToolsPage.py:585
 msgid "Safe Z"
 msgstr ""
 
-#: ToolsPage.py:585 ToolsPage.py:609
+#: ToolsPage.py:586 ToolsPage.py:610
 msgid "Surface Z"
 msgstr ""
 
-#: ToolsPage.py:586
+#: ToolsPage.py:587
 msgid "Thickness"
 msgstr ""
 
-#: ToolsPage.py:610 ToolsPage.py:634 plugins/driller.py:41
+#: ToolsPage.py:611 ToolsPage.py:635 plugins/driller.py:41
 #: plugins/spirograph.py:106
 msgid "Target Depth"
 msgstr ""
 
-#: ToolsPage.py:612
+#: ToolsPage.py:613
 msgid "First cut at surface height"
 msgstr ""
 
-#: ToolsPage.py:623
+#: ToolsPage.py:624
 msgid "CUT selected paths"
 msgstr ""
 
-#: ToolsPage.py:635
+#: ToolsPage.py:636
 msgid "Peck depth"
 msgstr ""
 
-#: ToolsPage.py:636
+#: ToolsPage.py:637
 msgid "Dwell (s)"
 msgstr ""
 
-#: ToolsPage.py:637
+#: ToolsPage.py:638
 msgid "Distance (mm)"
 msgstr ""
 
-#: ToolsPage.py:638
+#: ToolsPage.py:639
 msgid "Number"
 msgstr ""
 
-#: ToolsPage.py:656
+#: ToolsPage.py:657
 msgid "DRILL selected points"
 msgstr ""
 
-#: ToolsPage.py:667 ToolsPage.py:693 ToolsPage.py:895
+#: ToolsPage.py:668 ToolsPage.py:694 ToolsPage.py:896
 msgid "End Mill"
 msgstr ""
 
-#: ToolsPage.py:668 plugins/pyrograph.py:45
+#: ToolsPage.py:669 plugins/pyrograph.py:45
 msgid "Direction"
 msgstr ""
 
-#: ToolsPage.py:669
+#: ToolsPage.py:670
 msgid "Additional offset distance"
 msgstr ""
 
-#: ToolsPage.py:670 plugins/box.py:314
+#: ToolsPage.py:671 plugins/box.py:314
 msgid "Overcut"
 msgstr ""
 
-#: ToolsPage.py:682
+#: ToolsPage.py:683
 msgid "Generate profile path"
 msgstr ""
 
-#: ToolsPage.py:704
+#: ToolsPage.py:705
 msgid "Generate pocket path"
 msgstr ""
 
-#: ToolsPage.py:715
+#: ToolsPage.py:716
 msgid "Number of tabs"
 msgstr ""
 
-#: ToolsPage.py:716
+#: ToolsPage.py:717
 msgid "Min. Distance of tabs"
 msgstr ""
 
-#: ToolsPage.py:719
+#: ToolsPage.py:720
 msgid "Height"
 msgstr ""
 
-#: ToolsPage.py:739
+#: ToolsPage.py:740
 msgid "Tabs error"
 msgstr ""
 
-#: ToolsPage.py:740
+#: ToolsPage.py:741
 msgid "You cannot have both the number of tabs or distance equal to zero"
 msgstr ""
 
-#: ToolsPage.py:743
+#: ToolsPage.py:744
 msgid "Create tabs on blocks"
 msgstr ""
 
-#: ToolsPage.py:867
+#: ToolsPage.py:868
 msgid "Stock"
 msgstr ""
 
-#: ToolsPage.py:874
+#: ToolsPage.py:875
 msgid "Stock material currently on machine"
 msgstr ""
 
-#: ToolsPage.py:888
+#: ToolsPage.py:889
 msgid "Editable database of material properties"
 msgstr ""
 
-#: ToolsPage.py:902
+#: ToolsPage.py:903
 msgid "Editable database of EndMills properties"
 msgstr ""
 
-#: ToolsPage.py:909
+#: ToolsPage.py:910
 msgid "Rename"
 msgstr ""
 
-#: ToolsPage.py:914
+#: ToolsPage.py:915
 msgid "Edit name of current operation/object"
 msgstr ""
 
-#: ToolsPage.py:922 EditorPage.py:159 ProbePage.py:407
+#: ToolsPage.py:923 ProbePage.py:421 EditorPage.py:159
 msgid "Add"
 msgstr ""
 
-#: ToolsPage.py:927
+#: ToolsPage.py:928
 msgid "Add a new operation/object"
 msgstr ""
 
-#: ToolsPage.py:935 EditorPage.py:171
+#: ToolsPage.py:936 EditorPage.py:171
 msgid "Clone"
 msgstr ""
 
-#: ToolsPage.py:940
+#: ToolsPage.py:941
 msgid "Clone selected operation/object"
 msgstr ""
 
-#: ToolsPage.py:948 EditorPage.py:183 ProbePage.py:441
+#: ToolsPage.py:949 ProbePage.py:455 EditorPage.py:183
 msgid "Delete"
 msgstr ""
 
-#: ToolsPage.py:953
+#: ToolsPage.py:954
 msgid "Delete selected operation/object"
 msgstr ""
 
-#: ToolsPage.py:969 EditorPage.py:46 plugins/box.py:315
+#: ToolsPage.py:970 EditorPage.py:46 plugins/box.py:315
 msgid "Cut"
 msgstr ""
 
-#: ToolsPage.py:976
+#: ToolsPage.py:977
 msgid "Cut for the full stock thickness selected code"
 msgstr ""
 
-#: ToolsPage.py:983 plugins/box.py:313
+#: ToolsPage.py:984 plugins/box.py:313
 msgid "Profile"
 msgstr ""
 
-#: ToolsPage.py:990
+#: ToolsPage.py:991
 msgid "Perform a profile operation on selected code"
 msgstr ""
 
-#: ToolsPage.py:997
+#: ToolsPage.py:998
 msgid "Pocket"
 msgstr ""
 
-#: ToolsPage.py:1004
+#: ToolsPage.py:1005
 msgid "Perform a pocket operation on selected code"
 msgstr ""
 
-#: ToolsPage.py:1011
+#: ToolsPage.py:1012
 msgid "Drill"
 msgstr ""
 
-#: ToolsPage.py:1018
+#: ToolsPage.py:1019
 msgid "Insert a drill cycle on current objects/location"
 msgstr ""
 
-#: ToolsPage.py:1025
+#: ToolsPage.py:1026
 msgid "Tabs"
 msgstr ""
 
-#: ToolsPage.py:1032
+#: ToolsPage.py:1033
 msgid "Insert holding tabs"
 msgstr ""
 
-#: ToolsPage.py:1111
+#: ToolsPage.py:1112
 msgid "User File"
 msgstr ""
 
-#: ToolsPage.py:1126
+#: ToolsPage.py:1127
 msgid "Change program language restart is required"
 msgstr ""
 
-#: ToolsPage.py:1135 ProbePage.py:104 ProbePage.py:1089
+#: ToolsPage.py:1136 ProbePage.py:104 ProbePage.py:1115
 msgid "Camera"
 msgstr ""
 
-#: ToolsPage.py:1142
+#: ToolsPage.py:1143
 msgid "Camera Configuration"
 msgstr ""
 
-#: ToolsPage.py:1149
+#: ToolsPage.py:1150
 msgid "Colors"
 msgstr ""
 
-#: ToolsPage.py:1156
+#: ToolsPage.py:1157
 msgid "Color configuration"
 msgstr ""
 
-#: ToolsPage.py:1163
+#: ToolsPage.py:1164
 msgid "Fonts"
 msgstr ""
 
-#: ToolsPage.py:1170
+#: ToolsPage.py:1171
 msgid "Font configuration"
 msgstr ""
 
-#: ToolsPage.py:1177
+#: ToolsPage.py:1178
 msgid "Machine"
 msgstr ""
 
-#: ToolsPage.py:1184
+#: ToolsPage.py:1185
 msgid "Machine configuration for bCNC"
 msgstr ""
 
-#: ToolsPage.py:1191 ToolsPage.py:1198
+#: ToolsPage.py:1192 ToolsPage.py:1199
 msgid "Shortcuts"
 msgstr ""
 
-#: ToolsPage.py:1215
+#: ToolsPage.py:1216
 msgid "Language change"
 msgstr ""
 
-#: ToolsPage.py:1216
+#: ToolsPage.py:1217
 msgid "Please restart the program."
 msgstr ""
 
-#: ToolsPage.py:1228
+#: ToolsPage.py:1229
 msgid "Execute"
 msgstr ""
 
-#: ToolsPage.py:1241
+#: ToolsPage.py:1242
 msgid "Value"
 msgstr ""
 
-#: ToolsPage.py:1308
+#: ToolsPage.py:1309
 msgid "GCode manipulation tools and user plugins"
 msgstr ""
 
-#: Utils.py:412
-msgid "Error Reporting"
+#: CNCCanvas.py:356
+msgid "Select objects with mouse"
 msgstr ""
 
-#: Utils.py:415 FilePage.py:134
-msgid "Report"
+#: CNCCanvas.py:361
+msgid "Pan viewport"
 msgstr ""
 
-#: Utils.py:418
-#, python-format
-msgid "The following report is about to be send to the author of %s"
+#: CNCCanvas.py:366
+msgid "Click to set the origin (zero)"
 msgstr ""
 
-#: Utils.py:433
-msgid "Your email"
+#: CNCCanvas.py:371
+msgid "Move graphically objects"
 msgstr ""
 
-#: Utils.py:442
-msgid "Automatic error reporting"
+#: CNCCanvas.py:377
+msgid "Move CNC gantry to mouse location"
 msgstr ""
 
-#: Utils.py:454
-msgid "Send report"
+#: CNCCanvas.py:383
+msgid "Set mouse location as current machine position (X/Y only)"
 msgstr ""
 
-#: Utils.py:520 Utils.py:530
-msgid "Error sending report"
+#: CNCCanvas.py:388
+msgid "Drag a ruler to measure distances"
 msgstr ""
 
-#: Utils.py:521
-msgid "There was a problem connecting to the web site"
+#: CNCCanvas.py:393
+msgid "Add an orientation marker"
 msgstr ""
 
-#: Utils.py:525
-msgid "Report successfully send"
+#: CNCCanvas.py:454
+msgid "ERROR: Cannot set X-Y marker  with the current view"
 msgstr ""
 
-#: Utils.py:526
-msgid "Report was successfully uploaded to web site"
+#: CNCCanvas.py:540
+#, python-format
+msgid "origin %g %g %g"
 msgstr ""
 
-#: Utils.py:531
+#: CNCCanvas.py:603
 #, python-format
-msgid ""
-"There was an error sending the report\n"
-"Code=%d %s"
+msgid "dx=%g  dy=%g  dz=%g  length=%g  angle=%g"
 msgstr ""
 
-#: Utils.py:638
-msgid "User configurable button"
+#: CNCCanvas.py:682
+#, python-format
+msgid "Move by %g, %g, %g"
 msgstr ""
 
-#: Utils.py:644
-msgid "Name:"
+#: CNCCanvas.py:1756
+#, python-format
+msgid ">>> ERROR: %s\n"
 msgstr ""
 
-#: Utils.py:648
-msgid "Name to appear on button"
+#: CNCCanvas.py:1757
+#, python-format
+msgid "     line: %s\n"
 msgstr ""
 
-#: Utils.py:652
-msgid "Icon:"
+#: CNCCanvas.py:1982
+msgid "Change viewing angle"
 msgstr ""
 
-#: Utils.py:664
-msgid "Icon to appear on button"
+#: CNCCanvas.py:1986
+msgid "Zoom In [Ctrl-=]"
 msgstr ""
 
-#: Utils.py:668
-msgid "Tool Tip:"
+#: CNCCanvas.py:1991
+msgid "Zoom Out [Ctrl--]"
 msgstr ""
 
-#: Utils.py:672
-msgid "Tooltip for button"
+#: CNCCanvas.py:1996
+msgid "Fit to screen [F]"
 msgstr ""
 
-#: Utils.py:676 bCNC.py:155
-msgid "Command:"
+#: CNCCanvas.py:1999 ControlPage.py:858
+msgid "Tool:"
 msgstr ""
 
-#: Utils.py:688 lib/bFileDialog.py:346
-msgid "Cancel"
+#: CNCCanvas.py:2010
+msgid "Select tool [S]"
 msgstr ""
 
-#: Utils.py:689
-msgid "Ok"
+#: CNCCanvas.py:2019
+msgid "Pan viewport [X]"
 msgstr ""
 
-#: FilePage.py:64
-msgid "New"
+#: CNCCanvas.py:2045
+msgid "Ruler [R]"
 msgstr ""
 
-#: FilePage.py:68
-msgid "New gcode/dxf file"
+#: CNCCanvas.py:2051
+msgid "Draw:"
 msgstr ""
 
-#: FilePage.py:77
-msgid "Open existing gcode/dxf file [Ctrl-O]"
+#: CNCCanvas.py:2060
+msgid "Toggle display of axes"
 msgstr ""
 
-#: FilePage.py:82 FilePage.py:279 bCNC.py:1962 lib/bFileDialog.py:322
-#: lib/bFileDialog.py:873 lib/bFileDialog.py:977
-msgid "Open"
+#: CNCCanvas.py:2068
+msgid "Toggle display of grid lines"
 msgstr ""
 
-#: FilePage.py:87
-msgid "Open recent file"
+#: CNCCanvas.py:2076
+msgid "Toggle display of margins"
 msgstr ""
 
-#: FilePage.py:97
-msgid "Save gcode/dxf file [Ctrl-S]"
+#: CNCCanvas.py:2085
+msgid "Toggle display of probe"
 msgstr ""
 
-#: FilePage.py:102 lib/bFileDialog.py:907
-msgid "Save"
+#: CNCCanvas.py:2093
+msgid "Toggle display of paths (G1,G2,G3)"
 msgstr ""
 
-#: FilePage.py:107
-msgid "Save gcode/dxf AS"
+#: CNCCanvas.py:2101
+msgid "Toggle display of rapid motion (G0)"
 msgstr ""
 
-#: FilePage.py:141
-msgid "Send Error Report"
+#: CNCCanvas.py:2109
+msgid "Toggle display of workarea"
 msgstr ""
 
-#: FilePage.py:146
-msgid "Updates"
+#: CNCCanvas.py:2117
+msgid "Toggle display of camera"
 msgstr ""
 
-#: FilePage.py:153
-msgid "Check Updates"
+#: CNCCanvas.py:2124
+msgid "Redraw display [Ctrl-R]"
 msgstr ""
 
-#: FilePage.py:157
-msgid "About"
+#: CNCCanvas.py:2132
+msgid "Draw timeout in seconds"
 msgstr ""
 
-#: FilePage.py:164
-msgid "About the program"
+#: Utils.py:414
+msgid "Error Reporting"
 msgstr ""
 
-#: FilePage.py:176 ControlPage.py:106
-msgid "Start"
+#: Utils.py:417 FilePage.py:134
+msgid "Report"
 msgstr ""
 
-#: FilePage.py:183
-msgid "Start pendant"
+#: Utils.py:420
+#, python-format
+msgid "The following report is about to be send to the author of %s"
 msgstr ""
 
-#: FilePage.py:187 ControlPage.py:123
-msgid "Stop"
+#: Utils.py:435
+msgid "Your email"
 msgstr ""
 
-#: FilePage.py:194
-msgid "Stop pendant"
+#: Utils.py:444
+msgid "Automatic error reporting"
 msgstr ""
 
-#: FilePage.py:205
-msgid "Exit"
+#: Utils.py:456
+msgid "Send report"
 msgstr ""
 
-#: FilePage.py:212
-msgid "Close program [Ctrl-Q]"
+#: Utils.py:522 Utils.py:532
+msgid "Error sending report"
 msgstr ""
 
-#: FilePage.py:225
-msgid "Port:"
+#: Utils.py:523
+msgid "There was a problem connecting to the web site"
 msgstr ""
 
-#: FilePage.py:231
-msgid "Select (or manual enter) port to connect"
+#: Utils.py:527
+msgid "Report successfully send"
 msgstr ""
 
-#: FilePage.py:240
-msgid "Baud:"
+#: Utils.py:528
+msgid "Report was successfully uploaded to web site"
 msgstr ""
 
-#: FilePage.py:245
-msgid "Select connection baud rate"
+#: Utils.py:533
+#, python-format
+msgid ""
+"There was an error sending the report\n"
+"Code=%d %s"
 msgstr ""
 
-#: FilePage.py:252
-msgid "Controller:"
+#: Utils.py:640
+msgid "User configurable button"
 msgstr ""
 
-#: FilePage.py:259
-msgid "Select controller board"
+#: Utils.py:646
+msgid "Name:"
 msgstr ""
 
-#: FilePage.py:266
-msgid "Connect on startup"
+#: Utils.py:650
+msgid "Name to appear on button"
 msgstr ""
 
-#: FilePage.py:269
-msgid "Connect to serial on startup of the program"
+#: Utils.py:654
+msgid "Icon:"
 msgstr ""
 
-#: FilePage.py:284
-msgid "Open/Close serial port"
+#: Utils.py:666
+msgid "Icon to appear on button"
 msgstr ""
 
-#: FilePage.py:303
-msgid "File I/O and configuration"
+#: Utils.py:670
+msgid "Tool Tip:"
+msgstr ""
+
+#: Utils.py:674
+msgid "Tooltip for button"
+msgstr ""
+
+#: Utils.py:678 bCNC.py:155
+msgid "Command:"
+msgstr ""
+
+#: Utils.py:690 lib/bFileDialog.py:346
+msgid "Cancel"
+msgstr ""
+
+#: Utils.py:691
+msgid "Ok"
 msgstr ""
 
 #: Ribbon.py:483
@@ -983,1045 +1007,1215 @@ msgstr ""
 msgid "Help [F1]"
 msgstr ""
 
-#: EditorPage.py:35
-msgid "Paste"
+#: ProbePage.py:28
+msgid "G38.2 stop on contact else error"
 msgstr ""
 
-#: EditorPage.py:40
-msgid "Paste [Ctrl-V]"
+#: ProbePage.py:29
+msgid "G38.3 stop on contact"
 msgstr ""
 
-#: EditorPage.py:51
-msgid "Cut [Ctrl-X]"
+#: ProbePage.py:30
+msgid "G38.4 stop on loss contact else error"
 msgstr ""
 
-#: EditorPage.py:58
-msgid "Copy"
+#: ProbePage.py:31
+msgid "G38.5 stop on loss contact"
 msgstr ""
 
-#: EditorPage.py:63
-msgid "Copy [Ctrl-C]"
+#: ProbePage.py:34
+msgid "Send M6 commands"
 msgstr ""
 
-#: EditorPage.py:79 bCNC.py:93
-msgid "All"
+#: ProbePage.py:35
+msgid "Ignore M6 commands"
 msgstr ""
 
-#: EditorPage.py:84
-msgid "Select all blocks [Ctrl-A]"
+#: ProbePage.py:36
+msgid "Manual Tool Change (WCS)"
 msgstr ""
 
-#: EditorPage.py:91
-msgid "None"
+#: ProbePage.py:37
+msgid "Manual Tool Change (TLO)"
 msgstr ""
 
-#: EditorPage.py:96
-msgid "Unselect all blocks [Ctrl-Shift-A]"
+#: ProbePage.py:38
+msgid "Manual Tool Change (NoProbe)"
 msgstr ""
 
-#: EditorPage.py:103 EditorPage.py:452 plugins/heightmap.py:57
-msgid "Invert"
+#: ProbePage.py:41
+msgid "ONLY before probing"
 msgstr ""
 
-#: EditorPage.py:108
-msgid "Invert selection [Ctrl-I]"
+#: ProbePage.py:42
+msgid "BEFORE & AFTER probing"
 msgstr ""
 
-#: EditorPage.py:115
-msgid "Layer"
+#: ProbePage.py:80 ProbePage.py:303 ProbePage.py:360 bCNC.py:90
+msgid "Probe"
 msgstr ""
 
-#: EditorPage.py:120
-msgid "Select all blocks from current layer"
-msgstr ""
-
-#: EditorPage.py:131
-msgid "Filter blocks"
+#: ProbePage.py:86
+msgid "Simple probing along a direction"
 msgstr ""
 
-#: EditorPage.py:148
-msgid "Import"
+#: ProbePage.py:92 ProbePage.py:790
+msgid "Autolevel"
 msgstr ""
 
-#: EditorPage.py:149
-msgid "Inkscape"
+#: ProbePage.py:98
+msgid "Autolevel Z surface"
 msgstr ""
 
-#: EditorPage.py:150
-msgid "Round"
+#: ProbePage.py:110
+msgid "Work surface camera view and alignment"
 msgstr ""
 
-#: EditorPage.py:151 EditorPage.py:595 bCNC.py:846
-msgid "Statistics"
+#: ProbePage.py:117
+msgid "Tool"
 msgstr ""
 
-#: EditorPage.py:164
-msgid "Insert a new block or line of code [Ins or Ctrl-Enter]"
+#: ProbePage.py:123
+msgid "Setup probing for manual tool change"
 msgstr ""
 
-#: EditorPage.py:176
-msgid "Clone selected lines or blocks [Ctrl-D]"
+#: ProbePage.py:140
+msgid "Margins"
 msgstr ""
 
-#: EditorPage.py:188
-msgid "Delete selected lines or blocks [Del]"
+#: ProbePage.py:145
+msgid "Get margins from gcode file"
 msgstr ""
 
-#: EditorPage.py:200
-msgid "Toggle enable/disable block of g-code [Ctrl-L]"
+#: ProbePage.py:152
+msgid "Zero"
 msgstr ""
 
-#: EditorPage.py:203
-msgid "Enable"
+#: ProbePage.py:157
+msgid "Set current location as Z-zero for leveling"
 msgstr ""
 
-#: EditorPage.py:205
-msgid "Disable"
+#: ProbePage.py:164 ProbePage.py:488 TerminalPage.py:29
+msgid "Clear"
 msgstr ""
 
-#: EditorPage.py:208
-msgid "Active"
+#: ProbePage.py:169
+msgid "Clear probe data"
 msgstr ""
 
-#: EditorPage.py:214
-msgid "Enable or disable blocks of gcode"
+#: ProbePage.py:176 plugins/heightmap.py:52
+msgid "Scan"
 msgstr ""
 
-#: EditorPage.py:221
-msgid "Expand"
+#: ProbePage.py:183
+msgid "Scan probed area for level information on Z plane"
 msgstr ""
 
-#: EditorPage.py:226
-msgid "Toggle expand/collapse blocks of gcode [Ctrl-E]"
+#: ProbePage.py:196
+msgid "Common"
 msgstr ""
 
-#: EditorPage.py:233
-msgid "Comment"
+#: ProbePage.py:204
+msgid "Probe Feed:"
 msgstr ""
 
-#: EditorPage.py:239
-msgid "(Un)Comment selected lines"
+#: ProbePage.py:208
+msgid "Set probe feed rate"
 msgstr ""
 
-#: EditorPage.py:246 CNCList.py:663
-msgid "Color"
+#: ProbePage.py:215
+msgid "TLO"
 msgstr ""
 
-#: EditorPage.py:251
-msgid "Change color for block of g-code"
+#: ProbePage.py:219
+msgid "Set tool offset for probing"
 msgstr ""
 
-#: EditorPage.py:266
-msgid "Move"
+#: ProbePage.py:225 ControlPage.py:867 ControlPage.py:902
+msgid "set"
 msgstr ""
 
-#: EditorPage.py:274
-msgid "Move objects [M]"
+#: ProbePage.py:235
+msgid "Probe Command"
 msgstr ""
 
-#: EditorPage.py:282
-msgid "T-L"
+#: ProbePage.py:307 ProbePage.py:1425
+msgid "Probe:"
 msgstr ""
 
-#: EditorPage.py:288
-msgid "Move origin of g-code to Top-Left corner"
+#: ProbePage.py:325
+msgid "Goto"
 msgstr ""
 
-#: EditorPage.py:295
-msgid "L"
+#: ProbePage.py:332
+msgid "Rapid goto to last probe location"
 msgstr ""
 
-#: EditorPage.py:301
-msgid "Move origin of g-code to Left side"
+#: ProbePage.py:336
+msgid "Pos:"
 msgstr ""
 
-#: EditorPage.py:308
-msgid "B-L"
+#: ProbePage.py:341
+msgid "Probe along X direction"
 msgstr ""
 
-#: EditorPage.py:314
-msgid "Move origin of g-code to Bottom-Left corner"
+#: ProbePage.py:347
+msgid "Probe along Y direction"
 msgstr ""
 
-#: EditorPage.py:322
-msgid "Top"
+#: ProbePage.py:353
+msgid "Probe along Z direction"
 msgstr ""
 
-#: EditorPage.py:328
-msgid "Move origin of g-code to Top side"
+#: ProbePage.py:367
+msgid "Perform a single probe cycle"
 msgstr ""
 
-#: EditorPage.py:335 ProbePage.py:363 ProbePage.py:375
+#: ProbePage.py:377 ProbePage.py:389 EditorPage.py:335
 msgid "Center"
 msgstr ""
 
-#: EditorPage.py:341
-msgid "Move origin of g-code to center"
+#: ProbePage.py:380
+msgid "Diameter:"
 msgstr ""
 
-#: EditorPage.py:348
-msgid "Bottom"
+#: ProbePage.py:383
+msgid "Probing ring internal diameter"
 msgstr ""
 
-#: EditorPage.py:354
-msgid "Move origin of g-code to Bottom side"
+#: ProbePage.py:396
+msgid "Center probing using a ring"
 msgstr ""
 
-#: EditorPage.py:362
-msgid "T-R"
+#: ProbePage.py:401 ProbePage.py:509 bCNC.py:91
+msgid "Orient"
 msgstr ""
 
-#: EditorPage.py:368
-msgid "Move origin of g-code to Top-Right corner"
+#: ProbePage.py:407
+msgid "Markers:"
 msgstr ""
 
-#: EditorPage.py:375
-msgid "R"
+#: ProbePage.py:417
+msgid "Select orientation marker"
 msgstr ""
 
-#: EditorPage.py:381
-msgid "Move origin of g-code to Right side"
+#: ProbePage.py:429
+msgid ""
+"Add an orientation marker. Jog first the machine to the marker position and "
+"then click on canvas to add the marker."
 msgstr ""
 
-#: EditorPage.py:388
-msgid "B-R"
+#: ProbePage.py:436
+msgid "Gcode:"
 msgstr ""
 
-#: EditorPage.py:394
-msgid "Move origin of g-code to Bottom-Right corner"
+#: ProbePage.py:443
+msgid "GCode X coordinate of orientation point"
 msgstr ""
 
-#: EditorPage.py:402
-msgid "Origin"
+#: ProbePage.py:451
+msgid "GCode Y coordinate of orientation point"
 msgstr ""
 
-#: EditorPage.py:410
-msgid "Move all gcode such as origin is on mouse location [O]"
+#: ProbePage.py:463
+msgid "Delete current marker"
 msgstr ""
 
-#: EditorPage.py:420 bCNC.py:1382
-msgid "Optimize"
+#: ProbePage.py:476
+msgid "Machine X coordinate of orientation point"
 msgstr ""
 
-#: EditorPage.py:428
-msgid "Up"
+#: ProbePage.py:484
+msgid "Machine Y coordinate of orientation point"
 msgstr ""
 
-#: EditorPage.py:433
-msgid "Move selected g-code up [Ctrl-Up, Ctrl-PgUp]"
+#: ProbePage.py:496 ProbePage.py:704
+msgid "Delete all markers"
 msgstr ""
 
-#: EditorPage.py:440
-msgid "Down"
+#: ProbePage.py:501
+msgid "Angle:"
 msgstr ""
 
-#: EditorPage.py:445
-msgid "Move selected g-code down [Ctrl-Down, Ctrl-PgDn]"
+#: ProbePage.py:517
+msgid "Align GCode with the machine markers"
 msgstr ""
 
-#: EditorPage.py:457
-msgid "Invert cutting order of selected blocks"
+#: ProbePage.py:522 ProbePage.py:1155
+msgid "Offset:"
 msgstr ""
 
-#: EditorPage.py:472
-msgid "CW"
+#: ProbePage.py:535
+msgid "Error:"
 msgstr ""
 
-#: EditorPage.py:478
-msgid "Rotate selected gcode clock-wise (-90deg)"
+#: ProbePage.py:575
+msgid "Probe connected?"
 msgstr ""
 
-#: EditorPage.py:485
-msgid "Flip"
+#: ProbePage.py:576
+msgid ""
+"Please verify that the probe is connected.\n"
+"\n"
+"Show this message again?"
 msgstr ""
 
-#: EditorPage.py:491
-msgid "Rotate selected gcode by 180deg"
+#: ProbePage.py:587 ProbePage.py:618 ProbePage.py:956 ProbePage.py:969
+#: ProbePage.py:979 ProbePage.py:986
+msgid "Probe Error"
 msgstr ""
 
-#: EditorPage.py:498
-msgid "CCW"
+#: ProbePage.py:588 ProbePage.py:987
+msgid "Invalid probe feed rate"
 msgstr ""
 
-#: EditorPage.py:504
-msgid "Rotate selected gcode counter-clock-wise (90deg)"
+#: ProbePage.py:619
+msgid "At least one probe direction should be specified"
 msgstr ""
 
-#: EditorPage.py:511
-msgid "Horizontal"
+#: ProbePage.py:644
+msgid "Probe Center Error"
 msgstr ""
 
-#: EditorPage.py:517
-msgid "Mirror horizontally X=-X selected gcode"
+#: ProbePage.py:645
+msgid "Invalid diameter entered"
 msgstr ""
 
-#: EditorPage.py:524
-msgid "Vertical"
+#: ProbePage.py:705
+msgid "Do you want to delete all orientation markers?"
 msgstr ""
 
-#: EditorPage.py:530
-msgid "Mirror vertically Y=-Y selected gcode"
+#: ProbePage.py:796
+msgid "Min"
 msgstr ""
 
-#: EditorPage.py:548
-msgid "Conventional"
+#: ProbePage.py:798
+msgid "Max"
 msgstr ""
 
-#: EditorPage.py:554
-msgid "Change cut direction to conventional for selected gcode blocks"
+#: ProbePage.py:800
+msgid "Step"
 msgstr ""
 
-#: EditorPage.py:561
-msgid "Climb"
+#: ProbePage.py:811
+msgid "X minimum"
 msgstr ""
 
-#: EditorPage.py:567
-msgid "Change cut direction to climb for selected gcode blocks"
+#: ProbePage.py:817
+msgid "X maximum"
 msgstr ""
 
-#: EditorPage.py:574
-msgid "Reverse"
+#: ProbePage.py:824
+msgid "X step"
 msgstr ""
 
-#: EditorPage.py:580
-msgid "Reverse cut direction for selected gcode blocks"
+#: ProbePage.py:833
+msgid "X bins"
 msgstr ""
 
-#: EditorPage.py:601
-msgid "Show statistics for enabled gcode"
+#: ProbePage.py:843
+msgid "Y minimum"
 msgstr ""
 
-#: EditorPage.py:608
-msgid "Info"
+#: ProbePage.py:849
+msgid "Y maximum"
 msgstr ""
 
-#: EditorPage.py:614
-msgid "Show cutting information on selected blocks [Ctrl-n]"
+#: ProbePage.py:856
+msgid "Y step"
 msgstr ""
 
-#: EditorPage.py:638
-msgid "GCode editor"
+#: ProbePage.py:865
+msgid "Y bins"
 msgstr ""
 
-#: ProbePage.py:28
-msgid "G38.2 stop on contact else error"
+#: ProbePage.py:876
+msgid "Z Minimum depth to scan"
 msgstr ""
 
-#: ProbePage.py:29
-msgid "G38.3 stop on contact"
+#: ProbePage.py:882
+msgid "Z safe to move"
 msgstr ""
 
-#: ProbePage.py:30
-msgid "G38.4 stop on loss contact else error"
+#: ProbePage.py:957
+msgid "Invalid X probing region"
 msgstr ""
 
-#: ProbePage.py:31
-msgid "G38.5 stop on loss contact"
+#: ProbePage.py:970
+msgid "Invalid Y probing region"
 msgstr ""
 
-#: ProbePage.py:34
-msgid "Send M6 commands"
+#: ProbePage.py:980
+msgid "Invalid Z probing region"
 msgstr ""
 
-#: ProbePage.py:35
-msgid "Ignore M6 commands"
+#: ProbePage.py:1007
+msgid "Delete autolevel information"
 msgstr ""
 
-#: ProbePage.py:36
-msgid "Manual Tool Change (WCS)"
+#: ProbePage.py:1008
+msgid "Do you want to delete all autolevel in formation?"
 msgstr ""
 
-#: ProbePage.py:37
-msgid "Manual Tool Change (TLO)"
+#: ProbePage.py:1040
+msgid "Switch To"
 msgstr ""
 
-#: ProbePage.py:38
-msgid "Manual Tool Change (NoProbe)"
+#: ProbePage.py:1046
+msgid "Switch between camera and spindle"
 msgstr ""
 
-#: ProbePage.py:41
-msgid "ONLY before probing"
+#: ProbePage.py:1052
+msgid "Edge Detection"
 msgstr ""
 
-#: ProbePage.py:42
-msgid "BEFORE & AFTER probing"
+#: ProbePage.py:1059
+msgid "Turn on/off edge detection"
 msgstr ""
 
-#: ProbePage.py:80 ProbePage.py:303 ProbePage.py:325 bCNC.py:90
-msgid "Probe"
+#: ProbePage.py:1065
+msgid "Freeze"
 msgstr ""
 
-#: ProbePage.py:86
-msgid "Simple probing along a direction"
+#: ProbePage.py:1072
+msgid "Turn on/off freeze image"
 msgstr ""
 
-#: ProbePage.py:92 ProbePage.py:764
-msgid "Autolevel"
+#: ProbePage.py:1120
+msgid "Location:"
 msgstr ""
 
-#: ProbePage.py:98
-msgid "Autolevel Z surface"
+#: ProbePage.py:1127
+msgid "Camera location inside canvas"
 msgstr ""
 
-#: ProbePage.py:110
-msgid "Work surface camera view and alignment"
+#: ProbePage.py:1131
+msgid "Scale:"
 msgstr ""
 
-#: ProbePage.py:117
-msgid "Tool"
+#: ProbePage.py:1137
+msgid "Camera scale [pixels / unit]"
 msgstr ""
 
-#: ProbePage.py:123
-msgid "Setup probing for manual tool change"
+#: ProbePage.py:1141
+msgid "Crosshair:"
 msgstr ""
 
-#: ProbePage.py:140
-msgid "Margins"
+#: ProbePage.py:1147
+msgid "Camera cross hair diameter [units]"
 msgstr ""
 
-#: ProbePage.py:145
-msgid "Get margins from gcode file"
+#: ProbePage.py:1149
+msgid "Get"
 msgstr ""
 
-#: ProbePage.py:152
-msgid "Zero"
+#: ProbePage.py:1151
+msgid "Get diameter from active endmill"
 msgstr ""
 
-#: ProbePage.py:157
-msgid "Set current location as Z-zero for leveling"
+#: ProbePage.py:1161 ProbePage.py:1168
+msgid "Camera offset from gantry"
 msgstr ""
 
-#: ProbePage.py:164 ProbePage.py:474 TerminalPage.py:29
-msgid "Clear"
+#: ProbePage.py:1175
+msgid "Spindle Z position when camera was registered"
 msgstr ""
 
-#: ProbePage.py:169
-msgid "Clear probe data"
+#: ProbePage.py:1178
+msgid "Register:"
 msgstr ""
 
-#: ProbePage.py:176 plugins/heightmap.py:52
-msgid "Scan"
+#: ProbePage.py:1179
+msgid "1. Spindle"
 msgstr ""
 
-#: ProbePage.py:183
-msgid "Scan probed area for level information on Z plane"
+#: ProbePage.py:1183
+msgid "Mark spindle position for calculating offset"
 msgstr ""
 
-#: ProbePage.py:196
-msgid "Common"
+#: ProbePage.py:1185
+msgid "2. Camera"
 msgstr ""
 
-#: ProbePage.py:204
-msgid "Probe Feed:"
+#: ProbePage.py:1189
+msgid "Mark camera position for calculating offset"
 msgstr ""
 
-#: ProbePage.py:208
-msgid "Set probe feed rate"
+#: ProbePage.py:1254
+msgid "Spindle position is registered"
 msgstr ""
 
-#: ProbePage.py:215
-msgid "TLO"
+#: ProbePage.py:1261
+msgid "Spindle position is not registered"
 msgstr ""
 
-#: ProbePage.py:219
-msgid "Set tool offset for probing"
+#: ProbePage.py:1262
+msgid "Spindle position must be registered before camera"
 msgstr ""
 
-#: ProbePage.py:225 ControlPage.py:857 ControlPage.py:892
-msgid "set"
+#: ProbePage.py:1268
+msgid "Camera offset is updated"
 msgstr ""
 
-#: ProbePage.py:235
-msgid "Probe Command"
+#: ProbePage.py:1327 ProbePage.py:1474
+msgid "Calibrate"
 msgstr ""
 
-#: ProbePage.py:307 ProbePage.py:1399
-msgid "Probe:"
+#: ProbePage.py:1333
+msgid "Perform a single a tool change cycle to set the calibration field"
 msgstr ""
 
-#: ProbePage.py:332
-msgid "Perform a single probe cycle"
+#: ProbePage.py:1337
+msgid "Change"
 msgstr ""
 
-#: ProbePage.py:336
-msgid "Pos:"
+#: ProbePage.py:1343
+msgid "Perform a tool change cycle"
 msgstr ""
 
-#: ProbePage.py:341
-msgid "Probe along X direction"
+#: ProbePage.py:1352
+msgid "Manual Tool Change"
 msgstr ""
 
-#: ProbePage.py:347
-msgid "Probe along Y direction"
+#: ProbePage.py:1357
+msgid "Policy:"
 msgstr ""
 
-#: ProbePage.py:353
-msgid "Probe along Z direction"
+#: ProbePage.py:1366
+msgid "Tool change policy"
 msgstr ""
 
-#: ProbePage.py:366
-msgid "Diameter:"
+#: ProbePage.py:1372
+msgid "Pause:"
 msgstr ""
 
-#: ProbePage.py:369
-msgid "Probing ring internal diameter"
+#: ProbePage.py:1395
+msgid "Change:"
 msgstr ""
 
-#: ProbePage.py:382
-msgid "Center probing using a ring"
+#: ProbePage.py:1399
+msgid "Manual tool change Machine X location"
 msgstr ""
 
-#: ProbePage.py:387 ProbePage.py:495 bCNC.py:91
-msgid "Orient"
+#: ProbePage.py:1405
+msgid "Manual tool change Machine Y location"
 msgstr ""
 
-#: ProbePage.py:393
-msgid "Markers:"
+#: ProbePage.py:1411
+msgid "Manual tool change Machine Z location"
 msgstr ""
 
-#: ProbePage.py:403
-msgid "Select orientation marker"
+#: ProbePage.py:1415 ProbePage.py:1445
+msgid "get"
 msgstr ""
 
-#: ProbePage.py:415
-msgid ""
-"Add an orientation marker. Jog first the machine to the marker position and "
-"then click on canvas to add the marker."
+#: ProbePage.py:1419
+msgid "Get current gantry position as machine tool change location"
 msgstr ""
 
-#: ProbePage.py:422
-msgid "Gcode:"
+#: ProbePage.py:1429
+msgid "Manual tool change Probing MX location"
 msgstr ""
 
-#: ProbePage.py:429
-msgid "GCode X coordinate of orientation point"
+#: ProbePage.py:1435
+msgid "Manual tool change Probing MY location"
 msgstr ""
 
-#: ProbePage.py:437
-msgid "GCode Y coordinate of orientation point"
+#: ProbePage.py:1441
+msgid "Manual tool change Probing MZ location"
 msgstr ""
 
-#: ProbePage.py:449
-msgid "Delete current marker"
+#: ProbePage.py:1449
+msgid "Get current gantry position as machine tool probe location"
 msgstr ""
 
-#: ProbePage.py:462
-msgid "Machine X coordinate of orientation point"
+#: ProbePage.py:1455 ControlPage.py:825
+msgid "Distance:"
 msgstr ""
 
-#: ProbePage.py:470
-msgid "Machine Y coordinate of orientation point"
+#: ProbePage.py:1460
+msgid "After a tool change distance to scan starting from ProbeZ"
 msgstr ""
 
-#: ProbePage.py:482 ProbePage.py:678
-msgid "Delete all markers"
+#: ProbePage.py:1466
+msgid "Calibration:"
 msgstr ""
 
-#: ProbePage.py:487
-msgid "Angle:"
+#: ProbePage.py:1470
+msgid "Tool probe height"
 msgstr ""
 
-#: ProbePage.py:503
-msgid "Align GCode with the machine markers"
+#: ProbePage.py:1478
+msgid "Perform a calibration probing to determine the height"
 msgstr ""
 
-#: ProbePage.py:508 ProbePage.py:1129
-msgid "Offset:"
+#: ProbePage.py:1529 ProbePage.py:1539 ProbePage.py:1547 ProbePage.py:1555
+#: ProbePage.py:1563
+msgid "Probe Tool Change Error"
 msgstr ""
 
-#: ProbePage.py:521
-msgid "Error:"
+#: ProbePage.py:1530
+msgid "Invalid tool change position"
 msgstr ""
 
-#: ProbePage.py:561
-msgid "Probe connected?"
+#: ProbePage.py:1540
+msgid "Invalid tool probe location"
 msgstr ""
 
-#: ProbePage.py:562
-msgid ""
-"Please verify that the probe is connected.\n"
-"\n"
-"Show this message again?"
+#: ProbePage.py:1548 ProbePage.py:1564
+msgid "Invalid tool scanning distance entered"
 msgstr ""
 
-#: ProbePage.py:573 ProbePage.py:604 ProbePage.py:930 ProbePage.py:943
-#: ProbePage.py:953 ProbePage.py:960
-msgid "Probe Error"
+#: ProbePage.py:1556
+msgid "Invalid tool height or not calibrated"
 msgstr ""
 
-#: ProbePage.py:574 ProbePage.py:961
-msgid "Invalid probe feed rate"
+#: ProbePage.py:1650
+msgid "Probe configuration and probing"
 msgstr ""
 
-#: ProbePage.py:605
-msgid "At least one probe direction should be specified"
+#: ControlPage.py:39
+msgid "Hard Reset"
 msgstr ""
 
-#: ProbePage.py:620
-msgid "Probe Center Error"
+#: ControlPage.py:46
+msgid "Home"
 msgstr ""
 
-#: ProbePage.py:621
-msgid "Invalid diameter entered"
+#: ControlPage.py:52
+msgid "Perform a homing cycle [$H]"
 msgstr ""
 
-#: ProbePage.py:679
-msgid "Do you want to delete all orientation markers?"
+#: ControlPage.py:59
+msgid "Unlock"
 msgstr ""
 
-#: ProbePage.py:770
-msgid "Min"
+#: ControlPage.py:65
+msgid "Unlock controller [$X]"
 msgstr ""
 
-#: ProbePage.py:772
-msgid "Max"
+#: ControlPage.py:71
+msgid "Reset"
 msgstr ""
 
-#: ProbePage.py:774
-msgid "Step"
+#: ControlPage.py:77
+msgid "Software reset of controller [ctrl-x]"
 msgstr ""
 
-#: ProbePage.py:785
-msgid "X minimum"
+#: ControlPage.py:106 FilePage.py:176
+msgid "Start"
 msgstr ""
 
-#: ProbePage.py:791
-msgid "X maximum"
+#: ControlPage.py:110
+msgid "Run g-code commands from editor to controller"
 msgstr ""
 
-#: ProbePage.py:798
-msgid "X step"
+#: ControlPage.py:115
+msgid "Pause"
 msgstr ""
 
-#: ProbePage.py:807
-msgid "X bins"
+#: ControlPage.py:119
+msgid "Pause running program. Sends either FEED_HOLD ! or CYCLE_START ~"
 msgstr ""
 
-#: ProbePage.py:817
-msgid "Y minimum"
+#: ControlPage.py:123 FilePage.py:187
+msgid "Stop"
 msgstr ""
 
-#: ProbePage.py:823
-msgid "Y maximum"
+#: ControlPage.py:127
+msgid "Pause running program and soft reset controller to empty the buffer."
 msgstr ""
 
-#: ProbePage.py:830
-msgid "Y step"
+#: ControlPage.py:146
+msgid "Status:"
 msgstr ""
 
-#: ProbePage.py:839
-msgid "Y bins"
+#: ControlPage.py:157
+msgid ""
+"Show current state of the machine\n"
+"Click to see details\n"
+"Right-Click to clear alarm/errors"
 msgstr ""
 
-#: ProbePage.py:850
-msgid "Z Minimum depth to scan"
+#: ControlPage.py:165
+msgid "WPos:"
 msgstr ""
 
-#: ProbePage.py:856
-msgid "Z safe to move"
+#: ControlPage.py:176
+msgid "X work position (click to set)"
 msgstr ""
 
-#: ProbePage.py:931
-msgid "Invalid X probing region"
+#: ControlPage.py:190
+msgid "Y work position (click to set)"
 msgstr ""
 
-#: ProbePage.py:944
-msgid "Invalid Y probing region"
+#: ControlPage.py:204
+msgid "Z work position (click to set)"
 msgstr ""
 
-#: ProbePage.py:954
-msgid "Invalid Z probing region"
+#: ControlPage.py:212
+msgid "MPos:"
 msgstr ""
 
-#: ProbePage.py:981
-msgid "Delete autolevel information"
+#: ControlPage.py:235
+msgid "Set X coordinate to zero (or to typed coordinate in WPos)"
 msgstr ""
 
-#: ProbePage.py:982
-msgid "Do you want to delete all autolevel in formation?"
+#: ControlPage.py:244
+msgid "Set Y coordinate to zero (or to typed coordinate in WPos)"
 msgstr ""
 
-#: ProbePage.py:1014
-msgid "Switch To"
+#: ControlPage.py:253
+msgid "Set Z coordinate to zero (or to typed coordinate in WPos)"
 msgstr ""
 
-#: ProbePage.py:1020
-msgid "Switch between camera and spindle"
+#: ControlPage.py:259
+msgid "Set WPOS"
 msgstr ""
 
-#: ProbePage.py:1026
-msgid "Edge Detection"
+#: ControlPage.py:266
+msgid "Set WPOS to mouse location"
 msgstr ""
 
-#: ProbePage.py:1033
-msgid "Turn on/off edge detection"
+#: ControlPage.py:270
+msgid "Move Gantry"
 msgstr ""
 
-#: ProbePage.py:1039
-msgid "Freeze"
+#: ControlPage.py:277
+msgid "Move gantry to mouse location [g]"
 msgstr ""
 
-#: ProbePage.py:1046
-msgid "Turn on/off freeze image"
+#: ControlPage.py:288
+msgid "Show Info"
 msgstr ""
 
-#: ProbePage.py:1094
-msgid "Location:"
+#: ControlPage.py:290
+msgid "Clear Message"
 msgstr ""
 
-#: ProbePage.py:1101
-msgid "Camera location inside canvas"
+#: ControlPage.py:294
+msgid "Feed hold"
 msgstr ""
 
-#: ProbePage.py:1105
-msgid "Scale:"
+#: ControlPage.py:296
+msgid "Resume"
 msgstr ""
 
-#: ProbePage.py:1111
-msgid "Camera scale [pixels / unit]"
+#: ControlPage.py:396
+#, python-format
+msgid "Last error: %s\n"
 msgstr ""
 
-#: ProbePage.py:1115
-msgid "Crosshair:"
+#: ControlPage.py:402
+msgid ""
+"No info available.\n"
+"Please contact the author."
 msgstr ""
 
-#: ProbePage.py:1121
-msgid "Camera cross hair diameter [units]"
+#: ControlPage.py:403
+#, python-format
+msgid "State: %s"
 msgstr ""
 
-#: ProbePage.py:1123
-msgid "Get"
+#: ControlPage.py:430
+msgid "Move +Z"
 msgstr ""
 
-#: ProbePage.py:1125
-msgid "Get diameter from active endmill"
+#: ControlPage.py:440
+msgid "Move -X +Y"
 msgstr ""
 
-#: ProbePage.py:1135 ProbePage.py:1142
-msgid "Camera offset from gantry"
+#: ControlPage.py:449
+msgid "Move +Y"
 msgstr ""
 
-#: ProbePage.py:1149
-msgid "Spindle Z position when camera was registered"
+#: ControlPage.py:458
+msgid "Move +X +Y"
 msgstr ""
 
-#: ProbePage.py:1152
-msgid "Register:"
+#: ControlPage.py:467
+msgid "Multiply step by 10"
 msgstr ""
 
-#: ProbePage.py:1153
-msgid "1. Spindle"
+#: ControlPage.py:476
+msgid "Increase step by 1 unit"
 msgstr ""
 
-#: ProbePage.py:1157
-msgid "Mark spindle position for calculating offset"
+#: ControlPage.py:491
+msgid "Move -X"
 msgstr ""
 
-#: ProbePage.py:1159
-msgid "2. Camera"
+#: ControlPage.py:500
+msgid ""
+"Move to Origin.\n"
+"User configurable button.\n"
+"Right click to configure."
 msgstr ""
 
-#: ProbePage.py:1163
-msgid "Mark camera position for calculating offset"
+#: ControlPage.py:509
+msgid "Move +X"
 msgstr ""
 
-#: ProbePage.py:1228
-msgid "Spindle position is registered"
+#: ControlPage.py:532
+msgid "Step for every move operation"
 msgstr ""
 
-#: ProbePage.py:1235
-msgid "Spindle position is not registered"
+#: ControlPage.py:550
+msgid "Step for Z move operation"
 msgstr ""
 
-#: ProbePage.py:1236
-msgid "Spindle position must be registered before camera"
+#: ControlPage.py:580
+msgid "Move -Z"
 msgstr ""
 
-#: ProbePage.py:1242
-msgid "Camera offset is updated"
+#: ControlPage.py:589
+msgid "Move -X -Y"
 msgstr ""
 
-#: ProbePage.py:1301 ProbePage.py:1448
-msgid "Calibrate"
+#: ControlPage.py:598
+msgid "Move -Y"
 msgstr ""
 
-#: ProbePage.py:1307
-msgid "Perform a single a tool change cycle to set the calibration field"
+#: ControlPage.py:607
+msgid "Move +X -Y"
 msgstr ""
 
-#: ProbePage.py:1311
-msgid "Change"
+#: ControlPage.py:615
+msgid "Divide step by 10"
 msgstr ""
 
-#: ProbePage.py:1317
-msgid "Perform a tool change cycle"
+#: ControlPage.py:623
+msgid "Decrease step by 1 unit"
 msgstr ""
 
-#: ProbePage.py:1326
-msgid "Manual Tool Change"
+#: ControlPage.py:690
+#, python-format
+msgid "Step: %g"
 msgstr ""
 
-#: ProbePage.py:1331
-msgid "Policy:"
+#: ControlPage.py:695
+#, python-format
+msgid "Step: %g    Zstep:%g "
 msgstr ""
 
-#: ProbePage.py:1340
-msgid "Tool change policy"
+#: ControlPage.py:819
+#, python-format
+msgid "Switch to workspace %s"
 msgstr ""
 
-#: ProbePage.py:1346
-msgid "Pause:"
+#: ControlPage.py:833
+msgid "Distance Mode [G90,G91]"
 msgstr ""
 
-#: ProbePage.py:1369
-msgid "Change:"
+#: ControlPage.py:843
+msgid "Units:"
 msgstr ""
 
-#: ProbePage.py:1373
-msgid "Manual tool change Machine X location"
+#: ControlPage.py:851
+msgid "Units [G20, G21]"
 msgstr ""
 
-#: ProbePage.py:1379
-msgid "Manual tool change Machine Y location"
+#: ControlPage.py:863
+msgid "Tool number [T#]"
 msgstr ""
 
-#: ProbePage.py:1385
-msgid "Manual tool change Machine Z location"
+#: ControlPage.py:875
+msgid "Plane:"
 msgstr ""
 
-#: ProbePage.py:1389 ProbePage.py:1419
-msgid "get"
+#: ControlPage.py:883
+msgid "Plane [G17,G18,G19]"
 msgstr ""
 
-#: ProbePage.py:1393
-msgid "Get current gantry position as machine tool change location"
+#: ControlPage.py:891
+msgid "Feed:"
 msgstr ""
 
-#: ProbePage.py:1403
-msgid "Manual tool change Probing MX location"
+#: ControlPage.py:898
+msgid "Feed Rate [F#]"
 msgstr ""
 
-#: ProbePage.py:1409
-msgid "Manual tool change Probing MY location"
+#: ControlPage.py:909
+msgid "Mode:"
 msgstr ""
 
-#: ProbePage.py:1415
-msgid "Manual tool change Probing MZ location"
+#: ControlPage.py:918
+msgid "Feed Mode [G93, G94, G95]"
 msgstr ""
 
-#: ProbePage.py:1423
-msgid "Get current gantry position as machine tool probe location"
+#: ControlPage.py:936
+msgid ""
+"Feed\n"
+"Override:"
 msgstr ""
 
-#: ProbePage.py:1429 ControlPage.py:815
-msgid "Distance:"
+#: ControlPage.py:942
+msgid "Reset Feed Override to 100%"
 msgstr ""
 
-#: ProbePage.py:1434
-msgid "After a tool change distance to scan starting from ProbeZ"
+#: ControlPage.py:954
+msgid "Set Feed Override"
 msgstr ""
 
-#: ProbePage.py:1440
-msgid "Calibration:"
+#: ControlPage.py:959
+msgid "Spindle"
 msgstr ""
 
-#: ProbePage.py:1444
-msgid "Tool probe height"
+#: ControlPage.py:967
+msgid "Start/Stop spindle (M3/M5)"
 msgstr ""
 
-#: ProbePage.py:1452
-msgid "Perform a calibration probing to determine the height"
+#: ControlPage.py:978
+msgid "Set spindle RPM"
 msgstr ""
 
-#: ProbePage.py:1503 ProbePage.py:1513 ProbePage.py:1521 ProbePage.py:1529
-#: ProbePage.py:1537
-msgid "Probe Tool Change Error"
+#: ControlPage.py:1075
+msgid "CNC communication and control"
 msgstr ""
 
-#: ProbePage.py:1504
-msgid "Invalid tool change position"
+#: EditorPage.py:35
+msgid "Paste"
 msgstr ""
 
-#: ProbePage.py:1514
-msgid "Invalid tool probe location"
+#: EditorPage.py:40
+msgid "Paste [Ctrl-V]"
 msgstr ""
 
-#: ProbePage.py:1522 ProbePage.py:1538
-msgid "Invalid tool scanning distance entered"
+#: EditorPage.py:51
+msgid "Cut [Ctrl-X]"
 msgstr ""
 
-#: ProbePage.py:1530
-msgid "Invalid tool height or not calibrated"
+#: EditorPage.py:58
+msgid "Copy"
 msgstr ""
 
-#: ProbePage.py:1624
-msgid "Probe configuration and probing"
+#: EditorPage.py:63
+msgid "Copy [Ctrl-C]"
 msgstr ""
 
-#: CNCCanvas.py:356
-msgid "Select objects with mouse"
+#: EditorPage.py:79 bCNC.py:93
+msgid "All"
 msgstr ""
 
-#: CNCCanvas.py:361
-msgid "Pan viewport"
+#: EditorPage.py:84
+msgid "Select all blocks [Ctrl-A]"
 msgstr ""
 
-#: CNCCanvas.py:366
-msgid "Click to set the origin (zero)"
+#: EditorPage.py:91
+msgid "None"
 msgstr ""
 
-#: CNCCanvas.py:371
-msgid "Move graphically objects"
+#: EditorPage.py:96
+msgid "Unselect all blocks [Ctrl-Shift-A]"
 msgstr ""
 
-#: CNCCanvas.py:377
-msgid "Move CNC gantry to mouse location"
+#: EditorPage.py:103 EditorPage.py:452 plugins/heightmap.py:57
+msgid "Invert"
 msgstr ""
 
-#: CNCCanvas.py:383
-msgid "Set mouse location as current machine position (X/Y only)"
+#: EditorPage.py:108
+msgid "Invert selection [Ctrl-I]"
 msgstr ""
 
-#: CNCCanvas.py:388
-msgid "Drag a ruler to measure distances"
+#: EditorPage.py:115
+msgid "Layer"
 msgstr ""
 
-#: CNCCanvas.py:393
-msgid "Add an orientation marker"
+#: EditorPage.py:120
+msgid "Select all blocks from current layer"
 msgstr ""
 
-#: CNCCanvas.py:454
-msgid "ERROR: Cannot set X-Y marker  with the current view"
+#: EditorPage.py:131
+msgid "Filter blocks"
 msgstr ""
 
-#: CNCCanvas.py:540
-#, python-format
-msgid "origin %g %g %g"
+#: EditorPage.py:148
+msgid "Import"
 msgstr ""
 
-#: CNCCanvas.py:603
-#, python-format
-msgid "dx=%g  dy=%g  dz=%g  length=%g  angle=%g"
+#: EditorPage.py:149
+msgid "Inkscape"
 msgstr ""
 
-#: CNCCanvas.py:682
-#, python-format
-msgid "Move by %g, %g, %g"
+#: EditorPage.py:150
+msgid "Round"
 msgstr ""
 
-#: CNCCanvas.py:1756
-#, python-format
-msgid ">>> ERROR: %s\n"
+#: EditorPage.py:151 EditorPage.py:595 bCNC.py:846
+msgid "Statistics"
 msgstr ""
 
-#: CNCCanvas.py:1757
-#, python-format
-msgid "     line: %s\n"
+#: EditorPage.py:164
+msgid "Insert a new block or line of code [Ins or Ctrl-Enter]"
 msgstr ""
 
-#: CNCCanvas.py:1982
-msgid "Change viewing angle"
+#: EditorPage.py:176
+msgid "Clone selected lines or blocks [Ctrl-D]"
 msgstr ""
 
-#: CNCCanvas.py:1986
-msgid "Zoom In [Ctrl-=]"
+#: EditorPage.py:188
+msgid "Delete selected lines or blocks [Del]"
 msgstr ""
 
-#: CNCCanvas.py:1991
-msgid "Zoom Out [Ctrl--]"
+#: EditorPage.py:200
+msgid "Toggle enable/disable block of g-code [Ctrl-L]"
 msgstr ""
 
-#: CNCCanvas.py:1996
-msgid "Fit to screen [F]"
+#: EditorPage.py:203
+msgid "Enable"
 msgstr ""
 
-#: CNCCanvas.py:1999 ControlPage.py:848
-msgid "Tool:"
+#: EditorPage.py:205
+msgid "Disable"
 msgstr ""
 
-#: CNCCanvas.py:2010
-msgid "Select tool [S]"
+#: EditorPage.py:208
+msgid "Active"
 msgstr ""
 
-#: CNCCanvas.py:2019
-msgid "Pan viewport [X]"
+#: EditorPage.py:214
+msgid "Enable or disable blocks of gcode"
 msgstr ""
 
-#: CNCCanvas.py:2045
-msgid "Ruler [R]"
+#: EditorPage.py:221
+msgid "Expand"
 msgstr ""
 
-#: CNCCanvas.py:2051
-msgid "Draw:"
+#: EditorPage.py:226
+msgid "Toggle expand/collapse blocks of gcode [Ctrl-E]"
 msgstr ""
 
-#: CNCCanvas.py:2060
-msgid "Toggle display of axes"
+#: EditorPage.py:233
+msgid "Comment"
 msgstr ""
 
-#: CNCCanvas.py:2068
-msgid "Toggle display of grid lines"
+#: EditorPage.py:239
+msgid "(Un)Comment selected lines"
 msgstr ""
 
-#: CNCCanvas.py:2076
-msgid "Toggle display of margins"
+#: EditorPage.py:246 CNCList.py:663
+msgid "Color"
 msgstr ""
 
-#: CNCCanvas.py:2085
-msgid "Toggle display of probe"
+#: EditorPage.py:251
+msgid "Change color for block of g-code"
 msgstr ""
 
-#: CNCCanvas.py:2093
-msgid "Toggle display of paths (G1,G2,G3)"
+#: EditorPage.py:266
+msgid "Move"
 msgstr ""
 
-#: CNCCanvas.py:2101
-msgid "Toggle display of rapid motion (G0)"
+#: EditorPage.py:274
+msgid "Move objects [M]"
 msgstr ""
 
-#: CNCCanvas.py:2109
-msgid "Toggle display of workarea"
+#: EditorPage.py:282
+msgid "T-L"
 msgstr ""
 
-#: CNCCanvas.py:2117
-msgid "Toggle display of camera"
+#: EditorPage.py:288
+msgid "Move origin of g-code to Top-Left corner"
 msgstr ""
 
-#: CNCCanvas.py:2124
-msgid "Redraw display [Ctrl-R]"
+#: EditorPage.py:295
+msgid "L"
 msgstr ""
 
-#: CNCCanvas.py:2132
-msgid "Draw timeout in seconds"
+#: EditorPage.py:301
+msgid "Move origin of g-code to Left side"
 msgstr ""
 
-#: bCNC.py:86
-msgid "All accepted"
+#: EditorPage.py:308
+msgid "B-L"
 msgstr ""
 
-#: bCNC.py:87 bCNC.py:1916
-msgid "G-Code"
+#: EditorPage.py:314
+msgid "Move origin of g-code to Bottom-Left corner"
 msgstr ""
 
-#: bCNC.py:142
-msgid "Controller buffer fill"
+#: EditorPage.py:322
+msgid "Top"
 msgstr ""
 
-#: bCNC.py:169
-msgid ""
-"MDI Command line: Accept g-code commands or macro commands (RESET/HOME...) "
-"or editor commands (move,inkscape, round...) [Space or Ctrl-Space]"
+#: EditorPage.py:328
+msgid "Move origin of g-code to Top side"
 msgstr ""
 
-#: bCNC.py:463
-msgid "Running"
+#: EditorPage.py:341
+msgid "Move origin of g-code to center"
 msgstr ""
 
-#: bCNC.py:464
-msgid "CNC is currently running, please stop it before."
+#: EditorPage.py:348
+msgid "Bottom"
 msgstr ""
 
-#: bCNC.py:655
+#: EditorPage.py:354
+msgid "Move origin of g-code to Bottom side"
+msgstr ""
+
+#: EditorPage.py:362
+msgid "T-R"
+msgstr ""
+
+#: EditorPage.py:368
+msgid "Move origin of g-code to Top-Right corner"
+msgstr ""
+
+#: EditorPage.py:375
+msgid "R"
+msgstr ""
+
+#: EditorPage.py:381
+msgid "Move origin of g-code to Right side"
+msgstr ""
+
+#: EditorPage.py:388
+msgid "B-R"
+msgstr ""
+
+#: EditorPage.py:394
+msgid "Move origin of g-code to Bottom-Right corner"
+msgstr ""
+
+#: EditorPage.py:402
+msgid "Origin"
+msgstr ""
+
+#: EditorPage.py:410
+msgid "Move all gcode such as origin is on mouse location [O]"
+msgstr ""
+
+#: EditorPage.py:420 bCNC.py:1382
+msgid "Optimize"
+msgstr ""
+
+#: EditorPage.py:428
+msgid "Up"
+msgstr ""
+
+#: EditorPage.py:433
+msgid "Move selected g-code up [Ctrl-Up, Ctrl-PgUp]"
+msgstr ""
+
+#: EditorPage.py:440
+msgid "Down"
+msgstr ""
+
+#: EditorPage.py:445
+msgid "Move selected g-code down [Ctrl-Down, Ctrl-PgDn]"
+msgstr ""
+
+#: EditorPage.py:457
+msgid "Invert cutting order of selected blocks"
+msgstr ""
+
+#: EditorPage.py:472
+msgid "CW"
+msgstr ""
+
+#: EditorPage.py:478
+msgid "Rotate selected gcode clock-wise (-90deg)"
+msgstr ""
+
+#: EditorPage.py:485
+msgid "Flip"
+msgstr ""
+
+#: EditorPage.py:491
+msgid "Rotate selected gcode by 180deg"
+msgstr ""
+
+#: EditorPage.py:498
+msgid "CCW"
+msgstr ""
+
+#: EditorPage.py:504
+msgid "Rotate selected gcode counter-clock-wise (90deg)"
+msgstr ""
+
+#: EditorPage.py:511
+msgid "Horizontal"
+msgstr ""
+
+#: EditorPage.py:517
+msgid "Mirror horizontally X=-X selected gcode"
+msgstr ""
+
+#: EditorPage.py:524
+msgid "Vertical"
+msgstr ""
+
+#: EditorPage.py:530
+msgid "Mirror vertically Y=-Y selected gcode"
+msgstr ""
+
+#: EditorPage.py:548
+msgid "Conventional"
+msgstr ""
+
+#: EditorPage.py:554
+msgid "Change cut direction to conventional for selected gcode blocks"
+msgstr ""
+
+#: EditorPage.py:561
+msgid "Climb"
+msgstr ""
+
+#: EditorPage.py:567
+msgid "Change cut direction to climb for selected gcode blocks"
+msgstr ""
+
+#: EditorPage.py:574
+msgid "Reverse"
+msgstr ""
+
+#: EditorPage.py:580
+msgid "Reverse cut direction for selected gcode blocks"
+msgstr ""
+
+#: EditorPage.py:601
+msgid "Show statistics for enabled gcode"
+msgstr ""
+
+#: EditorPage.py:608
+msgid "Info"
+msgstr ""
+
+#: EditorPage.py:614
+msgid "Show cutting information on selected blocks [Ctrl-n]"
+msgstr ""
+
+#: EditorPage.py:638
+msgid "GCode editor"
+msgstr ""
+
+#: bCNC.py:86
+msgid "All accepted"
+msgstr ""
+
+#: bCNC.py:87 bCNC.py:1916
+msgid "G-Code"
+msgstr ""
+
+#: bCNC.py:142
+msgid "Controller buffer fill"
+msgstr ""
+
+#: bCNC.py:169
+msgid ""
+"MDI Command line: Accept g-code commands or macro commands (RESET/HOME...) "
+"or editor commands (move,inkscape, round...) [Space or Ctrl-Space]"
+msgstr ""
+
+#: bCNC.py:463
+msgid "Running"
+msgstr ""
+
+#: bCNC.py:464
+msgid "CNC is currently running, please stop it before."
+msgstr ""
+
+#: bCNC.py:655
 #, python-format
 msgid "About %s"
 msgstr ""
@@ -2169,6 +2363,11 @@ msgid ""
 "Reload new version?"
 msgstr ""
 
+#: bCNC.py:1962 FilePage.py:82 FilePage.py:279 lib/bFileDialog.py:322
+#: lib/bFileDialog.py:873 lib/bFileDialog.py:977
+msgid "Open"
+msgstr ""
+
 #: bCNC.py:1982
 msgid "Error opening serial"
 msgstr ""
@@ -2242,295 +2441,108 @@ msgid ""
 "\tor dnf install python-pyserial"
 msgstr ""
 
-#: ControlPage.py:39
-msgid "Hard Reset"
-msgstr ""
-
-#: ControlPage.py:46
-msgid "Home"
-msgstr ""
-
-#: ControlPage.py:52
-msgid "Perform a homing cycle [$H]"
-msgstr ""
-
-#: ControlPage.py:59
-msgid "Unlock"
-msgstr ""
-
-#: ControlPage.py:65
-msgid "Unlock controller [$X]"
-msgstr ""
-
-#: ControlPage.py:71
-msgid "Reset"
-msgstr ""
-
-#: ControlPage.py:77
-msgid "Software reset of controller [ctrl-x]"
-msgstr ""
-
-#: ControlPage.py:110
-msgid "Run g-code commands from editor to controller"
-msgstr ""
-
-#: ControlPage.py:115
-msgid "Pause"
-msgstr ""
-
-#: ControlPage.py:119
-msgid "Pause running program. Sends either FEED_HOLD ! or CYCLE_START ~"
-msgstr ""
-
-#: ControlPage.py:127
-msgid "Pause running program and soft reset controller to empty the buffer."
-msgstr ""
-
-#: ControlPage.py:146
-msgid "Status:"
-msgstr ""
-
-#: ControlPage.py:157
-msgid ""
-"Show current state of the machine\n"
-"Click to see details\n"
-"Right-Click to clear alarm/errors"
-msgstr ""
-
-#: ControlPage.py:165
-msgid "WPos:"
-msgstr ""
-
-#: ControlPage.py:176
-msgid "X work position (click to set)"
-msgstr ""
-
-#: ControlPage.py:190
-msgid "Y work position (click to set)"
-msgstr ""
-
-#: ControlPage.py:204
-msgid "Z work position (click to set)"
-msgstr ""
-
-#: ControlPage.py:212
-msgid "MPos:"
-msgstr ""
-
-#: ControlPage.py:235
-msgid "Set X coordinate to zero (or to typed coordinate in WPos)"
-msgstr ""
-
-#: ControlPage.py:244
-msgid "Set Y coordinate to zero (or to typed coordinate in WPos)"
-msgstr ""
-
-#: ControlPage.py:253
-msgid "Set Z coordinate to zero (or to typed coordinate in WPos)"
-msgstr ""
-
-#: ControlPage.py:259
-msgid "Set WPOS"
-msgstr ""
-
-#: ControlPage.py:266
-msgid "Set WPOS to mouse location"
-msgstr ""
-
-#: ControlPage.py:270
-msgid "Move Gantry"
-msgstr ""
-
-#: ControlPage.py:277
-msgid "Move gantry to mouse location [g]"
-msgstr ""
-
-#: ControlPage.py:288
-msgid "Show Info"
-msgstr ""
-
-#: ControlPage.py:290
-msgid "Clear Message"
-msgstr ""
-
-#: ControlPage.py:294
-msgid "Feed hold"
-msgstr ""
-
-#: ControlPage.py:296
-msgid "Resume"
-msgstr ""
-
-#: ControlPage.py:386
-#, python-format
-msgid "Last error: %s\n"
-msgstr ""
-
-#: ControlPage.py:392
-msgid ""
-"No info available.\n"
-"Please contact the author."
-msgstr ""
-
-#: ControlPage.py:393
-#, python-format
-msgid "State: %s"
-msgstr ""
-
-#: ControlPage.py:420
-msgid "Move +Z"
-msgstr ""
-
-#: ControlPage.py:430
-msgid "Move -X +Y"
-msgstr ""
-
-#: ControlPage.py:439
-msgid "Move +Y"
-msgstr ""
-
-#: ControlPage.py:448
-msgid "Move +X +Y"
-msgstr ""
-
-#: ControlPage.py:457
-msgid "Multiply step by 10"
-msgstr ""
-
-#: ControlPage.py:466
-msgid "Increase step by 1 unit"
-msgstr ""
-
-#: ControlPage.py:481
-msgid "Move -X"
-msgstr ""
-
-#: ControlPage.py:490
-msgid ""
-"Move to Origin.\n"
-"User configurable button.\n"
-"Right click to configure."
-msgstr ""
-
-#: ControlPage.py:499
-msgid "Move +X"
-msgstr ""
-
-#: ControlPage.py:522
-msgid "Step for every move operation"
-msgstr ""
-
-#: ControlPage.py:540
-msgid "Step for Z move operation"
-msgstr ""
-
-#: ControlPage.py:570
-msgid "Move -Z"
+#: FilePage.py:64
+msgid "New"
 msgstr ""
 
-#: ControlPage.py:579
-msgid "Move -X -Y"
+#: FilePage.py:68
+msgid "New gcode/dxf file"
 msgstr ""
 
-#: ControlPage.py:588
-msgid "Move -Y"
+#: FilePage.py:77
+msgid "Open existing gcode/dxf file [Ctrl-O]"
 msgstr ""
 
-#: ControlPage.py:597
-msgid "Move +X -Y"
+#: FilePage.py:87
+msgid "Open recent file"
 msgstr ""
 
-#: ControlPage.py:605
-msgid "Divide step by 10"
+#: FilePage.py:97
+msgid "Save gcode/dxf file [Ctrl-S]"
 msgstr ""
 
-#: ControlPage.py:613
-msgid "Decrease step by 1 unit"
+#: FilePage.py:102 lib/bFileDialog.py:907
+msgid "Save"
 msgstr ""
 
-#: ControlPage.py:680
-#, python-format
-msgid "Step: %g"
+#: FilePage.py:107
+msgid "Save gcode/dxf AS"
 msgstr ""
 
-#: ControlPage.py:685
-#, python-format
-msgid "Step: %g    Zstep:%g "
+#: FilePage.py:141
+msgid "Send Error Report"
 msgstr ""
 
-#: ControlPage.py:809
-#, python-format
-msgid "Switch to workspace %s"
+#: FilePage.py:146
+msgid "Updates"
 msgstr ""
 
-#: ControlPage.py:823
-msgid "Distance Mode [G90,G91]"
+#: FilePage.py:153
+msgid "Check Updates"
 msgstr ""
 
-#: ControlPage.py:833
-msgid "Units:"
+#: FilePage.py:157
+msgid "About"
 msgstr ""
 
-#: ControlPage.py:841
-msgid "Units [G20, G21]"
+#: FilePage.py:164
+msgid "About the program"
 msgstr ""
 
-#: ControlPage.py:853
-msgid "Tool number [T#]"
+#: FilePage.py:183
+msgid "Start pendant"
 msgstr ""
 
-#: ControlPage.py:865
-msgid "Plane:"
+#: FilePage.py:194
+msgid "Stop pendant"
 msgstr ""
 
-#: ControlPage.py:873
-msgid "Plane [G17,G18,G19]"
+#: FilePage.py:205
+msgid "Exit"
 msgstr ""
 
-#: ControlPage.py:881
-msgid "Feed:"
+#: FilePage.py:212
+msgid "Close program [Ctrl-Q]"
 msgstr ""
 
-#: ControlPage.py:888
-msgid "Feed Rate [F#]"
+#: FilePage.py:225
+msgid "Port:"
 msgstr ""
 
-#: ControlPage.py:899
-msgid "Mode:"
+#: FilePage.py:231
+msgid "Select (or manual enter) port to connect"
 msgstr ""
 
-#: ControlPage.py:908
-msgid "Feed Mode [G93, G94, G95]"
+#: FilePage.py:240
+msgid "Baud:"
 msgstr ""
 
-#: ControlPage.py:926
-msgid ""
-"Feed\n"
-"Override:"
+#: FilePage.py:245
+msgid "Select connection baud rate"
 msgstr ""
 
-#: ControlPage.py:932
-msgid "Reset Feed Override to 100%"
+#: FilePage.py:252
+msgid "Controller:"
 msgstr ""
 
-#: ControlPage.py:944
-msgid "Set Feed Override"
+#: FilePage.py:259
+msgid "Select controller board"
 msgstr ""
 
-#: ControlPage.py:949
-msgid "Spindle"
+#: FilePage.py:266
+msgid "Connect on startup"
 msgstr ""
 
-#: ControlPage.py:957
-msgid "Start/Stop spindle (M3/M5)"
+#: FilePage.py:269
+msgid "Connect to serial on startup of the program"
 msgstr ""
 
-#: ControlPage.py:968
-msgid "Set spindle RPM"
+#: FilePage.py:284
+msgid "Open/Close serial port"
 msgstr ""
 
-#: ControlPage.py:1065
-msgid "CNC communication and control"
+#: FilePage.py:303
+msgid "File I/O and configuration"
 msgstr ""
 
 #: TerminalPage.py:33