diff --git a/README.md b/README.md
index ca601101..6838eb9d 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ CAD program, and create G-Code for Isolation routing.
 - fixed some issues with the recent preparation for dark icons resource usage
 - added a new preprocessor file contributed by Daniel Friderich and added fixes for it
 - modified the export_gcode() method and the preprocessors such that the preprocessors now have the information if to include the gcode header
+- updated all the translation PO files and the POT file
 - RELEASE 8.99
 
 14.12.2019
diff --git a/locale/de/LC_MESSAGES/strings.mo b/locale/de/LC_MESSAGES/strings.mo
index 497c4dc8..0c23f286 100644
Binary files a/locale/de/LC_MESSAGES/strings.mo and b/locale/de/LC_MESSAGES/strings.mo differ
diff --git a/locale/de/LC_MESSAGES/strings.po b/locale/de/LC_MESSAGES/strings.po
index 4cd06d97..bd2643b3 100644
--- a/locale/de/LC_MESSAGES/strings.po
+++ b/locale/de/LC_MESSAGES/strings.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:23+0200\n"
-"PO-Revision-Date: 2019-12-15 17:23+0200\n"
+"POT-Creation-Date: 2019-12-16 00:16+0200\n"
+"PO-Revision-Date: 2019-12-16 00:16+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -193,7 +193,7 @@ msgstr "Export der FlatCAM-Einstellungen wurde abgebrochen."
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418
 #: FlatCAMApp.py:10541 FlatCAMApp.py:10680 FlatCAMCommon.py:378
-#: FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1185,7 +1185,7 @@ msgstr "Öffnen der DXF-Datei abgebrochen."
 msgid "Viewing the source code of the selected object."
 msgstr "Anzeigen des Quellcodes des ausgewählten Objekts."
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr "Wird geladen..."
 
@@ -2677,11 +2677,11 @@ msgstr ""
 "(x, y) sein\n"
 "Aber jetzt gibt es nur einen Wert, nicht zwei."
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr "<span style=\"color:green;\"><b>Basic</b></span>"
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr "<span style=\"color:red;\"><b>Erweitert</b></span>"
 
@@ -2705,55 +2705,59 @@ msgstr "Maschinencode-Datei gespeichert in"
 msgid "Loaded Machine Code into Code Editor"
 msgstr "Maschinencode in den Code-Editor geladen"
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr "Dieses CNCJob-Objekt kann nicht verarbeitet werden, da es sich um ein"
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr "CNCJob-Objekt"
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
-msgstr "G-Code hat keinen Einheitencode: entweder G20 oder G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
+msgstr ""
+"G-Code hat keinen G94-Code und wir werden den Code nicht in das Textfeld "
+"\"Vor dem GCode\" aufnehmen"
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr ""
 "Abgebrochen. Der benutzerdefinierte Code zum Ändern des Werkzeugs ist "
 "aktiviert, aber er ist leer."
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr ""
 "Der Werkzeugwechsel-G-Code wurde durch einen benutzerdefinierten Code "
 "ersetzt."
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr "Keine solche Datei oder Ordner"
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr "Gespeichert in"
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr ""
 "Die verwendete Postprozessor-Datei muss im Namen enthalten sein: "
 "'toolchange_custom'"
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr "Es gibt keine Postprozessor-Datei."
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr "Script Editor"
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr "Dokumenteditor"
 
@@ -2841,13 +2845,13 @@ msgstr ""
 "einen negativen Wert. \n"
 "Überprüfen Sie den resultierenden CNC-Code (Gcode usw.)."
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr ""
 "Der Parameter Cut Z ist Null. Es wird kein Schnitt ausgeführt, und die Datei "
 "wird übersprungen"
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2857,31 +2861,31 @@ msgstr ""
 "(x, y) sein\n"
 "Aber jetzt gibt es nur einen Wert, nicht zwei. "
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr "Erstellen einer Liste von Punkten zum Bohren ..."
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr "G-Code starten"
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr "Start-G-Code für Werkzeug mit Durchmesser"
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr "G91 Koordinaten nicht implementiert"
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr "Die geladene Excellon-Datei hat keine Bohrer"
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr "Fertige G-Code-Generierung ..."
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2891,7 +2895,7 @@ msgstr ""
 "das Format (x, y) haben.\n"
 "Aber jetzt gibt es nur einen Wert, nicht zwei."
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
@@ -2899,7 +2903,7 @@ msgstr ""
 "Der Parameter Cut_Z ist None oder Null. Höchstwahrscheinlich eine schlechte "
 "Kombination anderer Parameter."
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into "
 "material.\n"
@@ -2914,11 +2918,11 @@ msgstr ""
 "einen negativen Wert. \n"
 "Überprüfen Sie den resultierenden CNC-Code (Gcode usw.)."
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr "Der Parameter für den Travel Z ist Kein oder Null."
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel "
 "between cuts.\n"
@@ -2932,40 +2936,40 @@ msgstr ""
 "einen Tippfehler handelt, konvertiert die App den Wert in einen positiven "
 "Wert. Überprüfen Sie den resultierenden CNC-Code (Gcode usw.)."
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr ""
 "Der Parameter Z-Weg ist Null. Dies ist gefährlich, da die %s Datei "
 "übersprungen wird"
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr "Indizierung der Geometrie vor dem Generieren von G-Code ..."
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr "G-Code wird gestartet ..."
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr "Fertige G-Code-Generierung"
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr "Pfade verfolgt"
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr "Erwartet eine Geometrie, erhalten"
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr ""
 "Der Versuch, einen CNC-Auftrag aus einem Geometrieobjekt ohne solid_geometry "
 "zu generieren."
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
@@ -2974,35 +2978,35 @@ msgstr ""
 "Geometrie verwendet zu werden.\n"
 "Erhöhen Sie den Wert (im Modul) und versuchen Sie es erneut."
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr " Pfade verfolgt."
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr "In der SolderPaste-Geometrie sind keine Werkzeugdaten vorhanden."
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr "Fertige G-Code-Generierung"
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr "paths traced."
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr "Analysieren der GCode-Datei. Anzahl der Zeilen"
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr "Erstellen von Geometrie aus der analysierten GCode-Datei. "
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr "G91 Koordinaten nicht implementiert ..."
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr "Vereinheitlichen von Geometrie aus analysierten Geometriesegmenten"
 
@@ -16693,6 +16697,9 @@ msgstr ""
 "Kein Geometriename in args. Geben Sie einen Namen ein und versuchen Sie es "
 "erneut."
 
+#~ msgid "G-code does not have a units code: either G20 or G21"
+#~ msgstr "G-Code hat keinen Einheitencode: entweder G20 oder G21"
+
 #~ msgid "No shape selected. Select a shape to explode"
 #~ msgstr "Keine Form ausgewählt. Wählen Sie eine Form zum Auflösen aus"
 
diff --git a/locale/en/LC_MESSAGES/strings.mo b/locale/en/LC_MESSAGES/strings.mo
index 799325e0..85e270a8 100644
Binary files a/locale/en/LC_MESSAGES/strings.mo and b/locale/en/LC_MESSAGES/strings.mo differ
diff --git a/locale/en/LC_MESSAGES/strings.po b/locale/en/LC_MESSAGES/strings.po
index ae9d5856..5e9a526b 100644
--- a/locale/en/LC_MESSAGES/strings.po
+++ b/locale/en/LC_MESSAGES/strings.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:23+0200\n"
-"PO-Revision-Date: 2019-12-15 17:23+0200\n"
+"POT-Creation-Date: 2019-12-16 00:16+0200\n"
+"PO-Revision-Date: 2019-12-16 00:16+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en\n"
@@ -192,7 +192,7 @@ msgstr "FlatCAM preferences export cancelled."
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418
 #: FlatCAMApp.py:10541 FlatCAMApp.py:10680 FlatCAMCommon.py:378
-#: FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1134,7 +1134,7 @@ msgstr "Open DXF cancelled."
 msgid "Viewing the source code of the selected object."
 msgstr "Viewing the source code of the selected object."
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr "Loading..."
 
@@ -2592,11 +2592,11 @@ msgstr ""
 "y)\n"
 "but now there is only one value, not two."
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr "<span style=\"color:green;\"><b>Basic</b></span>"
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr "<span style=\"color:red;\"><b>Advanced</b></span>"
 
@@ -2620,50 +2620,54 @@ msgstr "Machine Code file saved to"
 msgid "Loaded Machine Code into Code Editor"
 msgstr "Loaded Machine Code into Code Editor"
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr "This CNCJob object can't be processed because it is a"
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr "CNCJob object"
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
-msgstr "G-code does not have a units code: either G20 or G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
+msgstr ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr "Cancelled. The Toolchange Custom code is enabled but it's empty."
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr "Toolchange G-code was replaced by a custom code."
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr "No such file or directory"
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr "Saved to"
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr "There is no preprocessor file."
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr "Script Editor"
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr "Document Editor"
 
@@ -2750,11 +2754,11 @@ msgstr ""
 "therefore the app will convert the value to negative. Check the resulting "
 "CNC code (Gcode etc)."
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr "The Cut Z parameter is zero. There will be no cut, skipping file"
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2764,31 +2768,31 @@ msgstr ""
 "y) \n"
 "but now there is only one value, not two. "
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr "Creating a list of points to drill..."
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr "Starting G-Code"
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr "Starting G-Code for tool with diameter"
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr "G91 coordinates not implemented"
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr "The loaded Excellon file has no drills"
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr "Finished G-Code generation..."
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2798,7 +2802,7 @@ msgstr ""
 "y) \n"
 "but now there is only one value, not two."
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
@@ -2806,7 +2810,7 @@ msgstr ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into "
 "material.\n"
@@ -2820,11 +2824,11 @@ msgstr ""
 "therefore the app will convert the value to negative.Check the resulting CNC "
 "code (Gcode etc)."
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr "Travel Z parameter is None or zero."
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel "
 "between cuts.\n"
@@ -2838,37 +2842,37 @@ msgstr ""
 "therefore the app will convert the value to positive.Check the resulting CNC "
 "code (Gcode etc)."
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr "The Z Travel parameter is zero. This is dangerous, skipping file"
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr "Indexing geometry before generating G-Code..."
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr "Starting G-Code..."
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr "Finished G-Code generation"
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr "paths traced"
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr "Expected a Geometry, got"
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
@@ -2876,35 +2880,35 @@ msgstr ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr " paths traced."
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr "There is no tool data in the SolderPaste geometry."
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr "Finished SolderPste G-Code generation"
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr "paths traced."
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr "Parsing GCode file. Number of lines"
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr "Creating Geometry from the parsed GCode file. "
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr "G91 coordinates not implemented ..."
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr "Unifying Geometry from parsed Geometry segments"
 
@@ -16309,6 +16313,9 @@ msgstr "Origin set by offsetting all loaded objects with "
 msgid "No Geometry name in args. Provide a name and try again."
 msgstr "No Geometry name in args. Provide a name and try again."
 
+#~ msgid "G-code does not have a units code: either G20 or G21"
+#~ msgstr "G-code does not have a units code: either G20 or G21"
+
 #~ msgid "No shape selected. Select a shape to explode"
 #~ msgstr "No shape selected. Select a shape to explode"
 
diff --git a/locale/es/LC_MESSAGES/strings.mo b/locale/es/LC_MESSAGES/strings.mo
index ef59ba4e..f369a655 100644
Binary files a/locale/es/LC_MESSAGES/strings.mo and b/locale/es/LC_MESSAGES/strings.mo differ
diff --git a/locale/es/LC_MESSAGES/strings.po b/locale/es/LC_MESSAGES/strings.po
index 7286af9e..b1a54997 100644
--- a/locale/es/LC_MESSAGES/strings.po
+++ b/locale/es/LC_MESSAGES/strings.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:23+0200\n"
-"PO-Revision-Date: 2019-12-15 17:23+0200\n"
+"POT-Creation-Date: 2019-12-16 00:17+0200\n"
+"PO-Revision-Date: 2019-12-16 00:17+0200\n"
 "Last-Translator: Marius Stanciu - Google Translate\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -195,7 +195,7 @@ msgstr "Exportación de preferencias de FlatCAM cancelada."
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418
 #: FlatCAMApp.py:10541 FlatCAMApp.py:10680 FlatCAMCommon.py:378
-#: FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1162,7 +1162,7 @@ msgstr "Abrir DXF cancelado."
 msgid "Viewing the source code of the selected object."
 msgstr "Ver el código fuente del objeto seleccionado."
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr "Cargando..."
 
@@ -2655,11 +2655,11 @@ msgstr ""
 "formato (x, y)\n"
 "pero ahora solo hay un valor, no dos."
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr "<span style=\"color:green;\"><b>Basic</b></span>"
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr "<span style=\"color:red;\"><b>Avanzado</b></span>"
 
@@ -2683,52 +2683,56 @@ msgstr "Archivo de código de máquina guardado en"
 msgid "Loaded Machine Code into Code Editor"
 msgstr "Código de máquina cargado en el editor de código"
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr "Este objeto CNCJob no se puede procesar porque es un"
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr "Objeto CNCJob"
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
-msgstr "El código G no tiene un código de unidades: G20 o G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
+msgstr ""
+"El código G no tiene un código G94 y no incluiremos el código en el cuadro "
+"de texto 'Anteponer al código GC'"
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr ""
 "Cancelado. El código personalizado de Toolchange está habilitado pero está "
 "vacío."
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr "El código G de Toolchange fue reemplazado por un código personalizado."
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr "El fichero o directorio no existe"
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr "Guardado en"
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr ""
 "El archivo de postprocesador usado debe tener su nombre: 'toolchange_custom'"
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr "No hay archivo de postprocesador."
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr "Editor de guiones"
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr "Editor de Documentos"
 
@@ -2815,11 +2819,11 @@ msgstr ""
 "tipográfico, por lo tanto, la aplicación convertirá el valor a negativo. "
 "Compruebe el código CNC resultante (Gcode, etc.)."
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr "El parámetro Cut Z es cero. No habrá corte, saltando archivo"
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2829,31 +2833,31 @@ msgstr ""
 "formato (x, y)\n"
 "pero ahora solo hay un valor, no dos. "
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr "Crear una lista de puntos para explorar ..."
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr "Iniciando el código G"
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr "Código G inicial para herramienta con diámetro"
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr "Coordenadas G91 no implementadas"
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr "El archivo Excellon cargado no tiene perforaciones"
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr "Generación de código G finalizada ..."
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2863,7 +2867,7 @@ msgstr ""
 "formato (x, y)\n"
 "pero ahora solo hay un valor, no dos."
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
@@ -2871,7 +2875,7 @@ msgstr ""
 "El parámetro Cut_Z es Ninguno o cero. Lo más probable es una mala "
 "combinación de otros parámetros."
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into "
 "material.\n"
@@ -2885,11 +2889,11 @@ msgstr ""
 "tipográfico, por lo tanto, la aplicación convertirá el valor a negativo. "
 "Verifique el código CNC resultante (Gcode, etc.)."
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr "El parámetro Travel Z des Ninguno o cero."
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel "
 "between cuts.\n"
@@ -2903,39 +2907,39 @@ msgstr ""
 "error tipográfico, por lo tanto, la aplicación convertirá el valor a "
 "positivo. Verifique el código CNC resultante (Gcode, etc.)."
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr ""
 "El parámetro Z Travel es cero. Esto es peligroso, saltando el archive %s"
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr "Indexación de la geometría antes de generar código G ..."
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr "Iniciando el código G ..."
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr "Generación de código G terminada"
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr "caminos trazados"
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr "Se esperaba una Geometría, se obtuvo"
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr ""
 "Intentando generar un trabajo de CNC desde un objeto de geometría sin "
 "solid_geometry."
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
@@ -2944,35 +2948,35 @@ msgstr ""
 "en current_geometry.\n"
 "Aumente el valor (en el módulo) e intente nuevamente."
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr " caminos trazados."
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr "No hay datos de herramientas en la geometría SolderPaste."
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr "Generación de código G de soldadura soldada terminada"
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr "caminos trazados."
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr "Analizando el archivo GCode. Número de líneas"
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr "Crear geometría a partir del archivo GCode analizado. "
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr "Coordenadas G91 no implementadas ..."
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr "Geometría unificadora de segmentos de geometría analizados"
 
@@ -16615,6 +16619,9 @@ msgid "No Geometry name in args. Provide a name and try again."
 msgstr ""
 "Sin nombre de geometría en args. Proporcione un nombre e intente nuevamente."
 
+#~ msgid "G-code does not have a units code: either G20 or G21"
+#~ msgstr "El código G no tiene un código de unidades: G20 o G21"
+
 #~ msgid "No shape selected. Select a shape to explode"
 #~ msgstr "Ninguna forma seleccionada. Selecciona una forma para explotar"
 
diff --git a/locale/fr/LC_MESSAGES/strings.mo b/locale/fr/LC_MESSAGES/strings.mo
index e995b8c3..d3ad03df 100644
Binary files a/locale/fr/LC_MESSAGES/strings.mo and b/locale/fr/LC_MESSAGES/strings.mo differ
diff --git a/locale/fr/LC_MESSAGES/strings.po b/locale/fr/LC_MESSAGES/strings.po
index 8ae3b608..515d369f 100644
--- a/locale/fr/LC_MESSAGES/strings.po
+++ b/locale/fr/LC_MESSAGES/strings.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:23+0200\n"
-"PO-Revision-Date: 2019-12-15 17:23+0200\n"
+"POT-Creation-Date: 2019-12-16 00:17+0200\n"
+"PO-Revision-Date: 2019-12-16 00:17+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -195,7 +195,7 @@ msgstr "Exportation des préférences FlatCAM annulée."
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418
 #: FlatCAMApp.py:10541 FlatCAMApp.py:10680 FlatCAMCommon.py:378
-#: FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1170,7 +1170,7 @@ msgstr "Ouvrir DXF annulé."
 msgid "Viewing the source code of the selected object."
 msgstr "Affichage du code source de l'objet sélectionné."
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr "Chargement..."
 
@@ -2654,11 +2654,11 @@ msgstr ""
 "y)\n"
 "mais maintenant il n'y a qu'une seule valeur, pas deux."
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr "<span style=\"color:green;\"><b>De base</b></span>"
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr "<span style=\"color:red;\"><b>Avancé</b></span>"
 
@@ -2682,51 +2682,55 @@ msgstr "Fichier de code machine enregistré dans"
 msgid "Loaded Machine Code into Code Editor"
 msgstr "Code machine chargé dans l'éditeur de code"
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr "Cet objet CNCJob ne peut pas être traité car il est"
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr "Objet CNCJob"
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
-msgstr "G-code n'a pas de code d'unités: G20 ou G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
+msgstr ""
+"Le code G n'a pas de code G94 et nous n'inclurons pas le code dans la zone "
+"de texte 'Prepend to GCode'"
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr "Annulé. Le code personnalisé Toolchange est activé mais vide."
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr "Toolchange G-code a été remplacé par un code personnalisé."
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr "Aucun fichier ou répertoire de ce nom"
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr "Enregistré dans"
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr ""
 "Le fichier de post-traitement utilisé doit avoir pour nom: "
 "'toolchange_custom'"
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr "Il n'y a pas de fichier de post-processeur."
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr "Éditeur de script"
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr "Éditeur de Document"
 
@@ -2813,11 +2817,11 @@ msgstr ""
 "s'agisse d'une faute de frappe; par conséquent, l'application convertira la "
 "valeur en valeur négative. Vérifiez le code CNC résultant (Gcode, etc.)."
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr "Le paramètre Cut Z est zéro. Il n'y aura pas de fichier coupé, sautant"
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2827,31 +2831,31 @@ msgstr ""
 "y)\n"
 "mais maintenant il n'y a qu'une seule valeur, pas deux. "
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr "Création d'une liste de points à explorer ..."
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr "Démarrer le GCode"
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr "Code G de départ pour outil avec diamètre"
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr "Coordonnées G91 non implémentées"
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr "Le fichier Excellon chargé n'a pas d'exercices"
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr "Fini la génération de code G ..."
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2861,7 +2865,7 @@ msgstr ""
 "y)\n"
 "mais maintenant il n'y a qu'une seule valeur, pas deux."
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
@@ -2869,7 +2873,7 @@ msgstr ""
 "Le paramètre Cut_Z est Aucun ou zéro. Très probablement une mauvaise "
 "combinaison d'autres paramètres."
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into "
 "material.\n"
@@ -2883,11 +2887,11 @@ msgstr ""
 "s'agisse d'une faute de frappe. Par conséquent, l'application convertira la "
 "valeur en valeur négative. Vérifiez le code CNC résultant (Gcode, etc.)."
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr "Le paramètre Voyage Z est Aucun ou zéro."
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel "
 "between cuts.\n"
@@ -2901,38 +2905,38 @@ msgstr ""
 "s'agisse d'une faute de frappe. Par conséquent, l'application convertira la "
 "valeur en valeur positive. Vérifiez le code CNC résultant (Gcode, etc.)."
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr "Le paramètre Z voyage est zéro. Ceci est dangereux, ignorer le fichier"
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr "Indexer la géométrie avant de générer le code G ..."
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr "Démarrer G-Code ..."
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr "Génération de code G terminée"
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr "chemins tracés"
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr "Attendait une géométrie, eu"
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr ""
 "Essayer de générer un travail CNC à partir d'un objet de géométrie sans "
 "solid_geometry."
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
@@ -2941,35 +2945,35 @@ msgstr ""
 "utilisée pour current_geometry.\n"
 "Augmentez la valeur (dans le module) et essayez à nouveau."
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr " chemins tracés."
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr "Il n'y a pas de données d'outil dans la géométrie SolderPaste."
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr "Génération de G-Code SolderPaste fini"
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr "chemins tracés."
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr "Analyse du fichier GCode. Nombre de lignes"
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr "Création d'une géométrie à partir du fichier GCode analysé. "
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr "Coordonnées G91 non implémentées ..."
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr "Unifier la géométrie à partir de segments de géométrie analysés"
 
@@ -16617,6 +16621,9 @@ msgid "No Geometry name in args. Provide a name and try again."
 msgstr ""
 "Aucun nom de géométrie dans les arguments. Indiquez un nom et réessayez."
 
+#~ msgid "G-code does not have a units code: either G20 or G21"
+#~ msgstr "G-code n'a pas de code d'unités: G20 ou G21"
+
 #~ msgid "No shape selected. Select a shape to explode"
 #~ msgstr "Aucune forme sélectionnée. Sélectionnez une forme à exploser"
 
diff --git a/locale/pt_BR/LC_MESSAGES/strings.mo b/locale/pt_BR/LC_MESSAGES/strings.mo
index 6c9bf499..e043913d 100644
Binary files a/locale/pt_BR/LC_MESSAGES/strings.mo and b/locale/pt_BR/LC_MESSAGES/strings.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/strings.po b/locale/pt_BR/LC_MESSAGES/strings.po
index c40d9712..a90ca4bc 100644
--- a/locale/pt_BR/LC_MESSAGES/strings.po
+++ b/locale/pt_BR/LC_MESSAGES/strings.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:23+0200\n"
-"PO-Revision-Date: 2019-12-15 17:23+0200\n"
+"POT-Creation-Date: 2019-12-16 00:17+0200\n"
+"PO-Revision-Date: 2019-12-16 00:18+0200\n"
 "Last-Translator: Carlos Stein <carlos.stein@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -191,7 +191,7 @@ msgstr "Exportação de preferências do FlatCAM cancelada."
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418
 #: FlatCAMApp.py:10541 FlatCAMApp.py:10680 FlatCAMCommon.py:378
-#: FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1159,7 +1159,7 @@ msgstr "Abrir DXF cancelado."
 msgid "Viewing the source code of the selected object."
 msgstr "Vendo o código fonte do objeto selecionado."
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr "Lendo..."
 
@@ -2636,11 +2636,11 @@ msgstr ""
 "formato (x, y).\n"
 "Agora está com apenas um valor, não dois."
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr "<span style=\"color:green;\"><b>Básico</b></span>"
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr "<span style=\"color:red;\"><b>Avançado</b></span>"
 
@@ -2664,54 +2664,58 @@ msgstr "Arquivo G-Code salvo em"
 msgid "Loaded Machine Code into Code Editor"
 msgstr "G-Code aberto no Editor de Códigos"
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr "Este objeto Trabalho CNC não pode ser processado porque é um"
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr "Objeto de Trabalho CNC"
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
-msgstr "O G-Code não possui um código de unidade: G20 ou G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
+msgstr ""
+"O código G não possui um código G94 e não o incluiremos na caixa de texto "
+"'Anexar ao GCode'"
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr ""
 "Cancelado. O código personalizado para Troca de Ferramentas está ativado, "
 "mas está vazio."
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr ""
 "O G-Code para Troca de Ferramentas foi substituído por um código "
 "personalizado."
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr "Nenhum arquivo ou diretório"
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr "Salvo em"
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr ""
 "O arquivo de pós-processamento deve ter em seu nome: 'toolchange_custom'"
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr "Não há arquivo de pós-processamento."
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr "Editor de Script"
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr "Editor de Documento"
 
@@ -2797,12 +2801,12 @@ msgstr ""
 "um erro de digitação, o aplicativo converterá o valor para negativo.\n"
 "Verifique o código CNC resultante (G-Code, etc.)."
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr ""
 "O parâmetro Profundidade de Corte é zero. Não haverá corte, ignorando arquivo"
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2812,31 +2816,31 @@ msgstr ""
 "formato (x, y).\n"
 "Agora existe apenas um valor, não dois. "
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr "Criando uma lista de pontos para furar..."
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr "Iniciando o G-Code"
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr "Iniciando o G-Code para ferramenta com diâmetro"
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr "Coordenadas G91 não implementadas"
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr "O arquivo Excellon carregado não tem furos"
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr "Geração de G-Code concluída..."
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2846,7 +2850,7 @@ msgstr ""
 "formato (x, y).\n"
 "Agora está com apenas um valor, não dois."
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
@@ -2854,7 +2858,7 @@ msgstr ""
 "Profundidade de Corte está vazio ou é zero. Provavelmente é uma combinação "
 "ruim de outros parâmetros."
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into "
 "material.\n"
@@ -2867,11 +2871,11 @@ msgstr ""
 "um erro de digitação, o aplicativo converterá o valor para negativo.\n"
 "Verifique o código CNC resultante (G-Code, etc.)."
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr "O parâmetro Altura de Deslocamento Z é Nulo ou zero."
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel "
 "between cuts.\n"
@@ -2885,39 +2889,39 @@ msgstr ""
 "positivo.\n"
 "Verifique o código CNC resultante (G-Code, etc.)."
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr ""
 "O parâmetro Altura de Deslocamento é zero. Isso é perigoso, ignorando arquivo"
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr "Indexando geometrias antes de gerar o G-Code..."
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr "Iniciando o G-Code..."
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr "Geração de G-Code concluída"
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr "caminho traçado"
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr "Esperando uma geometria, recebido"
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr ""
 "Tentando gerar um trabalho CNC a partir de um objeto Geometria sem "
 "solid_geometry."
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
@@ -2926,35 +2930,35 @@ msgstr ""
 "current_geometry.\n"
 "Aumente o valor (em módulo) e tente novamente."
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr " caminhos traçados."
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr "Não há dados de ferramenta na geometria de Pasta de Solda."
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr "Geração de G-Code para Pasta de Solda concluída"
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr "caminhos traçados."
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr "Analisando o arquivo G-Code. Número de linhas"
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr "Criando Geometria a partir do arquivo G-Code analisado. "
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr "Coordenadas G91 não implementadas..."
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr "Unificando Gometria a partir de segmentos de geometria analisados"
 
@@ -16401,6 +16405,9 @@ msgstr "Origem definida deslocando todos os objetos carregados com "
 msgid "No Geometry name in args. Provide a name and try again."
 msgstr "Nenhum nome de geometria nos argumentos. Altere e tente novamente."
 
+#~ msgid "G-code does not have a units code: either G20 or G21"
+#~ msgstr "O G-Code não possui um código de unidade: G20 ou G21"
+
 #~ msgid "No shape selected. Select a shape to explode"
 #~ msgstr "Nenhuma forma selecionada. Selecione uma forma para explodir"
 
diff --git a/locale/ro/LC_MESSAGES/strings.mo b/locale/ro/LC_MESSAGES/strings.mo
index aa0ad492..8a3a423d 100644
Binary files a/locale/ro/LC_MESSAGES/strings.mo and b/locale/ro/LC_MESSAGES/strings.mo differ
diff --git a/locale/ro/LC_MESSAGES/strings.po b/locale/ro/LC_MESSAGES/strings.po
index edeb16a1..82ccc757 100644
--- a/locale/ro/LC_MESSAGES/strings.po
+++ b/locale/ro/LC_MESSAGES/strings.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:23+0200\n"
-"PO-Revision-Date: 2019-12-15 17:23+0200\n"
+"POT-Creation-Date: 2019-12-16 00:18+0200\n"
+"PO-Revision-Date: 2019-12-16 00:19+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ro\n"
@@ -195,7 +195,7 @@ msgstr "Exportul preferințelor FlatCAM este anulat."
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418
 #: FlatCAMApp.py:10541 FlatCAMApp.py:10680 FlatCAMCommon.py:378
-#: FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1159,7 +1159,7 @@ msgstr "Incărcarea fișierului DXF a fost anulată."
 msgid "Viewing the source code of the selected object."
 msgstr "Vizualizarea codului sursă a obiectului selectat."
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr "Se incarcă..."
 
@@ -2628,21 +2628,21 @@ msgstr ""
 "in formatul (x, y) \n"
 "dar are o singură valoare in loc de două."
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr "<span style=\"color:green;\"><b>Baza</b></span>"
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr "<span style=\"color:red;\"><b>Avansat</b></span>"
 
 #: FlatCAMObj.py:6387
 msgid "Plotting..."
-msgstr "Se afișeaza..."
+msgstr "Se afișează..."
 
 #: FlatCAMObj.py:6410 FlatCAMObj.py:6415 flatcamTools/ToolSolderPaste.py:1509
 msgid "Export Machine Code ..."
-msgstr "Exporta CNC Cod Masina ..."
+msgstr "Exportă CNC Cod Masina ..."
 
 #: FlatCAMObj.py:6420 flatcamTools/ToolSolderPaste.py:1513
 msgid "Export Machine Code cancelled ..."
@@ -2654,54 +2654,58 @@ msgstr "Fişierul cu cod CNC este salvat in"
 
 #: FlatCAMObj.py:6496 flatcamTools/ToolCalibration.py:1083
 msgid "Loaded Machine Code into Code Editor"
-msgstr "S-a încărcat Codul Masina în Editorul Cod"
+msgstr "S-a încărcat Codul Maşină în Editorul Cod"
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr "Acest obiect CNCJob nu poate fi procesat deoarece este un"
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr "Obiect CNCJob"
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
-msgstr "G-code nu contine codul pt unitati: G20 sau G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
+msgstr ""
+"Codul G nu are un cod G94 și nu vom include codul din caseta de text „Adaugă "
+"la GCode”."
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr ""
 "Anulat. Codul G-Code din Macro-ul Schimbare unealtă este activat dar nu "
 "contine nimic."
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr "G-Code-ul pt schimbare unealtă a fost inlocuit cu un cod pesonalizat."
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr "Nu exista un aşa fişier sau director"
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr "Salvat in"
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr ""
 "Postprocesorul folosit trebuie să aibă in numele sau: 'toolchange_custom'"
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr "Nu exista nici-un fişier postprocesor."
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr "Editor Script"
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr "Editor Documente"
 
@@ -2787,13 +2791,13 @@ msgstr ""
 "Se presupune că este o eroare de tastare astfel ca aplicaţia va converti "
 "intr-o valoare negativă. Verifică codul masina (G-Code etc) rezultat."
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr ""
 "Parametrul >Z tăiere< este nul. Nu va fi nici-o tăiere prin urmare nu "
 "procesam fişierul"
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2803,31 +2807,31 @@ msgstr ""
 "in formatul (x, y) \n"
 "dar are o singură valoare in loc de doua. "
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr "Crearea unei liste de puncte pentru găurire ..."
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr "Începând G-Code"
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr "Pornirea codului G pentru scula cu diametrul"
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr "Coordonatele G91 nu au fost implementate"
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr "Fişierul Excellon incărcat nu are găuri"
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr "Generarea G-Code finalizata ..."
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2837,7 +2841,7 @@ msgstr ""
 "in formatul (x, y) \n"
 "dar are o singură valoare in loc de doua."
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
@@ -2845,7 +2849,7 @@ msgstr ""
 "Parametrul >Z tăiere< este None sau zero. Cel mai probabil o combinaţie "
 "nefericita de parametri."
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into "
 "material.\n"
@@ -2858,11 +2862,11 @@ msgstr ""
 "Se presupune că este o eroare de tastare astfel ca aplicaţia va converti "
 "intr-o valoare negativă. Verifică codul masina (G-Code etc) rezultat."
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr "Parametrul >Z deplasare< este None sau zero."
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel "
 "between cuts.\n"
@@ -2875,40 +2879,40 @@ msgstr ""
 "Se presupune că este o eroare de tastare astfel ca aplicaţia va converti "
 "intr-o valoare pozitivă. Verifică codul masina (G-Code etc) rezultat."
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr ""
 "Parametrul >Z deplasare< este zero. Aceasta este periculos, prin urmare nu "
 "se procesează fişierul"
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr "Geometria se indexeaza înainte de a genera G-Code..."
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr "Pornirea G-Code ..."
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr "Generarea G-Code terminată"
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr "căi trasate"
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr "Se astepta o Geometrie, am primit in schimb"
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr ""
 "Se încearcă generarea unui CNC Job dintr-un obiect Geometrie fără atributul "
 "solid_geometry."
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
@@ -2917,35 +2921,35 @@ msgstr ""
 "current_geometry \n"
 "Mareste valoarea absoluta și încearcă din nou."
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr " căi trasate."
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr "Nu există date cu privire la unealtă in Geometria SolderPaste."
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr "Generarea G-Code SolderPaste s-a terminat"
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr "căi trasate."
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr "Analizând fișierul GCode. Numărul de linii"
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr "Crează un obiect tip Geometrie din fisierul GCode analizat. "
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr "Coordonatele G91 nu au fost implementate ..."
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr "Se unifica Geometria din segmentele de Geometrie parsate"
 
@@ -16623,6 +16627,9 @@ msgstr ""
 "Nici-un nume de Geometrie in argumente. Furnizați un nume și încercați din "
 "nou."
 
+#~ msgid "G-code does not have a units code: either G20 or G21"
+#~ msgstr "G-code nu contine codul pt unitati: G20 sau G21"
+
 #~ msgid "No shape selected. Select a shape to explode"
 #~ msgstr "Nicio formă selectată. Selectați o formă pentru a o exploda"
 
diff --git a/locale/ru/LC_MESSAGES/strings.mo b/locale/ru/LC_MESSAGES/strings.mo
index 1d1b3ee9..0cab1c49 100644
Binary files a/locale/ru/LC_MESSAGES/strings.mo and b/locale/ru/LC_MESSAGES/strings.mo differ
diff --git a/locale/ru/LC_MESSAGES/strings.po b/locale/ru/LC_MESSAGES/strings.po
index d47f6d6c..127bad04 100644
--- a/locale/ru/LC_MESSAGES/strings.po
+++ b/locale/ru/LC_MESSAGES/strings.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:23+0200\n"
+"POT-Creation-Date: 2019-12-16 00:20+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andrey Kultyapov <camellan@yandex.ru>\n"
 "Language-Team: \n"
@@ -190,7 +190,7 @@ msgstr "Экспорт настроек FlatCAM отменён."
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418
 #: FlatCAMApp.py:10541 FlatCAMApp.py:10680 FlatCAMCommon.py:378
-#: FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1143,7 +1143,7 @@ msgstr "Открытие DXF отменено."
 msgid "Viewing the source code of the selected object."
 msgstr "Просмотр исходного кода выбранного объекта."
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr "Загрузка..."
 
@@ -2618,11 +2618,11 @@ msgstr ""
 "y)\n"
 "но теперь есть только одно значение, а не два."
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr "<span style=\"color:green;\"><b>Базовый</b></span>"
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr "<span style=\"color:red;\"><b>Расширенный</b></span>"
 
@@ -2646,49 +2646,53 @@ msgstr "Файл Machine Code сохранён в"
 msgid "Loaded Machine Code into Code Editor"
 msgstr "Машинный код загружен в редактор кода"
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr "CNCJob объект не может быть обработан, так как"
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr "CNCJob object"
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
-msgstr "G-code не имеет кода единиц измерения: G20 или G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the "
+"'Prepend to GCode' text box"
+msgstr ""
+"G-код не имеет кода G94, и мы не будем включать этот код в текстовое поле "
+"«Готовьтесь к G-код»"
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr "Отмена. Пользовательский код смены инструмента включен, но он пуст."
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr "G-code смены инструмента был заменен на пользовательский код."
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr "Нет такого файла или каталога"
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr "Сохранено в"
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid ""
 "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr "Используемый файл постпроцессора должен иметь имя: 'toolchange_custom'"
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr "Это не файл постпроцессора."
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr "Редактор сценариев"
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr "Редактор Document"
 
@@ -2775,12 +2779,12 @@ msgstr ""
 "предполагая, что это опечатка, приложение преобразует значение в "
 "отрицательное. Проверьте полученный CNC code (Gcode и т. д.)."
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr ""
 "Параметр \"Глубина резания\" равен нулю. Обрезки не будет , пропускается файл"
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2790,31 +2794,31 @@ msgstr ""
 "y)\n"
 "но теперь есть только одно значение, а не два. "
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr "Создание списка точек для сверления ..."
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr "Открытие G-Code"
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr "Запуск G-кода для инструмента с диаметром"
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr "Координаты G91 не реализованы"
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr "Загруженный файл Excellon не имеет отверстий"
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr "Создание G-кода завершено..."
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, "
 "y) \n"
@@ -2824,7 +2828,7 @@ msgstr ""
 "y)\n"
 "но теперь есть только одно значение, а не два."
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid ""
 "Cut_Z parameter is None or zero. Most likely a bad combinations of other "
 "parameters."
@@ -2832,7 +2836,7 @@ msgstr ""
 "Параметр \"Глубина резания\" равен None или пуст. Скорее всего неудачное "
 "сочетание других параметров."
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into "
 "material.\n"
@@ -2846,11 +2850,11 @@ msgstr ""
 "предполагая, что это опечатка, приложение преобразует значение в "
 "отрицательное. Проверьте полученный CNC code (Gcode и т. д.)."
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr "Параметр \"Отвод по Z\" равен None или пуст."
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel "
 "between cuts.\n"
@@ -2864,36 +2868,36 @@ msgstr ""
 "что это опечатка, приложение преобразует значение в положительное. Проверьте "
 "полученный CNC code (Gcode и т. д.)."
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr "Параметр \"Отвод по Z\" равен нулю. Это опасно, файл пропускается"
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr "Индексация геометрии перед созданием G-Code..."
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr "Открытие G-Code..."
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr "Создание G-кода завершено"
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr "путей проложено"
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr "Ожидалась Geometry, получили"
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid ""
 "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr "Попытка создать CNC Job из объекта Geometry без solid_geometry."
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
@@ -2901,35 +2905,35 @@ msgstr ""
 "Значение смещения инструмента слишком отрицательно для current_geometry.\n"
 "Увеличте значение (в модуле) и повторите попытку."
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr " путей проложено."
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr "В геометрии SolderPaste нет данных инструмента."
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr "Закончено создание G-кода паяльной пасты"
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr "путей проложено."
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr "Разбор файла GCode. Количество строк"
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr "Создание геометрии из проанализированного файла GCode. "
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr "Координаты G91 не реализованы ..."
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr "Объединение геометрии из разбираемых сегментов геометрии"
 
@@ -16474,6 +16478,9 @@ msgstr ""
 msgid "No Geometry name in args. Provide a name and try again."
 msgstr "Нет имени геометрии в аргументах. Укажите имя и попробуйте снова."
 
+#~ msgid "G-code does not have a units code: either G20 or G21"
+#~ msgstr "G-code не имеет кода единиц измерения: G20 или G21"
+
 #~ msgid "No shape selected. Select a shape to explode"
 #~ msgstr "Фигура не выбрана. Выберите фигуру для разделения"
 
diff --git a/locale_template/strings.pot b/locale_template/strings.pot
index 369a1290..055bbb3d 100644
--- a/locale_template/strings.pot
+++ b/locale_template/strings.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-12-15 17:22+0200\n"
+"POT-Creation-Date: 2019-12-16 00:16+0200\n"
 "PO-Revision-Date: 2019-03-25 15:08+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -176,7 +176,7 @@ msgid "FlatCAM preferences export cancelled."
 msgstr ""
 
 #: FlatCAMApp.py:3926 FlatCAMApp.py:10370 FlatCAMApp.py:10418 FlatCAMApp.py:10541
-#: FlatCAMApp.py:10680 FlatCAMCommon.py:378 FlatCAMCommon.py:1094 FlatCAMObj.py:6753
+#: FlatCAMApp.py:10680 FlatCAMCommon.py:378 FlatCAMCommon.py:1094 FlatCAMObj.py:6822
 #: flatcamEditors/FlatCAMTextEditor.py:228 flatcamTools/ToolFilm.py:1019
 #: flatcamTools/ToolFilm.py:1195 flatcamTools/ToolSolderPaste.py:1544
 msgid ""
@@ -1037,7 +1037,7 @@ msgstr ""
 msgid "Viewing the source code of the selected object."
 msgstr ""
 
-#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7075
+#: FlatCAMApp.py:9950 FlatCAMObj.py:6445 FlatCAMObj.py:7144
 msgid "Loading..."
 msgstr ""
 
@@ -2327,11 +2327,11 @@ msgid ""
 "but now there is only one value, not two."
 msgstr ""
 
-#: FlatCAMObj.py:6338 FlatCAMObj.py:7025 FlatCAMObj.py:7221
+#: FlatCAMObj.py:6338 FlatCAMObj.py:7094 FlatCAMObj.py:7290
 msgid "<span style=\"color:green;\"><b>Basic</b></span>"
 msgstr ""
 
-#: FlatCAMObj.py:6344 FlatCAMObj.py:7029 FlatCAMObj.py:7225
+#: FlatCAMObj.py:6344 FlatCAMObj.py:7098 FlatCAMObj.py:7294
 msgid "<span style=\"color:red;\"><b>Advanced</b></span>"
 msgstr ""
 
@@ -2355,48 +2355,50 @@ msgstr ""
 msgid "Loaded Machine Code into Code Editor"
 msgstr ""
 
-#: FlatCAMObj.py:6632
+#: FlatCAMObj.py:6634
 msgid "This CNCJob object can't be processed because it is a"
 msgstr ""
 
-#: FlatCAMObj.py:6634
+#: FlatCAMObj.py:6636
 msgid "CNCJob object"
 msgstr ""
 
-#: FlatCAMObj.py:6713
-msgid "G-code does not have a units code: either G20 or G21"
+#: FlatCAMObj.py:6785
+msgid ""
+"G-code does not have a G94 code and we will not include the code in the 'Prepend to "
+"GCode' text box"
 msgstr ""
 
-#: FlatCAMObj.py:6727
+#: FlatCAMObj.py:6796
 msgid "Cancelled. The Toolchange Custom code is enabled but it's empty."
 msgstr ""
 
-#: FlatCAMObj.py:6732
+#: FlatCAMObj.py:6801
 msgid "Toolchange G-code was replaced by a custom code."
 msgstr ""
 
-#: FlatCAMObj.py:6749 flatcamEditors/FlatCAMTextEditor.py:224
+#: FlatCAMObj.py:6818 flatcamEditors/FlatCAMTextEditor.py:224
 #: flatcamTools/ToolSolderPaste.py:1540
 msgid "No such file or directory"
 msgstr ""
 
-#: FlatCAMObj.py:6763 flatcamEditors/FlatCAMTextEditor.py:236
+#: FlatCAMObj.py:6832 flatcamEditors/FlatCAMTextEditor.py:236
 msgid "Saved to"
 msgstr ""
 
-#: FlatCAMObj.py:6773 FlatCAMObj.py:6783
+#: FlatCAMObj.py:6842 FlatCAMObj.py:6852
 msgid "The used preprocessor file has to have in it's name: 'toolchange_custom'"
 msgstr ""
 
-#: FlatCAMObj.py:6787
+#: FlatCAMObj.py:6856
 msgid "There is no preprocessor file."
 msgstr ""
 
-#: FlatCAMObj.py:7044
+#: FlatCAMObj.py:7113
 msgid "Script Editor"
 msgstr ""
 
-#: FlatCAMObj.py:7325
+#: FlatCAMObj.py:7394
 msgid "Document Editor"
 msgstr ""
 
@@ -2476,62 +2478,62 @@ msgid ""
 "app will convert the value to negative. Check the resulting CNC code (Gcode etc)."
 msgstr ""
 
-#: camlib.py:2376 camlib.py:3089 camlib.py:3436
+#: camlib.py:2376 camlib.py:3095 camlib.py:3442
 msgid "The Cut Z parameter is zero. There will be no cut, skipping file"
 msgstr ""
 
-#: camlib.py:2389 camlib.py:3409
+#: camlib.py:2389 camlib.py:3415
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, y) \n"
 "but now there is only one value, not two. "
 msgstr ""
 
-#: camlib.py:2458
+#: camlib.py:2464
 msgid "Creating a list of points to drill..."
 msgstr ""
 
-#: camlib.py:2540
+#: camlib.py:2546
 msgid "Starting G-Code"
 msgstr ""
 
-#: camlib.py:2635 camlib.py:2778 camlib.py:2880 camlib.py:3200 camlib.py:3547
+#: camlib.py:2641 camlib.py:2784 camlib.py:2886 camlib.py:3206 camlib.py:3553
 msgid "Starting G-Code for tool with diameter"
 msgstr ""
 
-#: camlib.py:2691 camlib.py:2834 camlib.py:2937
+#: camlib.py:2697 camlib.py:2840 camlib.py:2943
 msgid "G91 coordinates not implemented"
 msgstr ""
 
-#: camlib.py:2697 camlib.py:2841 camlib.py:2943
+#: camlib.py:2703 camlib.py:2847 camlib.py:2949
 msgid "The loaded Excellon file has no drills"
 msgstr ""
 
-#: camlib.py:2966
+#: camlib.py:2972
 msgid "Finished G-Code generation..."
 msgstr ""
 
-#: camlib.py:3061
+#: camlib.py:3067
 msgid ""
 "The Toolchange X,Y field in Edit -> Preferences has to be in the format (x, y) \n"
 "but now there is only one value, not two."
 msgstr ""
 
-#: camlib.py:3074 camlib.py:3422
+#: camlib.py:3080 camlib.py:3428
 msgid "Cut_Z parameter is None or zero. Most likely a bad combinations of other parameters."
 msgstr ""
 
-#: camlib.py:3081 camlib.py:3428
+#: camlib.py:3087 camlib.py:3434
 msgid ""
 "The Cut Z parameter has positive value. It is the depth value to cut into material.\n"
 "The Cut Z parameter needs to have a negative value, assuming it is a typo therefore the "
 "app will convert the value to negative.Check the resulting CNC code (Gcode etc)."
 msgstr ""
 
-#: camlib.py:3094 camlib.py:3442
+#: camlib.py:3100 camlib.py:3448
 msgid "Travel Z parameter is None or zero."
 msgstr ""
 
-#: camlib.py:3099 camlib.py:3447
+#: camlib.py:3105 camlib.py:3453
 msgid ""
 "The Travel Z parameter has negative value. It is the height value to travel between "
 "cuts.\n"
@@ -2539,69 +2541,69 @@ msgid ""
 "the app will convert the value to positive.Check the resulting CNC code (Gcode etc)."
 msgstr ""
 
-#: camlib.py:3107 camlib.py:3455
+#: camlib.py:3113 camlib.py:3461
 msgid "The Z Travel parameter is zero. This is dangerous, skipping file"
 msgstr ""
 
-#: camlib.py:3126 camlib.py:3474
+#: camlib.py:3132 camlib.py:3480
 msgid "Indexing geometry before generating G-Code..."
 msgstr ""
 
-#: camlib.py:3187 camlib.py:3536
+#: camlib.py:3193 camlib.py:3542
 msgid "Starting G-Code..."
 msgstr ""
 
-#: camlib.py:3270 camlib.py:3618
+#: camlib.py:3276 camlib.py:3624
 msgid "Finished G-Code generation"
 msgstr ""
 
-#: camlib.py:3272
+#: camlib.py:3278
 msgid "paths traced"
 msgstr ""
 
-#: camlib.py:3309
+#: camlib.py:3315
 msgid "Expected a Geometry, got"
 msgstr ""
 
-#: camlib.py:3316
+#: camlib.py:3322
 msgid "Trying to generate a CNC Job from a Geometry object without solid_geometry."
 msgstr ""
 
-#: camlib.py:3356
+#: camlib.py:3362
 msgid ""
 "The Tool Offset value is too negative to use for the current_geometry.\n"
 "Raise the value (in module) and try again."
 msgstr ""
 
-#: camlib.py:3618
+#: camlib.py:3624
 msgid " paths traced."
 msgstr ""
 
-#: camlib.py:3646
+#: camlib.py:3652
 msgid "There is no tool data in the SolderPaste geometry."
 msgstr ""
 
-#: camlib.py:3733
+#: camlib.py:3739
 msgid "Finished SolderPste G-Code generation"
 msgstr ""
 
-#: camlib.py:3735
+#: camlib.py:3741
 msgid "paths traced."
 msgstr ""
 
-#: camlib.py:3991
+#: camlib.py:3997
 msgid "Parsing GCode file. Number of lines"
 msgstr ""
 
-#: camlib.py:4098
+#: camlib.py:4104
 msgid "Creating Geometry from the parsed GCode file. "
 msgstr ""
 
-#: camlib.py:4234 camlib.py:4518 camlib.py:4621 camlib.py:4690
+#: camlib.py:4240 camlib.py:4524 camlib.py:4627 camlib.py:4696
 msgid "G91 coordinates not implemented ..."
 msgstr ""
 
-#: camlib.py:4365
+#: camlib.py:4371
 msgid "Unifying Geometry from parsed Geometry segments"
 msgstr ""