diff --git a/ugs-core/src/resources/MessagesBundle_af_ZA.properties b/ugs-core/src/resources/MessagesBundle_af_ZA.properties
index 01854d0fb..c52d14db5 100644
--- a/ugs-core/src/resources/MessagesBundle_af_ZA.properties
+++ b/ugs-core/src/resources/MessagesBundle_af_ZA.properties
@@ -2,7 +2,6 @@ title = Universele G-kode Stuurder
 version = Weergawe
 error = Probleem
 success = Sukses
-verbose = verbose
 close = Maak toe
 save = Spaar
 open = Maak oop
@@ -27,7 +26,6 @@ mainWindow.helpKeyZ = Z\\\: Page Up/Down; Sleutels Page Up/Down; Numeriese eilan
 mainWindow.helpKeyPlusMinus = Vermeerder/Verminder Stappe\\\: Sleutels +/-
 mainWindow.helpKeyDivMul = Verander Stappe\\\: Sleutels DEEL DEUR/MAAL
 mainWindow.helpKeyZero = Herstel Zero\\\: Sleutels Insert; Numeriese eiland \\\: 0
-mainWindow.status.alarm = Alarm
 mainWindow.status.hold = Hou
 mainWindow.status.queue = Tou
 mainWindow.status.run = Hardloop
@@ -65,7 +63,6 @@ mainWindow.swing.fileLabel = Lu00EAer
 mainWindow.swing.firmwareLabel = Fermware\\\:
 mainWindow.swing.firmwareSettingsMenu = Fermware Stellings
 mainWindow.swing.grblConnectionSettingsMenuItem = Stuurder Stellings
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
 mainWindow.swing.settingsMenu = Stellings
 mainWindow.swing.statusPanel = Masjien status
 mainWindow.swing.bottomTabbedPane.console = Konsole
diff --git a/ugs-core/src/resources/MessagesBundle_ca_ES.properties b/ugs-core/src/resources/MessagesBundle_ca_ES.properties
index 923467000..33ef0d65a 100644
--- a/ugs-core/src/resources/MessagesBundle_ca_ES.properties
+++ b/ugs-core/src/resources/MessagesBundle_ca_ES.properties
@@ -1,6 +1,4 @@
-title = Universal Gcode Sender
 version = Versió
-error = Error
 success = Èxit
 verbose = Detallat
 close = Tanca
@@ -14,7 +12,6 @@ save.close = Desa i tanca
 unknown = Desconegut
 macroPanel.button = Executa
 macroPanel.name = Nom de la macro
-macroPanel.text = GCode
 macroPanel.description = Descripció de la macro
 mainWindow.helpDialog = Ajuda per al control de la màquina
 mainWindow.resetZero = Restableix l'orígen\: estableix les coordenades actuals com a zero sense moure la màquina.
@@ -63,13 +60,11 @@ mainWindow.swing.connectionPanel = Connexió
 mainWindow.swing.controlContextTabbedPane.commands = Ordres
 mainWindow.swing.controlContextTabbedPane.fileMode = Mode de fitxer
 mainWindow.swing.controlContextTabbedPane.machineControl = Control de la màquina
-mainWindow.swing.controlContextTabbedPane.macros = Macros
 mainWindow.swing.durationLabel = Durada\:
 mainWindow.swing.fileLabel = Fitxer
 mainWindow.swing.firmwareLabel = Microprogramari\:
 mainWindow.swing.firmwareSettingsMenu = Paràmetres del microprogramari
 mainWindow.swing.grblConnectionSettingsMenuItem = Paràmetres de l'emissor
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
 mainWindow.swing.keyboardMovementPanel = Salta
 mainWindow.swing.settingsMenu = Preferències
 mainWindow.swing.statusPanel = Estat de la màquina
@@ -79,7 +74,6 @@ mainWindow.swing.latestCommentLabel = Últim comentari\:
 mainWindow.swing.machinePosition = Posició de la màquina\:
 mainWindow.swing.opencloseButton = Obre
 mainWindow.swing.pauseButton = Pausa
-mainWindow.swing.portLabel = Port\:
 mainWindow.swing.remainingRowsLabel = Línies restants\:
 mainWindow.swing.remainingTimeLabel = Temps restant estimat\:
 mainWindow.swing.resetCoordinatesButton = Restableix el zero
@@ -162,12 +156,10 @@ settings.log.saving = S'està desant la configuració.
 settings.log.error = No es pot carregar la configuració, s'utilitzen valors predeterminats.
 settings.log.saveerror = No es pot desar la configuració.
 visualizer.title = Visualitzador de G-code
-VisualizerCanvas.dimensions = Dimensions
 VisualizerCanvas.height = alçada
 VisualizerCanvas.width = amplada
 platform.menu.jog.size = Mida del pas
 platform.menu.actions = Accions
-platform.menu.macros = Macros
 platform.menu.machine = Màquina
 incomplete.localization = Universal Gcode Sender no està totalment traduït per a aquest idioma.\nVisiteu https\://translate.universalgcodesender.com per veure com podeu ajudar.
 mainWindow.swing.softReset = Reinici
diff --git a/ugs-core/src/resources/MessagesBundle_cs_CZ.properties b/ugs-core/src/resources/MessagesBundle_cs_CZ.properties
index fd940ad13..4c1ccce82 100644
--- a/ugs-core/src/resources/MessagesBundle_cs_CZ.properties
+++ b/ugs-core/src/resources/MessagesBundle_cs_CZ.properties
@@ -1,4 +1,3 @@
-title = Universal Gcode Sender
 version = Verze
 error = Chyba
 success = Úspěch
@@ -38,7 +37,6 @@ mainWindow.helpKeyZ = Z\: Stránka (Page) nahoru/dolů; klávesnice (Page) nahor
 mainWindow.helpKeyPlusMinus = změna kroků\: klávesnice +/-
 mainWindow.helpKeyDivMul = Změní kroky\: klávesnice DIVIDE/MULTIPLY
 mainWindow.helpKeyZero = Resetovat nulové polohy\: klávesa Insert; numerická klávesa\: 0
-mainWindow.status.alarm = Alarm
 mainWindow.status.hold = Pozastavit
 mainWindow.status.queue = Řada
 mainWindow.status.run = Průběh
@@ -59,7 +57,6 @@ mainWindow.error.showTableActive = Pokud jsou příkazy aktivní, nelze povolit
 mainWindow.error.rxtx = chyba připojení
 mainWindow.error.rxtxMac2 = adresář s názvem %s s následujícími příkazy
 mainWindow.ui.pauseButton = Pauza
-mainWindow.swing.portLabel = Port\:
 mainWindow.ui.resumeButton = Obnovit
 mainWindow.ui.jobComplete = Úloha dokončena po
 mainWindow.swing.activeStateLabel = Aktivní Stav\:
@@ -78,8 +75,6 @@ mainWindow.swing.fileLabel = Soubor
 mainWindow.swing.firmwareLabel = Firmware
 mainWindow.swing.firmwareSettingsMenu = Nastavení firmware
 mainWindow.swing.grblConnectionSettingsMenuItem = Nastavení odesílatele
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.keyboardMovementPanel = Jog
 mainWindow.swing.settingsMenu = Nastavení
 mainWindow.swing.statusPanel = Stav stroje
 mainWindow.swing.bottomTabbedPane.console = Konzola
@@ -91,8 +86,10 @@ mainWindow.swing.pauseButton = Pauza
 mainWindow.swing.remainingRowsLabel = Zbývající řádky\:
 mainWindow.swing.remainingTimeLabel = Předpokládaný zbývající čas\:
 mainWindow.swing.resetCoordinatesButton = Resetovat nulové polohy
+action.resetXCoordinatesButton = Vynulovat osu X
+action.resetYCoordinatesButton = Vynulovat osu Y
+action.resetZCoordinatesButton = Vynulovat osu Z
 mainWindow.swing.returnToZeroButton = Vrátit do nulové polohy
-mainWindow.swing.homeMachine = Home Machine
 mainWindow.swing.rowsLabel = Řádky v souboru\:
 mainWindow.swing.scrollWindowCheckBox = Posuň výstupní okno
 mainWindow.swing.sendButton = Poslat
@@ -103,7 +100,6 @@ mainWindow.swing.softResetMachineControl = měkký restart
 mainWindow.swing.stepSizeLabel = Velikost kroku XY\:
 mainWindow.swing.visualizeButton = Vizualizovat
 mainWindow.swing.workPositionLabel = Pracovní pozice\:
-mainWindow.swing.macroInstructions = <html> Každé pole může obsahovat řadu příkazů G-Kód oddělených znakem '';''. <br /> Chcete-li příkaz provést, klikněte na tlačítko vlevo od textu. <br /> <br /> Interaktivní substituce lze provádět with\: <br /> <ul> <li> {machine_x} - Umístění stroje X </li> <li> {machine_y} - Umístění stroje Y </li> <li> {machine_z} - Umístění stroje Z </li> <li> {work_x} -  Pracovní umístění X </li> <li> {work_y} - Pracovní umístění Y </li> <li> {work_z} - Pracovní umístění Z </li> < li> {prompt | name} - Vyzvěte uživatele k zadání hodnoty s názvem ''name''. </li> </html>
 mainWindow.swing.inchRadioButton = Palce
 mainWindow.swing.mmRadioButton = Milimetry
 gcodeTable.command = Příkaz
@@ -124,7 +120,6 @@ firmware.settings.importSettingsTitle = Import nastavení
 firmware.settings.importSettingsName = Jméno
 firmware.settings.importSettingsDate = Datum
 firmware.settings.importSettingsCreatedBy = Vytvořeno
-firmware.settings.importSettingsFirmware = Firmware
 firmware.tinyg.setting.short.description.am = Režim osy
 firmware.tinyg.setting.short.description.vm = Maximální rychlost
 firmware.tinyg.setting.short.description.fr = Maximální rychlost posuvu
@@ -153,12 +148,6 @@ firmware.tinyg.group.description.z = 0sa Z
 firmware.tinyg.group.description.a = Osa A
 firmware.tinyg.group.description.b = Osa B
 firmware.tinyg.group.description.c = Osa C
-firmware.tinyg.group.description.1 = Motor 1
-firmware.tinyg.group.description.2 = Motor 2
-firmware.tinyg.group.description.3 = Motor 3
-firmware.tinyg.group.description.4 = Motor 4
-firmware.tinyg.group.description.5 = Motor 5
-firmware.tinyg.group.description.6 = Motor 6
 sender.header = Nastavení odesílatele
 sender.speed.override = Povolit přepis rychlosti
 sender.speed.percent = Přepis rychlosti procentuálně
@@ -211,15 +200,6 @@ controller.log.version = Grbl verze
 controller.log.realtime = Režim v reálném čase
 controller.log.notconnected = Nepřipojeno
 controller.log.error.reported = Došlo k chybě
-jogging.xMinus = Jog\: X-
-jogging.xPlus = Jog\: X+
-jogging.yMinus = Jog\: Y-
-jogging.zMinus = Jog\: Z-
-jogging.zPlus = Jog\: Z+
-jogging.xPlus.yMinus = Jog\: X+ Y-
-jogging.xPlus.yPlus = Jog\: X+ Y+
-jogging.xMinus.yPlus = Jog\: X- Y+
-jogging.xMinus.yMinus = Jog\: X- Y-
 connection.exception.inuse = Tento port je již používán jiným procesem.
 settings.log.location = Nastavení umístění souboru
 settings.log.loading = Načítání nastavení.
@@ -230,15 +210,11 @@ visualizer.title = Vizualizér G-kódu
 VisualizerCanvas.dimensions = Rozměry
 VisualizerCanvas.height = výška
 VisualizerCanvas.width = šířka
-platform.menu.jog = Jog
 platform.menu.jog.size = Velikost kroku
 platform.menu.actions = Akce
 platform.menu.macros = Makra
 platform.menu.machine = Stroj
 platform.actions.homing.disabled.tooltip = V nastavení firmwaru musí být povolen homing
-action.resetXCoordinatesButton = Vynulovat osu X
-action.resetYCoordinatesButton = Vynulovat osu Y
-action.resetZCoordinatesButton = Vynulovat osu Z
 incomplete.localization = Universal Gcode Sender není pro tento jazyk plně lokalizován.\nNavštivte prosím https\://translate.universalgcodesender.com a zjistěte, jak můžete pomoci.
 mainWindow.swing.softReset = měkký restart
 mainWindow.swing.resetX = Resetování osy X
@@ -258,7 +234,6 @@ jogging.decrease.feed = Jog\: snížení rychlosti posuvu
 jogging.multiply.feed = Jog\: Násobení posuvu o 10
 jogging.divide.feed = Jog\: Rozdělení rychlosti posuvu 10-ti
 jogging.units.inch = Jog\: Palce
-jogging.units.mm = Jog\: MM
 jogging.units.toggle = Jog\: Přepnout jednotky
 grbl.exception.Alarm = Když je GRBL ve stavu Alarm, tok dat je zakázán.
 grbl.exception.cancelReset = Časový limit čekající na GRBL na nečinnost během zrušení, zrušení neúplné.
@@ -274,7 +249,6 @@ platform.window.workflow = Pomocník pracovního postupu
 platform.window.workflow.tooltip = Pomáhá spouštět úlohy obsahující více souborů.
 platform.window.filebrowser = Prohlížeč souborů
 platform.window.filebrowser.tooltip = Načtěte soubor, se kterým chcete pracovat.
-platform.window.jogcontrol = Jog Controller
 platform.window.jogcontrol.tooltip = Ruční ovládání umístění stroje.
 platform.window.macros = Makra
 platform.window.macros.tooltip = Zde lze použít makra vytvořená v předvolbách.
@@ -288,8 +262,8 @@ platform.window.visualizer = Vizualizér
 platform.window.visualizer.tooltip = 3D pohled na aktuální operaci.
 platform.visualizer.color.background = Barva pozadí
 platform.visualizer.color.tool = Barva nástroje
-platform.visualizer.color.linear = Barva lineárního pohybu (G1)
 platform.visualizer.color.highlight = Editor barvy zvýraznění řádku
+platform.visualizer.color.linear = Barva lineárního pohybu (G1)
 platform.visualizer.color.rapid = Barva rychlého pohybu (G0)
 platform.visualizer.color.arc = Barva pohybu oblouku (G2 / G3)
 platform.visualizer.color.plunge = Barva pro pohyb dolů/ nahoru
@@ -332,7 +306,6 @@ M30Processor = Odstraňovač M30
 PatternRemover = Odstraňovač pravidelných výrazů
 WhitespaceProcessor = Odstraňovač mezer
 controller.exception.smoothie.booting = Smoothie nedokončil bootování.
-mainWindow.swing.pendant = Pendant
 platform.visualizer.popup.coordinatesMenu = Souřadnice\: X \= %s, Y \= %s
 platform.visualizer.popup.submenu.jogToHere = Jog-uj sem
 platform.visualizer.popup.submenu.jogToHereHint = Přesune hlavu do vybrané polohy X / Y. Nezmění výšku Z
@@ -349,10 +322,6 @@ toolbar.icon.large = Velké ikony
 sender.help.verbose.console = Zobrazit další informace v konzole ovladače.
 platform.menu.open = Otevřít G-kód ...
 platform.menu.edit = Upravit G-kód
-mainWindow.swing.reset = Reset
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
 machineStatus.pin.probe = Měřící sonda
 machineStatus.pin.door = Dveře
 machineStatus.pin.hold = Podržet
@@ -411,7 +380,6 @@ autoleveler.panel.resolution = Rozlišení
 autoleveler.panel.use-file = Použít načtený soubor
 autoleveler.panel.scan-surface = Naskenuj plochu
 autoleveler.panel.apply = Aplikuj do G-kódu
-autoleveler.panel.view-data = Náhled dat
 autoleveler.panel.visible = Viditelné automatické vyrovnávání
 autoleveler.option.z-zero = Výška Z naskenované plochy v G-kódu
 autoleveler.option.arc-segment-length = Délka segmentu oblouku (mm)
@@ -430,11 +398,7 @@ probe.find-rate = Rychlá rychlost hledání
 probe.measure-rate = Pomalá rychlost hledání
 probe.x-distance = Posun měřící sondy X
 probe.y-distance = Posun měřící sondy Y
-probe.z-distance = Posun měřící sondy Z
-probe.retract-height = výška retrakce
 probe.retract-amount = Rozsah retrakce
-probe.measure.outside-corner = Změřte venkovní roh
-probe.measure.inside-corner = Změřte vnitřní roh
 probe.hole-diameter = Približný průmer díry
 probe.hole-center-hint = Přesuňte sondu do přibližného středu
 probe.visualizer.corner-preview = Náhled rohového měření sondy
@@ -455,13 +419,11 @@ platform.plugin.dowel-module.x = Počet X
 platform.plugin.dowel-module.y = Počet Y
 platform.plugin.dowel-module.diameter = Průměr
 platform.plugin.dowel-module.length = Délka
-platform.plugin.setupwizard.port = Port\:
 platform.plugin.setupwizard.port-rate = Hodnota portu\:
 platform.plugin.setupwizard.connect = Připoj
 platform.plugin.setupwizard.unknown-version = Neznámá Verze
 platform.plugin.setupwizard.reset-to-zero = Resetovat do nulové polohy
 platform.plugin.setupwizard.move = Pohyb
-platform.plugin.setupwizard.home = Home
 platform.plugin.setupwizard.measure = Změř
 platform.plugin.setupwizard.calibrate = Kalibruj
 platform.plugin.setupwizard.update = Aktualizuj
@@ -473,7 +435,6 @@ platform.plugin.setupwizard.connection.connecting = Spojování...
 platform.plugin.setupwizard.connection.connected-to = Připojeno k
 platform.plugin.setupwizard.import-settings.title = Import nastavení
 platform.plugin.setupwizard.import-settings.intro = Pokud Vaše zařízení přišlo s konfiguračním souborem nebo pokud jste dříve vytvořili zálohu nastavení, můžete je načíst zde. Jinak pokračujte klepnutím na tlačítko Další.
-platform.plugin.setupwizard.import-settings.firmware = Firmware\:
 platform.plugin.setupwizard.import-settings.created-by = Vytvořeno\:
 platform.plugin.setupwizard.import-settings.created-date = Datum\:
 platform.plugin.setupwizard.import-settings.finished-title = Importované nastavení bylo dokončeno
@@ -502,7 +463,6 @@ platform.plugin.setupwizard.soft-limits.intro = Měkké limity zabrání tomu, a
 platform.plugin.setupwizard.soft-limits.instructions = Umístěte stroj do pozice Home a poté jej přesuňte do maximální bezpečné polohy v opačném směru. Tuto pozici použijte jako svůj měkký limit.
 platform.plugin.setupwizard.soft-limits.require-homing = Před povolením měkkých limitů musí být povolena funkce Home.
 platform.plugin.setupwizard.soft-limits.not-available = Měkké limity nejsou k dispozice ve Vašem hardwaru
-platform.plugin.setupwizard.homing.title = Homing
 platform.plugin.setupwizard.homing.intro = Homing je metoda hledání absolutních souřadnic stroje.
 platform.plugin.setupwizard.homing.enable = Povolit Homing
 platform.plugin.setupwizard.homing.require-limit-switches = Než povolíte funkci Home, musí být povoleny koncové spínače.
@@ -521,7 +481,6 @@ gcode.setting.safety-height = Bezpečná výška
 gcode.setting.cut-depth = Hloubka na průchod
 platform.window.states = Stav
 platform.window.states.tooltip = Aktivní stav G-kódu
-platform.plugin.gcode-tools.tiler.window = Gcode Tiler
 platform.plugin.gcode-tools.tiler.tooltip = Převést G-kód na více identických kopií.
 platform.plugin.gcode-tools.tiler.padding = Mezeza mezi kopiemi
 gcode.g20 = Palce
@@ -548,8 +507,6 @@ gcode.plane = Aktivní rovina
 mainWindow.status.check = Kontrola
 mainWindow.status.door = Dveře
 mainWindow.status.idle = nečinný
-mainWindow.status.jog = Jog
-mainWindow.status.offline = Off-line
 platform.window.diagnostics = Diagnostika UGS
 platform.window.diagnostics.tooltip = Interní diagnostické informace UGS.
 platform.visualizer.popup.showFeatures = Zobrazit funkce
@@ -572,15 +529,9 @@ platform.plugin.joystick.activate = Aktivuj joystick
 platform.plugin.joystick.buttonControls = Ovládací tlačítka
 platform.plugin.joystick.analogControls = Analogové ovládání
 platform.plugin.joystick.clear = vymazat
-platform.plugin.joystick.a = A
-platform.plugin.joystick.b = B
-platform.plugin.joystick.x = X
-platform.plugin.joystick.y = Y
 platform.plugin.joystick.back = Zpět
 platform.plugin.joystick.select = Výběr
 platform.plugin.joystick.start = Začátek
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.r3 = R3
 platform.plugin.joystick.padUp = Pad nahoru
 platform.plugin.joystick.padDown = Pad dolů
 platform.plugin.joystick.padRight = Pad doprava
@@ -589,13 +540,9 @@ platform.plugin.joystick.leftX = levé podržení X
 platform.plugin.joystick.leftY = levé podržení Y
 platform.plugin.joystick.rightX = pravé podržení X
 platform.plugin.joystick.rightY = pravé podržení Y
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.r2 = R2
 platform.plugin.joystick.action.continuousJogging = Analogový jog
 platform.plugin.joystick.reverseAxis = zpětný chod
 platform.plugin.joystick.axisThreshold = Nulová prahová hodnota (%)
-platform.plugin.joystick.l1 = L1
-platform.plugin.joystick.r1 = R1
 platform.plugin.cloud.s3Id = ID přístupového klíče AWS
 platform.plugin.cloud.s3Secret = Tajný přístupový klíč AWS
 platform.plugin.cloud.open = Otevři cloud soubor 
diff --git a/ugs-core/src/resources/MessagesBundle_de_DE.properties b/ugs-core/src/resources/MessagesBundle_de_DE.properties
index 0f1c747a7..c9e451a7f 100644
--- a/ugs-core/src/resources/MessagesBundle_de_DE.properties
+++ b/ugs-core/src/resources/MessagesBundle_de_DE.properties
@@ -61,12 +61,10 @@ mainWindow.error.showTableActive = Die Befehlstabelle kann nicht aktiviert werde
 mainWindow.error.rxtx = Verbindungsproblem
 mainWindow.error.rxtxMac1 = Mac und Linux Benutzer\: Ist diese Schnittstelle unbenutzt, erstellt bitte eine
 mainWindow.error.rxtxMac2 = Verzeichnis %s mit den folgenden Befehlen.
-mainWindow.ui.pauseButton = Pause
 mainWindow.ui.resumeButton = Fortsetzen
 mainWindow.ui.jobComplete = Job beendet nach
 mainWindow.swing.activeStateLabel = Aktivitätsstatus\:
 mainWindow.swing.arrowMovementEnabled = Achsenbewegung per Tastatur zulassen
-mainWindow.swing.baudLabel = Baud\:
 mainWindow.swing.browseButton = Durchsuche
 mainWindow.swing.cancelButton = Abbruch
 mainWindow.swing.commandLabel = Befehl\:
@@ -77,11 +75,8 @@ mainWindow.swing.controlContextTabbedPane.machineControl = Maschinensteuerung
 mainWindow.swing.controlContextTabbedPane.macros = Makros
 mainWindow.swing.durationLabel = Dauer
 mainWindow.swing.fileLabel = Datei
-mainWindow.swing.firmwareLabel = Firmware\:
 mainWindow.swing.firmwareSettingsMenu = Firmware Einstellungen
 mainWindow.swing.grblConnectionSettingsMenuItem = Sendeeinstellungen
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.keyboardMovementPanel = Jog
 mainWindow.swing.settingsMenu = Einstellungen
 mainWindow.swing.statusPanel = Maschinenstatus
 mainWindow.swing.bottomTabbedPane.console = Konsole
@@ -89,11 +84,15 @@ mainWindow.swing.bottomTabbedPane.table = Befehlstabelle
 mainWindow.swing.latestCommentLabel = Letzter Kommentar\:
 mainWindow.swing.machinePosition = Fräsposition
 mainWindow.swing.opencloseButton = Öffnen
-mainWindow.swing.pauseButton = Pause
-mainWindow.swing.portLabel = Port\:
 mainWindow.swing.remainingRowsLabel = verbleibende Zeilen\:
 mainWindow.swing.remainingTimeLabel = Geschätzte verbleibende Zeit\:
 mainWindow.swing.resetCoordinatesButton = Akt. Position \= 0
+action.resetXCoordinatesButton = Setze X Null
+action.resetYCoordinatesButton = Setze Y Null
+action.resetZCoordinatesButton = Setze Z Null
+action.resetACoordinatesButton = Setze A Null
+action.resetBCoordinatesButton = Setze B Null
+action.resetCCoordinatesButton = Setze C Null
 mainWindow.swing.returnToZeroButton = Zurück auf Null
 mainWindow.swing.homeMachine = Home
 mainWindow.swing.rowsLabel = Zeilen in Datei
@@ -102,12 +101,11 @@ mainWindow.swing.sendButton = Senden
 mainWindow.swing.sentRowsLabel = gesendete Zeilen
 mainWindow.swing.showVerboseOutputCheckBox = Ausführl. Ausgabe
 mainWindow.swing.showCommandTableCheckBox = Befehlstabelle anzeigen
-mainWindow.swing.softReset = Soft Reset
 mainWindow.swing.softResetMachineControl = Soft-Reset
 mainWindow.swing.stepSizeLabel = XY Schrittweite\:
 mainWindow.swing.visualizeButton = Visualisieren
 mainWindow.swing.workPositionLabel = Werkstückposition\:
-mainWindow.swing.macroInstructions = <html> Jede Box kann eine Reihe oder G-Code-Befehlen getrennt durch '';'' enthalten. <br />Um den Befehl auszuführen, klicken Sie auf die Schaltfläche links neben dem Text.<br /><br /> Interaktive Ersetzungen können vorgenommen werden. mit\: <br /><ul> <li>{machine_x} - Die Maschinen X-Position </ li> <li> {machine_y} - Die Maschinen Y-Position </ li> <li> {machine_z}  - Die Maschinen Position Z</ li> <li> {work_x} - Die Arbeitsposition X</ li><li> {work_y} - Die Arbeitsposition Y</ li> <li> {work_z} - Die Arbeitsposition Z</ li>< li> {prompt | Name} - Den Benutzer nach einen Wert mit dem Namen "name" fragen </ li></ html>.
+mainWindow.swing.macroInstructions = <html> Jede Box kann eine Reihe oder G-Code-Befehlen getrennt durch '''';'''' enthalten. <br />Um den Befehl auszuführen, klicken Sie auf die Schaltfläche links neben dem Text.<br /><br /> Interaktive Ersetzungen können vorgenommen werden. mit\\\: <br /><ul> <li>{machine_x} - Die Maschinen X-Position </ li> <li> {machine_y} - Die Maschinen Y-Position </ li> <li> {machine_z} - Die Maschinen Position Z</ li> <li> {work_x} - Die Arbeitsposition X</ li><li> {work_y} - Die Arbeitsposition Y</ li> <li> {work_z} - Die Arbeitsposition Z</ li>< li> {prompt | Name} - Den Benutzer nach einen Wert mit dem Namen "name" fragen </ li></ html>.
 mainWindow.swing.inchRadioButton = Zoll
 mainWindow.swing.mmRadioButton = Millimeter
 gcodeTable.command = Befehl
@@ -123,8 +121,6 @@ firmware.feature.linesToArc = Konvertiere Bögen zu Strecken
 firmware.feature.statusUpdates = Status Aktualisierungen
 firmware.feature.statusUpdateRate = Status Aktualisierungsintervall
 firmware.settings.exportSettingsDefaultName = Einstellungen exportieren
-firmware.settings.importSettingsFirmware = Firmware
-firmware.settings.importSettingsName = Name
 firmware.settings.importSettings = Möchten Sie diese Einstellungsdatei importieren?
 firmware.settings.importSettingsTitle = Einstellungsdatei importieren
 firmware.settings.importSettingsDate = Datum
@@ -157,12 +153,6 @@ firmware.tinyg.group.description.z = Z-Achse
 firmware.tinyg.group.description.a = A-Achse
 firmware.tinyg.group.description.b = B-Achse
 firmware.tinyg.group.description.c = C-Achse
-firmware.tinyg.group.description.1 = Motor 1
-firmware.tinyg.group.description.2 = Motor 2
-firmware.tinyg.group.description.3 = Motor 3
-firmware.tinyg.group.description.4 = Motor 4
-firmware.tinyg.group.description.5 = Motor 5
-firmware.tinyg.group.description.6 = Motor 6
 sender.header = Sender Einstellungen
 sender.speed.override = Aktiviere man. Geschwindigkeit
 sender.speed.percent = Man. Geschw. in Prozent
@@ -225,18 +215,11 @@ visualizer.title = G-Code Vorschau
 VisualizerCanvas.dimensions = Dimensionen
 VisualizerCanvas.height = Höhe
 VisualizerCanvas.width = Breite
-platform.menu.jog = Jog
 platform.menu.jog.size = Schrittlänge
 platform.menu.actions = Aktionen
 platform.menu.macros = Makros
 platform.menu.machine = Maschine
 platform.actions.homing.disabled.tooltip = Homing muss in den Firmwareeinstellungen aktiviert werden
-action.resetACoordinatesButton = Setze A Null
-action.resetBCoordinatesButton = Setze B Null
-action.resetCCoordinatesButton = Setze C Null
-action.resetXCoordinatesButton = Setze X Null
-action.resetYCoordinatesButton = Setze Y Null
-action.resetZCoordinatesButton = Setze Z Null
 incomplete.localization = Universal Gcode Sender ist für diese Sprache nicht vollständig übersetzt.\n\n Bitte besuchen Sie\n\nhttps\://translate.universalgcodesender.com\n\n um beim Übersetzen zu helfen.
 mainWindow.swing.resetX = Reset X Achse
 mainWindow.swing.resetY = Reset Y Achse
@@ -247,11 +230,6 @@ jogging.yPlus = Y+
 jogging.yMinus = Y-
 jogging.zPlus = Z+
 jogging.zMinus = Z-
-jogging.aMinus = Jog\: A-
-jogging.bMinus = Jog\: B-
-jogging.bPlus = Jog\: B+
-jogging.cMinus = Jog\: C-
-jogging.cPlus = Jog\: C+
 jogging.xPlus.yMinus = Tipp\: X+ Y-
 jogging.xPlus.yPlus = Tipp\: X+ Y+
 jogging.xMinus.yPlus = Tipp\: X+ Y+
@@ -274,14 +252,11 @@ jogging.decrease.feed = Jog\: Verringere Vorschub Rate
 jogging.multiply.feed = Jog\: Vorschub x10
 jogging.divide.feed = Jog\: Vorschub /10
 jogging.units.toggle = Jog\: Einheiten umschalten
-jogging.units.inch = Jog\: INCH
-jogging.units.mm = Jog\: MM
 grbl.exception.Alarm = Dateistream deaktiviert, wenn GRBL im Alarmzustand.
 grbl.exception.cancelReset = Zeitüberschreitung während Warten auf GRBL, Abbruch unvollständig.
 tinyg.exception.unknownVersion = Dies ist eine unbekannte TinyG Version\: %s. Wenn Sie g2core benutzen, aktualisieren Sie bitte die Verbindungseinstellungen. 
 platform.menu.window = Fenster
 platform.menu.classic = Klassisch
-platform.menu.plugins = Plugins
 platform.window.dro = Steuerungszustand (DRO)
 platform.window.dro.tooltip = Echtzeit Maschinenstatus
 platform.window.actions = Häufige Aktionen
@@ -307,8 +282,8 @@ platform.visualizer.color.background = Hintergrundfarbe
 platform.visualizer.color.tool = Werkzeugfarbe
 platform.visualizer.size.display = Größe anzeigen
 platform.visualizer.color.highlight = Editor-Farbe markierter Abschnitt
-platform.visualizer.color.rapid = Farbe - Eilgang (G0)
 platform.visualizer.color.linear = Farbe - lineare Bewegung (G1)
+platform.visualizer.color.rapid = Farbe - Eilgang (G0)
 platform.visualizer.color.arc = Farbe - Bogenbewegung (G2/G3)
 platform.visualizer.color.plunge = Farbe - Auf/Ab-Bewegung
 platform.visualizer.color.completed = Farbe der fertiggestellten Abschnitte
@@ -320,7 +295,7 @@ platform.visualizer.color.z-axis = Farbe und Deckkraft der Z-Achse.
 platform.visualizer.color.sizedisplay = Farbe der Größenanzeige, Linien und Text.
 platform.visualizer.color.boundry-base = Farbe (und Opazität) der Maschinenbasis
 platform.visualizer.color.boundry-sides = Farbe (und Opazität) der Maschinenseiten
-PendantMenu.item.StartServer = Start...
+
 PendantMenu.item.StopServer = Stopp...
 restore = Standardwerte wiederherstellen
 macro.substitution = Ersetzungen
@@ -353,7 +328,6 @@ PatternRemover = Regulärer Ausdruck-Entferner
 WhitespaceProcessor = Leerstellen-Entfernung
 controller.exception.smoothie.booting = ´Smoothie´ (noch) nicht bereit.
 mainWindow.swing.pendant = Simulation
-platform.visualizer.popup.showFeatures = Zeige Funktionen
 platform.visualizer.popup.coordinatesMenu = Koordinaten\: X\=%s, Y\=%s
 platform.visualizer.popup.submenu.jogToHere = Jog hierher
 platform.visualizer.popup.submenu.jogToHereHint = Bewegt den Kopf zur ausgewählten X/Y Position. Ändert die Z-Höhe nicht.
@@ -374,8 +348,6 @@ platform.menu.save = Speichern
 platform.menu.edit = Bearbeite GCode Datei
 mainWindow.swing.reset = Zurücksetzen
 machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
 machineStatus.pin.probe = Sonde
 machineStatus.pin.door = Tür
 machineStatus.pin.hold = Halt
@@ -435,9 +407,6 @@ autoleveler.panel.use-file = Benutze die geladene Datei
 autoleveler.panel.scan-surface = Scan-Oberfläche
 autoleveler.panel.apply = Auf Gcode anwenden
 autoleveler.panel.visible = Sichtbarer AutoLeveler
-autoleveler.panel.max = Max
-autoleveler.panel.min = Min
-autoleveler.panel.view-data = Zeige Daten
 autoleveler.option.z-zero = Z-Höhe der Antast-Oberfläche im Gcode
 autoleveler.panel.generate-test-date = Testdaten erzeugen
 autoleveler.option.arc-segment-length = Bogensegmentlänge (mm)
@@ -463,10 +432,6 @@ probe.hole-center-hint = Bewegen Sie die Sonde ungefähr in die Mitte
 probe.visualizer.corner-preview = Ecke antasten Vorschau
 probe.visualizer.hole-center-preview = Lochmittensonde Vorschau
 probe.visualizer.z-preview = Z antasten Vorschau
-probe.measure.inside-corner = Messung Innenecke
-probe.measure.outside-corner = Messung Außenecke
-probe.retract-height = Höhe Zurückziehen
-probe.z-distance = Antasten Z-Abstand
 parser.gcode.multiple-axis-commands = Mehrere Programme erfordern Achsangaben auf einer Zeile 
 parser.gcode.missing-axis-commands = Achsangabe für Bewegungsbefehl fehlt
 sender.nightly-warning = Zeige ein Warnpopup für Nightly Builds
@@ -486,10 +451,6 @@ platform.plugin.setupwizard.port-rate = Port Rate\:
 platform.plugin.setupwizard.connect = Verbinde
 platform.plugin.setupwizard.unknown-version = Unbekannte Version
 platform.plugin.setupwizard.reset-to-zero = Setze auf Null
-platform.plugin.setupwizard.home = Home
-platform.plugin.setupwizard.homing.title = Homing
-platform.plugin.setupwizard.import-settings.firmware = Firmware\:
-platform.plugin.setupwizard.port = Port\:
 platform.plugin.setupwizard.move = Bewege
 platform.plugin.setupwizard.measure = Maß
 platform.plugin.setupwizard.calibrate = Kalibirieren
@@ -573,9 +534,9 @@ mainWindow.status.check = prüfen
 mainWindow.status.door = Tür
 mainWindow.status.idle = Leerlauf
 mainWindow.status.jog = Hand
-mainWindow.status.offline = Off-line
 platform.window.diagnostics = UGS Diagnose
 platform.window.diagnostics.tooltip = Interne UGS Diagnoseinformationen
+platform.visualizer.popup.showFeatures = Zeige Funktionen
 platform.visualizer.popup.viewPresets = Voreinstellungen anzeigen
 platform.visualizer.popup.presets.reset = Ansicht zurücksetzen
 platform.visualizer.popup.presets.top = Oben
@@ -597,17 +558,6 @@ platform.plugin.joystick.activate = Aktiviere Joystick
 platform.plugin.joystick.buttonControls = Tasten Kontrolle\:
 platform.plugin.joystick.analogControls = Analoge Steuerung\:
 platform.plugin.joystick.clear = Lösche
-platform.plugin.joystick.a = A
-platform.plugin.joystick.b = B
-platform.plugin.joystick.x = X
-platform.plugin.joystick.y = Y
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.r3 = R3
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.r2 = R2
-platform.plugin.joystick.l1 = L1
-platform.plugin.joystick.r1 = R1
-platform.plugin.joystick.start = Start
 platform.plugin.joystick.back = Zurück
 platform.plugin.joystick.select = Auswählen
 platform.plugin.joystick.padUp = Joypad Hoch
diff --git a/ugs-core/src/resources/MessagesBundle_el_GR.properties b/ugs-core/src/resources/MessagesBundle_el_GR.properties
index fc31e5c30..984365f2b 100644
--- a/ugs-core/src/resources/MessagesBundle_el_GR.properties
+++ b/ugs-core/src/resources/MessagesBundle_el_GR.properties
@@ -89,6 +89,12 @@ mainWindow.swing.portLabel = Θύρα\:
 mainWindow.swing.remainingRowsLabel = Υπολοιπόμενες σειρές\:
 mainWindow.swing.remainingTimeLabel = Εκτιμώμενος χρόνος που απομένει\:
 mainWindow.swing.resetCoordinatesButton = Επαναφορά Μηδέν
+action.resetXCoordinatesButton = Επαναφορά X στο μηδέν
+action.resetYCoordinatesButton = Επαναφορά Υ στο μηδέν
+action.resetZCoordinatesButton = Επαναφορά Ζ στο μηδέν
+action.resetACoordinatesButton = Επαναφορά Α στο μηδέν
+action.resetBCoordinatesButton = Επαναφορά Β στο μηδέν
+action.resetCCoordinatesButton = Επαναφορά C στο μηδέν
 mainWindow.swing.returnToZeroButton = Επιστροφή στο Μηδέν
 mainWindow.swing.rowsLabel = Σειρές στο αρχείο\:
 mainWindow.swing.scrollWindowCheckBox = Μεταβείτε στο παράθυρο εξόδου
@@ -100,6 +106,7 @@ mainWindow.swing.softResetMachineControl = Επανεκκίνηση λογισμ
 mainWindow.swing.stepSizeLabel = Μέγεθος βήματος\:
 mainWindow.swing.visualizeButton = Απεικονίστε
 mainWindow.swing.workPositionLabel = Θέση λειτουργίας\:
+mainWindow.swing.macroInstructions = <html>Κάθε κουτί μπορεί να περιέχει μια σειρά από εντολές G κώδικα που χωρίζονται από ';'.<br /> Για να εκτελέσετε την εντολή, κάντε κλικ στο κουμπί «C» στα αριστερά του κειμένου.</html>
 mainWindow.swing.inchRadioButton = ίντσες
 mainWindow.swing.mmRadioButton = χιλιοστά
 gcodeTable.command = Εντολή
@@ -202,6 +209,7 @@ controller.exception.softreset = Δεν υποστηρίζεται η μαλακ
 controller.exception.sendingstatus = IO Εξαίρεση κατά την αποστολή εντολής κατάστασης
 controller.exception.rowStatInvalid = Οι μετρήσεις σειρών δεν είναι διαθέσιμες με τον αρχικό αναγνώστη αρχείων
 controller.error.response = Σφάλμα κατά την απόκριση επεξεργασίας
+controller.log.version = Grbl έκδοση
 controller.log.realtime = Λειτουργία σε πραγματικό χρόνο
 controller.log.notconnected = δεν είναι συνδεδεμένο
 controller.log.error.reported = Παρουσιάστηκε σφάλμα
@@ -222,6 +230,7 @@ platform.menu.macros = Μακροεντολές
 platform.menu.machine = Μηχανή
 platform.actions.homing.disabled.tooltip = Το Homing πρέπει να είναι ενεργοποιημένο στις ρυθμίσεις υλικολογισμικού
 incomplete.localization = Το Universal Gcode Sender δεν είναι πλήρως προσαρμοσμένο σε αυτήν τη γλώσσα.\nΕπισκεφθείτε τη διεύθυνση https\://translate.universalgcodesender.com για να δείτε πώς μπορείτε να βοηθήσετε.
+mainWindow.swing.softReset = Απαλή επαναφορά
 mainWindow.swing.resetX = Επαναφορά X άξονα
 mainWindow.swing.resetY = Επαναφορά Y άξονα
 mainWindow.swing.resetZ = Επαναφορά Y άξονα
@@ -285,6 +294,7 @@ platform.window.visualizer.tooltip = Τρισδιάστατη προβολή τ
 platform.visualizer.color.background = Χρώμα του φόντου
 platform.visualizer.color.tool = Χρώμα εργαλείου
 platform.visualizer.color.highlight = Χρώμα επισήμανσης γραμμής επεξεργαστή
+platform.visualizer.color.linear = Χρώμα γραμμικής κίνησης (G1)
 platform.visualizer.color.rapid = Χρώμα ταχείας κίνησης (G0)
 platform.visualizer.color.arc = Χρώμα κίνησης τόξου (G2 / G3)
 platform.visualizer.color.plunge = Βύθιση / αύξηση χρώματος κίνησης
@@ -404,7 +414,9 @@ autoleveler.panel.max = Μέγιστο
 autoleveler.panel.z-surface = Gcode Z επιφάνεια
 autoleveler.panel.resolution = Ανάλυση
 autoleveler.panel.use-file = Χρησιμοποιήστε το φορτωμένο αρχείο
+autoleveler.panel.scan-surface = Επιφάνεια σάρωσης
 autoleveler.panel.apply = Εφαρμογή στον Gcode
+autoleveler.panel.visible = Ορατό AutoLeveler
 autoleveler.option.z-zero = Z Ύψος της επιφάνειας του καθετήρα σε gcode
 autoleveler.option.arc-segment-length = Μήκος τμήματος γραμμής τόξου (mm)
 autoleveler.option.offset-x = Ανίχνευση  Χ offset
@@ -412,6 +424,7 @@ autoleveler.option.offset-y = Ανίχνευση  Y offset
 autoleveler.option.offset-z = Ανίχνευση  Ζ offset
 experimental.feature = Αυτό είναι ένα πειραματικό χαρακτηριστικό. Προσέξτε προσεκτικά και αναφέρετε τυχόν σφάλματα που εντοπίζετε στο GitHub.
 # Window title for platform GUI
+platform-title = Καθολική πλατφόρμα Gcode
 mainWindow.swing.alarmLock = Ξεκλείδωμα
 mainWindow.swing.checkMode = Έλεγχος λειτουργίας
 mainWindow.swing.getState = Λήψη κατάστασης
@@ -533,6 +546,7 @@ mainWindow.status.jog = Σκούντημα
 mainWindow.status.offline = Εκτός σύνδεσης
 platform.window.diagnostics = Διαγνωστικά UGS
 platform.window.diagnostics.tooltip = Εσωτερικές πληροφορίες διαγνωστικών UGS.
+platform.visualizer.popup.showFeatures = Εμφάνιση χαρακτηριστικών
 platform.visualizer.popup.viewPresets = Προβολή προεπιλογών
 platform.visualizer.popup.presets.reset = Επαναφορά προβολής
 platform.visualizer.popup.presets.top = Ταβάνι
@@ -577,43 +591,3 @@ platform.plugin.cloud.s3Secret = Κλειδί μυστικής πρόσβαση
 platform.plugin.cloud.open = Άνοιγμα αρχείου cloud
 platform.plugin.toolbox.title=Εργαλειοθήκη
 platform.plugin.toolbox.tooltip=Εργαλειοθήκη
-action.resetACoordinatesButton = Επαναφορά Α στο μηδέν
-action.resetBCoordinatesButton = Επαναφορά Β στο μηδέν
-action.resetCCoordinatesButton = Επαναφορά C στο μηδέν
-action.resetXCoordinatesButton = Επαναφορά X στο μηδέν
-action.resetYCoordinatesButton = Επαναφορά Υ στο μηδέν
-action.resetZCoordinatesButton = Επαναφορά Ζ στο μηδέν
-autoleveler.panel.scan-surface = Επιφάνεια σάρωσης
-autoleveler.panel.view-data = Προβολή δεδομένων
-autoleveler.panel.visible = Ορατό AutoLeveler
-controller.log.version = Grbl έκδοση
-firmware.tinyg.setting.short.description.tr = Travel revolution
-jogging.bMinus = Jog\: B-
-jogging.bPlus = Jog\: B+
-jogging.cMinus = Jog\: C-
-jogging.cPlus = Jog\: C+
-mainWindow.swing.baudLabel = Baud\:
-mainWindow.swing.firmwareLabel = Firmware\:
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.homeMachine = Home Machine
-mainWindow.swing.macroInstructions = <html>Κάθε κουτί μπορεί να περιέχει μια σειρά από εντολές G κώδικα που χωρίζονται από ';'.<br /> Για να εκτελέσετε την εντολή, κάντε κλικ στο κουμπί «C» στα αριστερά του κειμένου.</html>
-mainWindow.swing.softReset = Απαλή επαναφορά
-overrides.rapid.full = Full
-overrides.spindle.short = Spindle
-platform-title = Καθολική πλατφόρμα Gcode
-platform.plugin.gcode-tools.tiler.window = Gcode Tiler
-platform.plugin.joystick.l1 = L1
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.r1 = R1
-platform.plugin.joystick.r2 = R2
-platform.plugin.joystick.r3 = R3
-platform.plugin.setupwizard.home = Home
-platform.plugin.setupwizard.homing.title = Homing
-platform.visualizer.color.linear = Χρώμα γραμμικής κίνησης (G1)
-platform.visualizer.popup.showFeatures = Εμφάνιση χαρακτηριστικών
-platform.visualizer.renderable.gcode-model = Gcode
-probe.measure.inside-corner = Μετρήστε την εσωτερική γωνία
-probe.measure.outside-corner = Μετρήστε την εξωτερική γωνία
-probe.retract-height = Σύρετε το ύψος
-probe.z-distance = Probe Z Distance
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_fr_FR.properties b/ugs-core/src/resources/MessagesBundle_fr_FR.properties
index b45037b4b..6a9c7fd74 100644
--- a/ugs-core/src/resources/MessagesBundle_fr_FR.properties
+++ b/ugs-core/src/resources/MessagesBundle_fr_FR.properties
@@ -11,6 +11,8 @@ value = Valeur
 help = Aide
 save.close = Enregistrer et fermer
 unknown = inconnu
+millimeters = Millimètres
+inches = Pouces
 macroPanel.button = Exécuter
 macroPanel.name = Nom de la Macro
 macroPanel.try = Essayer
@@ -49,10 +51,10 @@ mainWindow.error.showTableActive = Impossible d'activer la table de commande tan
 mainWindow.error.rxtx = Erreur lors de l'ouverture de la connexion
 mainWindow.error.rxtxMac1 = Utilisateurs Mac et Linux, si ce port n'est pas utilisé, veuillez
 mainWindow.error.rxtxMac2 = créer un répertoire nommé %s à l'aide des commandes suivantes
-mainWindow.ui.resumeButton = Reprise
-mainWindow.ui.jobComplete = Travail terminé après
-mainWindow.swing.activeStateLabel = Etat actif\:
-mainWindow.swing.arrowMovementEnabled = Activer déplacement au clavier
+mainWindow.ui.resumeButton = Reprendre
+mainWindow.ui.jobComplete = Tâche terminée après
+mainWindow.swing.activeStateLabel = Statut courant\: 
+mainWindow.swing.arrowMovementEnabled = Activer le mouvement du clavier
 mainWindow.swing.browseButton = Parcourir
 mainWindow.swing.cancelButton = Annulation
 mainWindow.swing.commandLabel = Commande\:
@@ -62,6 +64,7 @@ mainWindow.swing.controlContextTabbedPane.fileMode = Mode Fichier
 mainWindow.swing.controlContextTabbedPane.machineControl = Contrôle Machine
 mainWindow.swing.durationLabel = Durée\:
 mainWindow.swing.fileLabel = Fichier
+mainWindow.swing.firmwareLabel = Microprogramme\:
 mainWindow.swing.firmwareSettingsMenu = Paramètres Microprogramme
 mainWindow.swing.grblConnectionSettingsMenuItem = Paramètres d'envoi
 mainWindow.swing.keyboardMovementPanel = Déplacement
@@ -74,8 +77,15 @@ mainWindow.swing.opencloseButton = Ouvrir
 mainWindow.swing.remainingRowsLabel = Lignes restantes\:
 mainWindow.swing.remainingTimeLabel = Estimation du Temp Restant\:
 mainWindow.swing.resetCoordinatesButton = Reset position zéro
+action.resetXCoordinatesButton = Reset X à 0
+action.resetYCoordinatesButton = Reset Y à 0
+action.resetZCoordinatesButton = Reset Z à 0
+action.resetACoordinatesButton = A à zéro
+action.resetBCoordinatesButton = B à zéro
+action.resetCCoordinatesButton = C à zéro
 mainWindow.swing.returnToZeroButton = Retour position zéro
 mainWindow.swing.homeMachine = Origine Machine
+mainWindow.swing.openDoor = Ouvrir porte
 mainWindow.swing.rowsLabel = Lignes total\:
 mainWindow.swing.scrollWindowCheckBox = Défilement console de sortie
 mainWindow.swing.sendButton = Envoi
@@ -87,6 +97,7 @@ mainWindow.swing.softResetMachineControl = Remise à zéro logiciel
 mainWindow.swing.stepSizeLabel = Taille des PAS XY\:
 mainWindow.swing.visualizeButton = Visualiser
 mainWindow.swing.workPositionLabel = Position Travail\:
+mainWindow.swing.macroInstructions = <html>Chaque boite peut contenir une serie de commandes G Code separees par '';''.<br />Pour executer la commande, appuyer sur le bouton à gauche du texte.<br /><br />Des substitutions interactives peuvent être faites avec\: <br /> <ul><li>{machine_x} - Les coordonnees machine_x</li><li>{machine_y} - Les coordonnees machine Y</li><li>{machine_z} - Les coordonnees machine Z</li><li>{work_x} - Les coordonnees travail X</li><li>{work_y} - Les coordonnees travailY </li><li>{work_z} - Les coordonnees travail Z</li><li>{prompt|name} - Demander a l''utilisateur une valeur nommee''Nom''.</li></html>
 mainWindow.swing.inchRadioButton = Pouces
 mainWindow.swing.mmRadioButton = Millimètres
 gcodeTable.command = Commande
@@ -106,6 +117,7 @@ firmware.settings.importSettings = Voulez-vous importer ce fichier de paramètre
 firmware.settings.importSettingsTitle = Import du fichier de paramètres
 firmware.settings.importSettingsName = Nom
 firmware.settings.importSettingsCreatedBy = Créé par
+firmware.settings.importSettingsFirmware = Microprogramme
 firmware.tinyg.setting.short.description.am = Mode axes
 firmware.tinyg.setting.short.description.vm = Vitesse maximum
 firmware.tinyg.setting.short.description.fr = Débit maximum
@@ -147,7 +159,7 @@ sender.command.length = Taille max des commandes
 sender.truncate = Tronquer les décimales
 sender.singlestep = Mode pas à pas
 sender.whitespace = Suppression des espaces inutiles
-sender.status = Rafraîchissement du statut
+sender.status = Activer la fonction de sondage
 sender.status.rate = Fréquence rafraîchissement du statut (ms)
 sender.safety-height = Hauteur de sécurité pour se dégager de la position de travail lors du retour à l'origine
 sender.arcs = Conversion des arcs en lignes
@@ -156,6 +168,7 @@ sender.arcs.length = Longueur de segment d'arc (mm)
 sender.autoconnect = Connection automatique au démarrage
 sender.autoreconnect = Reconnexion automatique
 sender.autostartpendant = Auto start pendant le démarrage
+sender.invertMouseZoom = Inverse zoom sourie
 sender.notification.nightlyBuild.title = Pre-version
 sender.notification.nightlyBuild.message = Cette version de Universal Gcode Sender est une pre-version.\nIl contient toutes les dernieres fonctionnalites et ameliorations,\nmais peut aussi avoir des bugs qui doivent encore etre corriges.\n\nSi vous rencontrez des problemes, merci de les signaler sur github.
 sender.notification.nightlyBuild.doNotShowAgain = Ne plus visualiser ce message.
@@ -188,6 +201,7 @@ controller.exception.softreset = Reset Soft non supporté avec cette version.
 controller.exception.sendingstatus = Erreur IOException pendant la demande de statut
 controller.exception.rowStatInvalid = Le nombre de lignes n'est pas compatible avec le lecteur de fichier
 controller.error.response = Erreur pendant le traitement de la réponse
+controller.log.version = Version Grbl
 controller.log.realtime = Mode temps réel
 controller.log.notconnected = Non connecté
 controller.log.error.reported = Une erreur s'est produite
@@ -204,6 +218,7 @@ platform.menu.jog = Déplacement
 platform.menu.jog.size = Taille du pas
 platform.actions.homing.disabled.tooltip = Le référencement doit être activé avec les paramètres du firmware
 incomplete.localization = Universal Gcode Sender n'est pas complétement traduit dans ce language. N'hésitez pas a consulter https\://translate.universalgcodesender.com pour voir comment aider.
+mainWindow.swing.softReset = Réinitialiser le logiciel
 mainWindow.swing.resetX = Réinitialiser l'axe X
 mainWindow.swing.resetY = Réinitialiser l'axe Y
 mainWindow.swing.resetZ = Réinitialiser l'axe Z
@@ -217,6 +232,12 @@ jogging.xPlus.yMinus = Déplacement\: X+ Y-
 jogging.xPlus.yPlus = Déplacement\: X+ Y+
 jogging.xMinus.yPlus = Déplacement\: X- Y+
 jogging.xMinus.yMinus = Déplacement\: X- Y-
+jogging.aPlus = Déplacement\: A+
+jogging.aMinus = Déplacement\: A-
+jogging.bPlus = Déplacement\: B+
+jogging.bMinus = Déplacement\: B-
+jogging.cPlus = Déplacement\: C+
+jogging.cMinus = Déplacement\: C -
 jogging.divide = Déplacement\: diviser par 10 le pas XY
 jogging.multiply = Déplacement\: Multiplier par 10 le pas XY
 jogging.increase = Déplacement\: augmenter le pas XY
@@ -225,6 +246,10 @@ jogging.divide.z = Déplacement\: diviser le pas Z par 10
 jogging.multiply.z = Déplacement\: multiplier le pas Z par 10
 jogging.increase.z = Déplacement\: augmenter le pas Z
 jogging.decrease.z = Déplacement\: diminuer le pas Z
+jogging.divide.abc = Déplacement\: diviser par 10 le pas ABC
+jogging.multiply.abc = Déplacement\: ABC multiplié par 10
+jogging.increase.abc = Déplacement\: augmenter le pas  ABC
+jogging.decrease.abc = Déplacement\: ABC diminuée de
 jogging.increase.feed = Déplacement\: augmenter la vitesse
 jogging.decrease.feed = Déplacement\: diminuer la vitesse
 jogging.multiply.feed = Déplacement\: Multiplier le débit par 10
@@ -237,6 +262,7 @@ grbl.exception.cancelReset = Délai d'attente important du GRBL vers IDLE pendan
 tinyg.exception.unknownVersion = Il s'agit d'une version inconnue de TinyG\:% s. Si vous utilisez g2core, veuillez mettre à jour vos paramètres de connexion.
 platform.menu.window = Fenêtre
 platform.menu.classic = Classique
+platform.menu.plugins = Extentions
 platform.window.dro = État du controleur (DRO)
 platform.window.dro.tooltip = État de la machine en temps réel.
 platform.window.actions = Actions communes
@@ -246,7 +272,7 @@ platform.window.workflow.tooltip = Permet d'exécuter des travaux contenant plus
 platform.window.filebrowser = Explorateur fichiers
 platform.window.filebrowser.tooltip = Charger un fichier
 platform.window.jogcontrol = Contrôle de la manette
-platform.window.jogcontrol.tooltip = Contrôler manuellement la position de la machine
+platform.window.jogcontrol.tooltip = Contrôler manuellement la localisation de la machine.
 platform.window.macros.tooltip = Les macros créées dans les préférences peuvent être utilisées ici.
 platform.window.overrides = Remplacements
 platform.window.overrides.tooltip = Envoyer et surveiller les remplacements.
@@ -258,6 +284,7 @@ platform.window.visualizer.tooltip = Vue 3D de l'opération en cours.
 platform.visualizer.color.background = Couleur de fond
 platform.visualizer.color.tool = Couleur des outils
 platform.visualizer.color.highlight = Editeur de couleur pour lignes en surbrillances
+platform.visualizer.color.linear = Couleur du mouvement linéaire (G1)
 platform.visualizer.color.rapid = Couleur de mouvement rapide (G0)
 platform.visualizer.color.arc = Couleur des mouvements circulaire (G2/G3)
 platform.visualizer.color.plunge = Couleur des mouvements de plonger/lever
@@ -274,7 +301,7 @@ platform.visualizer.color.boundry-sides = Couleur (et opacité) des côtés mach
 PendantMenu.item.StartServer = Start
 PendantMenu.item.StopServer = Stop
 restore = Réinitialiser
-macro.substitution = Substitutions
+macro.substitution = Remplacements
 parser.processor.arc.start-error = Il n'y a pas de point de départ, incapable de développer l'arc.
 parser.processor.arc.multiple-commands = Plusieurs commandes ont été trouvées sur une ligne tout en développant un arc, incapable de continuer. Le processeur de division de commandes peut être utilisé pour continuer.
 sender.help.commandSplitter = Diviser la commande de gcode en plusieurs parties pour une meilleure déclaration des erreurs.
@@ -292,6 +319,9 @@ settings.processors.loadError = Impossible de charger le processeur
 settings.language = Langue
 settings.connectionDriver = Connexion du driver
 settings.workspaceDirectory = Repertoire de travail
+settings.help.disableAxis = Chaque axe désactivé est supprimé de l'UI si possible.
+settings.disableAxis = Axe désactivé\: %s
+settings.pendantPort = Port entrant
 ArcExpander = Arc élargisseur
 CommandLengthProcessor = Commande de longueur du processeur
 CommandSplitter = Commande séparé
@@ -318,9 +348,10 @@ toolbar.icon.small = Petites icônes
 toolbar.icon.large = Grandes icônes
 sender.help.verbose.console = Afficher les informations supplémentaires dans la console du contrôleur.
 platform.menu.open = Ouvrir un fichier Gcode
+platform.menu.save = Sauver
 platform.menu.edit = Éditer un fichier Gcode
 mainWindow.swing.reset = Réinitialiser
-machineStatus.pin.probe = Sonde
+machineStatus.pin.probe = Sonde de calibrage hauteurs Z
 machineStatus.pin.door = porte
 machineStatus.pin.hold = Tenir
 machineStatus.pin.softReset = Réinitialiser logiciel
@@ -360,8 +391,10 @@ mainWindow.swing.baudrate.toolbarTitle = Barre d'outils de débit
 parser.processor.general.multiple-commands = Plusieurs commandes ont été trouvées sur une seule ligne qui n'est pas prise en charge avec ce processeur. Activez le processeur splitter de commande pour continuer.
 platform.window.autoleveler = Nivellement automatique
 platform.window.autoleveler.tooltip = sonder la surface du matériau et transformer le Gcode selon les résultats.
+platform.visualizer.renderable.gcode-model = G-code
 platform.visualizer.renderable.grid = Coordonnées et niveau
 platform.visualizer.renderable.highlight = Répétition de l'éditeur de G-code
+platform.visualizer.renderable.editor-position=Position du curseur
 platform.visualizer.renderable.mouse-indicator = localisation de la souris
 platform.visualizer.renderable.orientation-cube = Orientation face XYZ
 platform.visualizer.renderable.selection = Boîte de sélection
@@ -372,7 +405,9 @@ platform.visualizer.renderable.machine-boundries = Limites de la machine
 autoleveler.panel.z-surface = Surface Gcode en Z
 autoleveler.panel.resolution = Résolution
 autoleveler.panel.use-file = Utiliser le fichier chargé
+autoleveler.panel.scan-surface = Mesure la surface
 autoleveler.panel.apply = Appliquer à Gcode
+autoleveler.panel.visible = Auto nivelage visible
 autoleveler.option.z-zero = Hauteur Z de la sonde dans le Gcode.
 autoleveler.option.arc-segment-length = Longueur du segment de l'arc (mm)
 autoleveler.option.offset-x = Décalage X de la sonde
@@ -380,6 +415,7 @@ autoleveler.option.offset-y = Décalage Y de la sonde
 autoleveler.option.offset-z = Décalage Z de la sonde
 experimental.feature = C'est une version expérimentale. Veuillez utiliser prudemment et signaler tous les bugs que vous trouvez sur GitHub
 # Window title for platform GUI
+platform-title = Universal Gcode Platform
 mainWindow.swing.alarmLock = Déverrouiller
 mainWindow.swing.checkMode = Mode de vérification
 mainWindow.swing.getState = Obtenir l'état
@@ -425,6 +461,7 @@ platform.plugin.setupwizard.connection.connecting = Connexion ...
 platform.plugin.setupwizard.connection.connected-to = Connecté à
 platform.plugin.setupwizard.import-settings.title = Import des paramètres
 platform.plugin.setupwizard.import-settings.intro = Si votre machine est livrée avec un fichier de configuration ou si vous avez déjà effectué une sauvegarde de vos paramètres, vous pouvez les charger ici. Sinon, cliquez sur Suivant pour continuer.
+platform.plugin.setupwizard.import-settings.firmware = Microprogramme\:
 platform.plugin.setupwizard.import-settings.created-by = Crée par\:
 platform.plugin.setupwizard.import-settings.finished-title = Import des paramètres terminé
 platform.plugin.setupwizard.import-settings.finished-description = Continuez à vérifier votre configuration en procédant comme suit.
@@ -499,24 +536,28 @@ mainWindow.status.check = Vérifie
 mainWindow.status.door = Porte
 mainWindow.status.idle = Pause
 mainWindow.status.jog = Déplacement
-mainWindow.status.offline = Hors ligne
-platform.window.diagnostics = Diagnostique UGS
-platform.window.diagnostics.tooltip = Information de diagnostique interne
+mainWindow.status.offline = Déconnecté
+platform.window.diagnostics = Diagnostics UGS
+platform.window.diagnostics.tooltip = Information de diagnostic interne
+platform.visualizer.popup.showFeatures = Voir les fonctionnalités
 platform.visualizer.popup.viewPresets = Voir les réglages
 platform.visualizer.popup.presets.reset = Remise à 0 des vues
 platform.visualizer.popup.presets.top = Haut
 platform.visualizer.popup.presets.left = Gauche
 platform.visualizer.popup.presets.front = Face
 platform.plugin.jog.useSeparateStepSize = Utilisez des tailles de pas séparées pour Z et XY
+platform.plugin.jog.showABCStepSize = Affiche dimension pas ABC
 platform.plugin.jog.feedRate = % Vitesse déplacement
 platform.plugin.jog.stepSize = Taille de pas
 platform.plugin.jog.stepSizeZ = Taille de pas Z
 platform.plugin.jog.stepSizeXY = Taille de pas XY
+platform.plugin.jog.stepSizeABC = Taille du pas ABC
 platform.plugin.jog.stepLarger = Plus grand
 platform.plugin.jog.stepSmaller = Plus petit
 platform.plugin.jog.stealKeyboardFocus = S'assurer que les commandes du clavier sont actives
 platform.window.edit.macros = Modifier les macros ...
 platform.action.outline = Contour/Aperçu
+platform.action.outline.tooltip = Déplacer l'outil autour du model sans la profondeur
 platform.plugin.joystick.activate = Activer la Manette
 platform.plugin.joystick.buttonControls = Boutons de commandes\:
 platform.plugin.joystick.analogControls = Manette\:
@@ -536,118 +577,26 @@ platform.plugin.joystick.axisThreshold = Seuil zéro (%)
 platform.plugin.cloud.s3Id = ID de clé d'accès AWS
 platform.plugin.cloud.s3Secret = Clé d'accès secrète AWS
 platform.plugin.cloud.open = Ouvrir un fichier cloud
+platform.plugin.toolbox.title=Boite outils
+platform.plugin.toolbox.tooltip=Boite outils
+platform.plugin.toolbox.settings.title=Edit boutons outils
+platform.plugin.editor.showOnOpen=Ouvrir l'éditeur a l'ouverture du fichier
+platform.plugin.designer.clipart.animals=Animaux
+platform.plugin.designer.clipart.buildings=Construction
+platform.plugin.designer.clipart.computer=Ordinateur
+platform.plugin.designer.clipart.decorations=Décorations
+platform.plugin.designer.clipart.electronics=Electronique
+platform.plugin.designer.clipart.food=Nourriture
+platform.plugin.designer.clipart.geography=Géographie
+platform.plugin.designer.clipart.holiday=Fête
 platform.plugin.designer.clipart.logos=Logos
-VisualizerCanvas.dimensions = Dimensions
-action.resetACoordinatesButton = A à zéro
-action.resetBCoordinatesButton = B à zéro
-action.resetCCoordinatesButton = C à zéro
-action.resetXCoordinatesButton = Reset X à 0
-action.resetYCoordinatesButton = Reset Y à 0
-action.resetZCoordinatesButton = Reset Z à 0
-autoleveler.panel.max = Max
-autoleveler.panel.min = Min
-autoleveler.panel.scan-surface = Mesure la surface
-autoleveler.panel.view-data = Voir les données
-autoleveler.panel.visible = Auto nivelage visible
-controller.log.version = Version Grbl
-description = Description
-export = Export
-firmware.settings.importSettingsDate = Date
-firmware.settings.importSettingsFirmware = Microprogramme
-import = Import
-inches = Pouces
-jogging.aMinus = Déplacement\: A-
-jogging.aPlus = Déplacement\: A+
-jogging.bMinus = Déplacement\: B-
-jogging.bPlus = Déplacement\: B+
-jogging.cMinus = Déplacement\: C -
-jogging.cPlus = Déplacement\: C+
-jogging.decrease.abc = Déplacement\: ABC diminuée de
-jogging.divide.abc = Déplacement\: diviser par 10 le pas ABC
-jogging.increase.abc = Déplacement\: augmenter le pas  ABC
-jogging.multiply.abc = Déplacement\: ABC multiplié par 10
-machineStatus.pin.a = A
-machineStatus.pin.b = B
-machineStatus.pin.c = C
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-macroPanel.description = Description
-macroPanel.text = GCode
-mainWindow.status.queue = Queue
-mainWindow.swing.baudLabel = Baud\:
-mainWindow.swing.bottomTabbedPane.console = Console
-mainWindow.swing.controlContextTabbedPane.macros = Macros
-mainWindow.swing.firmwareLabel = Microprogramme\:
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.macroInstructions = <html>Chaque boite peut contenir une serie de commandes G Code separees par '';''.<br />Pour executer la commande, appuyer sur le bouton à gauche du texte.<br /><br />Des substitutions interactives peuvent être faites avec\: <br /> <ul><li>{machine_x} - Les coordonnees machine_x</li><li>{machine_y} - Les coordonnees machine Y</li><li>{machine_z} - Les coordonnees machine Z</li><li>{work_x} - Les coordonnees travail X</li><li>{work_y} - Les coordonnees travailY </li><li>{work_z} - Les coordonnees travail Z</li><li>{prompt|name} - Demander a l''utilisateur une valeur nommee''Nom''.</li></html>
-mainWindow.swing.openDoor = Ouvrir porte
-mainWindow.swing.pauseButton = Pause
-mainWindow.swing.portLabel = Port\:
-mainWindow.swing.softReset = Réinitialiser le logiciel
-mainWindow.swing.stopButton = Stop
-mainWindow.ui.pauseButton = Pause
-millimeters = Millimètres
-platform-title = Universal Gcode Platform
-platform.action.outline.tooltip = Déplacer l'outil autour du model sans la profondeur
-platform.menu.actions = Actions
-platform.menu.machine = Machine
-platform.menu.macros = Macros
-platform.menu.plugins = Extentions
-platform.menu.save = Sauver
-platform.plugin.designer.clipart.animals = Animaux
-platform.plugin.designer.clipart.buildings = Construction
-platform.plugin.designer.clipart.computer = Ordinateur
-platform.plugin.designer.clipart.decorations = Décorations
-platform.plugin.designer.clipart.electronics = Electronique
-platform.plugin.designer.clipart.food = Nourriture
-platform.plugin.designer.clipart.geography = Géographie
-platform.plugin.designer.clipart.holiday = Fête
-platform.plugin.designer.clipart.mythical = Mythique
-platform.plugin.designer.clipart.office = Travail
-platform.plugin.designer.clipart.people = Personnes
-platform.plugin.designer.clipart.plants = Plantes
-platform.plugin.designer.clipart.science = Science
-platform.plugin.designer.clipart.signs_and_symbols = Signes & symbols
-platform.plugin.designer.clipart.special = Evenement
-platform.plugin.designer.clipart.tools = Outils
-platform.plugin.designer.clipart.transportation = Transports
-platform.plugin.designer.clipart.unsorted = Non trié
-platform.plugin.designer.clipart.weather = Météo
-platform.plugin.editor.showOnOpen = Ouvrir l'éditeur a l'ouverture du fichier
-platform.plugin.jog.showABCStepSize = Affiche dimension pas ABC
-platform.plugin.jog.stepSizeABC = Taille du pas ABC
-platform.plugin.joystick.a = A
-platform.plugin.joystick.b = B
-platform.plugin.joystick.l1 = L1
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.r1 = R1
-platform.plugin.joystick.r2 = R2
-platform.plugin.joystick.r3 = R3
-platform.plugin.joystick.select = Select
-platform.plugin.joystick.start = Start
-platform.plugin.joystick.x = X
-platform.plugin.joystick.y = Y
-platform.plugin.setupwizard.import-settings.created-date = Date\:
-platform.plugin.setupwizard.import-settings.firmware = Microprogramme\:
-platform.plugin.setupwizard.port = Port\:
-platform.plugin.toolbox.settings.title = Edit boutons outils
-platform.plugin.toolbox.title = Boite outils
-platform.plugin.toolbox.tooltip = Boite outils
-platform.visualizer.color.linear = Couleur du mouvement linéaire (G1)
-platform.visualizer.popup.showFeatures = Voir les fonctionnalités
-platform.visualizer.renderable.editor-position = Position du curseur
-platform.visualizer.renderable.gcode-model = G-code
-platform.window.macros = Macros
-platform.window.serialconsole = Console
-probe.measure.inside-corner = Mesurer le coin intérieur
-probe.measure.outside-corner = Mesurer le coin extérieur
-probe.retract-height = Hauteur de rétraction
-probe.z-distance = Distance Z de la sonde
-sender.invertMouseZoom = Inverse zoom sourie
-settings.disableAxis = Axe désactivé\: %s
-settings.help.disableAxis = Chaque axe désactivé est supprimé de l'UI si possible.
-settings.pendantPort = Port entrant
-title = Universal Gcode Sender
-version = Version
\ No newline at end of file
+platform.plugin.designer.clipart.mythical=Mythique
+platform.plugin.designer.clipart.office=Travail
+platform.plugin.designer.clipart.people=Personnes
+platform.plugin.designer.clipart.plants=Plantes
+platform.plugin.designer.clipart.signs_and_symbols=Signes & symbols
+platform.plugin.designer.clipart.special=Evenement
+platform.plugin.designer.clipart.tools=Outils
+platform.plugin.designer.clipart.transportation=Transports
+platform.plugin.designer.clipart.unsorted=Non trié
+platform.plugin.designer.clipart.weather=Météo
diff --git a/ugs-core/src/resources/MessagesBundle_it_IT.properties b/ugs-core/src/resources/MessagesBundle_it_IT.properties
index 913e539b9..ab9b44ef4 100644
--- a/ugs-core/src/resources/MessagesBundle_it_IT.properties
+++ b/ugs-core/src/resources/MessagesBundle_it_IT.properties
@@ -97,6 +97,7 @@ mainWindow.swing.showCommandTableCheckBox = Attiva la tavola dei comandi
 mainWindow.swing.stepSizeLabel = Dimensione di passo XY\:
 mainWindow.swing.visualizeButton = Visualizza
 mainWindow.swing.workPositionLabel = Posizione di Lavoro\\\:
+mainWindow.swing.macroInstructions = <html>Ogni box può contenere una serie di comandi GCode separati da '';''.<br />Per eseguire il comando premi sul pulsante a sinistra del testo.<br /><br />Sostituzioni interattive possono essere fatte con\: <br /> <ul><li>{machine_x} - La posizione della macchina sull''asse X</li><li>{machine_y} - La posizione della macchina sull''asse Y</li><li>{machine_z} - La posizione della macchina sull''asse Z</li><li>{work_x} - La posizione di lavoro sull''asse X</li><li>{work_y} - La posizione di lavoro sull''asse Y</li><li>{work_z} - La posizione di lavoro sull''asse Z</li><li>{prompt|nome} - Chiede all''utente un valore chiamato ''nome''.</li></html>
 mainWindow.swing.inchRadioButton = Pollici
 mainWindow.swing.mmRadioButton = Millimetri
 gcodeTable.command = Comando
@@ -196,6 +197,7 @@ controller.exception.softreset = Soft Reset non supportato per questa versione
 controller.exception.sendingstatus = IOException mentre invia comando di stato
 controller.exception.rowStatInvalid = I conteggi delle righe non sono disponibili con il lettore di file raw.
 controller.error.response = Errore mentre la risposta era in processo
+controller.log.version = Versione GRBL
 controller.log.realtime = Modalità in tempo reale
 controller.log.notconnected = Non connesso
 controller.log.error.reported = C'è stato un errore
@@ -216,6 +218,7 @@ platform.menu.macros = Macro
 platform.menu.machine = Macchina
 platform.actions.homing.disabled.tooltip = L'homing deve essere abilitato nelle impostazioni del firmware
 incomplete.localization = Universal Gcode Sender non è completamente tradotto in questa lingua.\nPer favore visita https\://translate.universalgcodesender.com per vedere come puoi contribuire alla traduzione
+mainWindow.swing.softReset = Resetta software
 mainWindow.swing.resetX = Resetta Asse X
 mainWindow.swing.resetY = Resetta Asse Y
 mainWindow.swing.resetZ = Resetta Asse Z
@@ -265,6 +268,7 @@ platform.window.visualizer.tooltip = Visione 3D dell'operazione in corso
 platform.visualizer.color.background = Colore dello sfondo
 platform.visualizer.color.tool = Colore dell'utensile
 platform.visualizer.color.highlight = Colore dell'editor delle linee evidenziate
+platform.visualizer.color.linear = Colore del movimento lineare (G1)
 platform.visualizer.color.rapid = Colore del movimento rapido (G0)
 platform.visualizer.color.arc = Colore del movimento ad arco (G2/G3)
 platform.visualizer.color.plunge = Colore del movimento di discesa e di salita
@@ -378,7 +382,9 @@ platform.visualizer.renderable.machine-boundries = Limiti della macchina
 autoleveler.panel.z-surface = Superficie Gcode Z
 autoleveler.panel.resolution = Risoluzione
 autoleveler.panel.use-file = Usa File caricato
+autoleveler.panel.scan-surface = Scansiona la superfice
 autoleveler.panel.apply = Applica a Gcode
+autoleveler.panel.visible = AutoLeveler Visibile
 autoleveler.option.z-zero = Altezza Z della superficie della sonda in gcode
 autoleveler.option.arc-segment-length = Lunghezza del segmento della linea ad arco (mm)\n
 autoleveler.option.offset-x = Offset X sonda
@@ -386,6 +392,7 @@ autoleveler.option.offset-y = Offset Y sonda
 autoleveler.option.offset-z = Offset Z sonda
 experimental.feature = Questa è una caratteristica sperimentale. Si prega di usare cautela e segnalare eventuali bug che si trovano su GitHub.
 # Window title for platform GUI
+platform-title = Universal Gcode Platform
 mainWindow.swing.alarmLock = Sblocca
 mainWindow.swing.checkMode = Modalità di controllo
 mainWindow.swing.getState = Prendi stato
@@ -507,6 +514,7 @@ mainWindow.status.jog = Movimento
 mainWindow.status.offline = Offline
 platform.window.diagnostics = Diagnostica UGS
 platform.window.diagnostics.tooltip = Informazioni di diagnostica interna UGS.
+platform.visualizer.popup.showFeatures = Mostra caratteristiche
 platform.visualizer.popup.viewPresets = Visualizza i preset
 platform.visualizer.popup.presets.reset = Reimposta vista
 platform.visualizer.popup.presets.top = Sopra
@@ -549,36 +557,3 @@ platform.plugin.joystick.axisThreshold = Soglia zero (%)
 platform.plugin.cloud.s3Id = Key ID di accesso ad AWS
 platform.plugin.cloud.s3Secret = Chiave segreta di accesso ad AWS
 platform.plugin.cloud.open = Apri file cloud
-autoleveler.panel.max = Max
-autoleveler.panel.min = Min
-autoleveler.panel.scan-surface = Scansiona la superfice
-autoleveler.panel.view-data = Visualizza dati
-autoleveler.panel.visible = AutoLeveler Visibile
-controller.log.version = Versione GRBL
-firmware.settings.importSettingsFirmware = Firmware
-jogging.units.inch = Jog\: INCH
-jogging.units.mm = Jog\: MM
-jogging.xMinus.yMinus = Jog\: X- Y-
-jogging.xMinus.yPlus = Jog\: X- Y+
-jogging.xPlus.yMinus = Jog\: X+ Y-
-jogging.xPlus.yPlus = Jog\: X+ Y+
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-mainWindow.swing.baudLabel = Baud\:
-mainWindow.swing.firmwareLabel = Firmware\:
-mainWindow.swing.macroInstructions = <html>Ogni box può contenere una serie di comandi GCode separati da '';''.<br />Per eseguire il comando premi sul pulsante a sinistra del testo.<br /><br />Sostituzioni interattive possono essere fatte con\: <br /> <ul><li>{machine_x} - La posizione della macchina sull''asse X</li><li>{machine_y} - La posizione della macchina sull''asse Y</li><li>{machine_z} - La posizione della macchina sull''asse Z</li><li>{work_x} - La posizione di lavoro sull''asse X</li><li>{work_y} - La posizione di lavoro sull''asse Y</li><li>{work_z} - La posizione di lavoro sull''asse Z</li><li>{prompt|nome} - Chiede all''utente un valore chiamato ''nome''.</li></html>
-mainWindow.swing.reset = Reset
-mainWindow.swing.softReset = Resetta software
-platform-title = Universal Gcode Platform
-platform.menu.plugins = Plugins
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.r2 = R2
-platform.plugin.joystick.r3 = R3
-platform.visualizer.color.linear = Colore del movimento lineare (G1)
-platform.visualizer.popup.showFeatures = Mostra caratteristiche
-probe.measure.inside-corner = Misura l'angolo interno
-probe.measure.outside-corner = Misura l'angolo esterno
-probe.retract-height = Altezza di ritorno
-probe.z-distance = Distanza Z della sonda
diff --git a/ugs-core/src/resources/MessagesBundle_ja_JP.properties b/ugs-core/src/resources/MessagesBundle_ja_JP.properties
index 4c6a26573..5feef0b9b 100644
--- a/ugs-core/src/resources/MessagesBundle_ja_JP.properties
+++ b/ugs-core/src/resources/MessagesBundle_ja_JP.properties
@@ -83,7 +83,10 @@ sender.command.length = Speed override percent
 sender.singlestep = シングルステップモードを有効にする
 sender.autoconnect = 起動時に自動で接続する
 sender.autoreconnect = 自動で再接続する
+sender.help.command.length = Max command length\: Maximum length of a command before an error is triggered
+sender.help.singlestep = nable single step mode\: Turns on single step mode, this is very slow.
 sender.help.dialog.title = ヘルプ(センダーセッティング)
+controller.log.version = Grblのバージョン
 controller.log.realtime = リアルタイムモード
 controller.log.notconnected = 接続されていません
 settings.log.loading = 設定を読み込んでいます
@@ -97,6 +100,7 @@ platform.menu.jog.size = ステップ間隔
 platform.menu.actions = アクション
 platform.menu.macros = マクロ
 platform.menu.machine = マシン
+mainWindow.swing.softReset = ソフトリセット
 mainWindow.swing.resetX = リセット X軸
 mainWindow.swing.resetY = リセット Y軸
 mainWindow.swing.resetZ = リセット Z軸
@@ -124,6 +128,7 @@ platform.window.serialconsole = コンソール
 platform.window.visualizer = ビューポート
 platform.visualizer.color.background = 背景色
 platform.visualizer.color.tool = ツールカラー
+platform.visualizer.color.linear = 直線移動時の色
 platform.visualizer.color.rapid = 高速移動時の色
 platform.visualizer.color.arc = 円弧移動時の色
 
@@ -185,6 +190,7 @@ platform.visualizer.renderable.tool-location = ツール位置表示
 platform.visualizer.renderable.autolevel-preview = オートレベリングプレビュー
 autoleveler.panel.min = 最小
 autoleveler.panel.max = 最大
+autoleveler.panel.z-surface = Orientation cube
 autoleveler.panel.resolution = 分解度
 autoleveler.option.offset-x = タッチセンサー X オフセット
 autoleveler.option.offset-y = タッチセンサー Y オフセット
@@ -194,15 +200,9 @@ mainWindow.swing.alarmLock = アンロック
 mainWindow.swing.checkMode = チェックモード
 mainWindow.swing.getState = ステータスを取得
 platform.window.probe-module = タッチセンサーモジュール
+platform.window.probe-module.tooltip = Utilities for different probe operations.
 probe.x-distance = タッチセンサー X軸 距離
 probe.y-distance = タッチセンサー Y軸 距離
 probe.retract-amount = 退避量
 probe.visualizer.corner-preview = コーナータッチセンサープレビュー
 probe.visualizer.z-preview = Zタッチセンサープレビュー
-controller.log.version = Grblのバージョン
-mainWindow.swing.softReset = ソフトリセット
-platform.visualizer.color.linear = 直線移動時の色
-probe.measure.inside-corner = インコーナーファインダー
-probe.measure.outside-corner = アウトコーナーファインダー
-probe.retract-height = 退避高さ
-probe.z-distance = タッチセンサー Z軸 距離
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_lt_LT.properties b/ugs-core/src/resources/MessagesBundle_lt_LT.properties
index 8fcf8f925..38e125fb6 100644
--- a/ugs-core/src/resources/MessagesBundle_lt_LT.properties
+++ b/ugs-core/src/resources/MessagesBundle_lt_LT.properties
@@ -23,6 +23,8 @@ mainWindow.alarmLock = Atrakinti\: Atjungia GRBL užraktą
 mainWindow.checkMode = Tikrinimo režimas
 mainWindow.getState = Gauti būseną\:
 mainWindow.helpKeyboard = Klaviatūros valdymas
+mainWindow.helpKeyX = X\\\: Arrow Left/Right; KeyPad Left/Right; Numpad\\\: 4/6
+mainWindow.helpKeyPlusMinus = Aidas, 4 days ago\nIn-/Descrease Steps\: KeyPad +/-
 mainWindow.status.alarm = Aliarmas
 mainWindow.status.hold = Pristabdyti
 mainWindow.status.queue = Eilė
@@ -136,6 +138,7 @@ controller.exception.parserstate = Nepalaikomas analizatorius šiai versijai
 controller.exception.softreset = Nepalaikomas perkrovimas šiame valdiklyje
 controller.exception.sendingstatus = Klaida siunčiant būsenos komandą
 controller.error.response = Klaida rodant atsakymą
+controller.log.version = Grbl versija
 controller.log.realtime = Realaus laiko režimas
 controller.log.notconnected = Neprijungta
 connection.exception.inuse = Prisijungimas jau naudojamas kitos programos
@@ -152,6 +155,7 @@ platform.menu.jog.size = Žingsnio dydis
 platform.menu.actions = Veiksmai
 platform.menu.macros = Makro komandos
 platform.menu.machine = Staklės
+mainWindow.swing.softReset = Perkrauti vald.
 mainWindow.swing.resetX = Atstatyti X ašį
 mainWindow.swing.resetY = Atstatyti Y ašį
 mainWindow.swing.resetZ = Atstatyti Z ašį
@@ -189,6 +193,7 @@ platform.window.visualizer = Atvaizduotojas
 platform.window.visualizer.tooltip = 3D vaizdas
 platform.visualizer.color.background = Fono spalva
 platform.visualizer.color.tool = Įrankio spalva
+platform.visualizer.color.linear = Darbo judėjimo spalva (G1)
 platform.visualizer.color.rapid = Greito judėjimo spalva (G0)
 platform.visualizer.color.arc = Arkų spalva
 platform.visualizer.color.plunge = Aukščio keitimo spalva
@@ -277,6 +282,7 @@ platform.visualizer.renderable.tool-location = Frezos vieta
 autoleveler.panel.z-surface = Gcode Z paviršius
 autoleveler.panel.resolution = Tankumas
 autoleveler.panel.use-file = Naudoti užkrautą failą
+autoleveler.panel.scan-surface = Skanuoti paviršių
 autoleveler.panel.apply = Pritaikyti prie gcode
 autoleveler.option.z-zero = Z aukštis nulinimo plokštumos faile
 autoleveler.option.arc-segment-length = Arkos linijos segmento ilgis
@@ -284,6 +290,7 @@ autoleveler.option.offset-x = Nulinimo X kompensacija
 autoleveler.option.offset-y = Nulinimo Y kompensacija
 autoleveler.option.offset-z = Nulinimo Z kompensacija
 # Window title for platform GUI
+platform-title = Universal Gcode Platform
 mainWindow.swing.alarmLock = Atrakinti
 mainWindow.swing.checkMode = Tikrinimo režimas
 mainWindow.swing.getState = Gauti būseną
@@ -297,6 +304,7 @@ probe.visualizer.corner-preview = Probe peržiūra
 probe.visualizer.z-preview = Z nulinimo rodymas
 parser.gcode.missing-axis-commands = Nenurodytas ašies ženklas faile
 sender.nightly-warning = Nightly Builds įspėjimas
+sender.help.spindle-dwell = Add a configurable delay (in seconds) after enabling the spindle with a "M3" command.
 platform.window.dowel-module = Dowel Modulis
 platform.plugin.dowel-module.generate = Generuoti gcode
 platform.plugin.dowel-module.export = Eksportuoti gcode
@@ -338,21 +346,3 @@ gcode.g94 = Vienetai per minutę
 gcode.g95 = Vienetai per apsisukimą
 gcode.work-offset = Darbo ofsetas
 gcode.plane = Aktyvi plokštuma
-autoleveler.panel.scan-surface = Skanuoti paviršių
-autoleveler.panel.view-data = Peržiūrėti duomenis
-controller.log.version = Grbl versija
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-macroPanel.text = GCode
-mainWindow.swing.firmwareLabel = Firmware\:
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.softReset = Perkrauti vald.
-platform-title = Universal Gcode Platform
-platform.visualizer.color.linear = Darbo judėjimo spalva (G1)
-platform.visualizer.renderable.gcode-model = Gcode
-probe.measure.inside-corner = Rasti vidinį kampą
-probe.measure.outside-corner = Rasti išorės kampą
-probe.retract-height = Atsitraukimo aukštis
-probe.z-distance = Z atstumas
-title = Universal Gcode Sender
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_nb_NO.properties b/ugs-core/src/resources/MessagesBundle_nb_NO.properties
index ed7329fcf..e47963468 100644
--- a/ugs-core/src/resources/MessagesBundle_nb_NO.properties
+++ b/ugs-core/src/resources/MessagesBundle_nb_NO.properties
@@ -37,7 +37,6 @@ mainWindow.error.openingFile = Problem åpning fil
 mainWindow.error.processingFile = Ukjent Unntak mens behandlingen fil
 mainWindow.error.pauseResume = Feil ved forsøk på å stoppe / gjenoppta
 # mainWindow.error.noFirmware = Cannot edit firmware settings until you have connected to the firmware.
-mainWindow.status.alarm = Alarm
-mainWindow.status.hold = Hold
+
 
 # Window title for platform GUI
diff --git a/ugs-core/src/resources/MessagesBundle_nl_NL.properties b/ugs-core/src/resources/MessagesBundle_nl_NL.properties
index 93a46246a..2efeb442d 100644
--- a/ugs-core/src/resources/MessagesBundle_nl_NL.properties
+++ b/ugs-core/src/resources/MessagesBundle_nl_NL.properties
@@ -17,6 +17,7 @@ unknown = onbekend
 macroPanel.button = Uitvoeren
 macroPanel.name = Macro Naam
 macroPanel.description = Macro Omschrijving
+macroPanel.try = macroPanel.try
 mainWindow.helpDialog = Machine Besturing Help
 mainWindow.resetZero = Zet op nul\: Zet de huidige coordinaten op nul, zonder de machine te bewegen.
 mainWindow.returnToZero = Ga naar nul\: Herstel de machine naar de 0, 0, 0 locatie.
@@ -92,6 +93,7 @@ mainWindow.swing.softResetMachineControl = Zachte reset
 mainWindow.swing.stepSizeLabel = X-Y Stap groote\:
 mainWindow.swing.visualizeButton = Visualiseer
 mainWindow.swing.workPositionLabel = Werk positie\:
+mainWindow.swing.macroInstructions = <html>Elke marco kan een aantal GCode opdrachten bevatten, gescheiden met ';'.<br /> Om de macro uit te voeren, klik op de knop 'C' aan de linkerkant.</html>
 mainWindow.swing.inchRadioButton = inches
 mainWindow.swing.mmRadioButton = millimeters
 gcodeTable.command = Opdracht
@@ -106,7 +108,47 @@ firmware.feature.removeWhitespace = verwijder spaties uit opdracht regels
 firmware.feature.linesToArc = converteer bochten naar lijnen
 firmware.feature.statusUpdates = status bijwerken
 firmware.feature.statusUpdateRate = frequentie status bijwerken
+firmware.settings.exportSettingsDefaultName = firmware.settings.exportSettingsDefaultName
+firmware.settings.importSettings = firmware.settings.importSettings
+firmware.settings.importSettingsTitle = firmware.settings.importSettingsTitle
 firmware.settings.importSettingsName = Naam
+firmware.settings.importSettingsDate = firmware.settings.importSettingsDate
+firmware.settings.importSettingsCreatedBy = firmware.settings.importSettingsCreatedBy
+firmware.settings.importSettingsFirmware = firmware.settings.importSettingsFirmware
+firmware.tinyg.setting.short.description.am = firmware.tinyg.setting.short.description.am
+firmware.tinyg.setting.short.description.vm = firmware.tinyg.setting.short.description.vm
+firmware.tinyg.setting.short.description.fr = firmware.tinyg.setting.short.description.fr
+firmware.tinyg.setting.short.description.tn = firmware.tinyg.setting.short.description.tn
+firmware.tinyg.setting.short.description.tm = firmware.tinyg.setting.short.description.tm
+firmware.tinyg.setting.short.description.jm = firmware.tinyg.setting.short.description.jm
+firmware.tinyg.setting.short.description.jh = firmware.tinyg.setting.short.description.jh
+firmware.tinyg.setting.short.description.ra = firmware.tinyg.setting.short.description.ra
+firmware.tinyg.setting.short.description.hi = firmware.tinyg.setting.short.description.hi
+firmware.tinyg.setting.short.description.hd = firmware.tinyg.setting.short.description.hd
+firmware.tinyg.setting.short.description.sv = firmware.tinyg.setting.short.description.sv
+firmware.tinyg.setting.short.description.lv = firmware.tinyg.setting.short.description.lv
+firmware.tinyg.setting.short.description.lb = firmware.tinyg.setting.short.description.lb
+firmware.tinyg.setting.short.description.zb = firmware.tinyg.setting.short.description.zb
+firmware.tinyg.setting.short.description.ma = firmware.tinyg.setting.short.description.ma
+firmware.tinyg.setting.short.description.sa = firmware.tinyg.setting.short.description.sa
+firmware.tinyg.setting.short.description.tr = firmware.tinyg.setting.short.description.tr
+firmware.tinyg.setting.short.description.mi = firmware.tinyg.setting.short.description.mi
+firmware.tinyg.setting.short.description.su = firmware.tinyg.setting.short.description.su
+firmware.tinyg.setting.short.description.po = firmware.tinyg.setting.short.description.po
+firmware.tinyg.setting.short.description.pm = firmware.tinyg.setting.short.description.pm
+firmware.tinyg.setting.short.description.pl = firmware.tinyg.setting.short.description.pl
+firmware.tinyg.group.description.x = firmware.tinyg.group.description.x
+firmware.tinyg.group.description.y = firmware.tinyg.group.description.y
+firmware.tinyg.group.description.z = firmware.tinyg.group.description.z
+firmware.tinyg.group.description.a = firmware.tinyg.group.description.a
+firmware.tinyg.group.description.b = firmware.tinyg.group.description.b
+firmware.tinyg.group.description.c = firmware.tinyg.group.description.c
+firmware.tinyg.group.description.1 = firmware.tinyg.group.description.1
+firmware.tinyg.group.description.2 = firmware.tinyg.group.description.2
+firmware.tinyg.group.description.3 = firmware.tinyg.group.description.3
+firmware.tinyg.group.description.4 = firmware.tinyg.group.description.4
+firmware.tinyg.group.description.5 = firmware.tinyg.group.description.5
+firmware.tinyg.group.description.6 = firmware.tinyg.group.description.6
 sender.header = Verzender Instellingen
 sender.speed.override = Zet snelheids verhoging aan
 sender.speed.percent = Snelheids verhogings percentage
@@ -116,11 +158,16 @@ sender.singlestep = Zet 1-stap modus aan
 sender.whitespace = Verwijder spaties uit opdracht regels
 sender.status = Zet status navragen aan
 sender.status.rate = Status navraag frequentie (ms)
+sender.safety-height = sender.safety-height
 sender.arcs = Converteer bochten naar lijnen
 sender.arcs.threshold = Grenswaarde kleine bochten (mm)
 sender.arcs.length = Lengte kleine bochten (mm)
 sender.autoconnect = Auto verbinden bij opstarten
 sender.autoreconnect = Auto opnieuw verbinden\n
+sender.autostartpendant = afzender.autostartpendant
+sender.notification.nightlyBuild.title = sender.notification.nightlyBuild.title
+sender.notification.nightlyBuild.message = sender.notification.nightlyBuild.message
+sender.notification.nightlyBuild.doNotShowAgain = sender.notification.nightlyBuild.doNotShowAgain
 sender.help.speed.override = Zet snelheids verhoging aan\: Zet de snelheids verhoging aan/uit.
 sender.help.speed.percent = Snelheids verhogings percentage\: de factor waarmee de snelheid verhoogd wordt.
 sender.help.command.length = Maximale opdrachts lengte\: Maximale lengte van een opdracht voordat er een fout optreed.
@@ -139,6 +186,7 @@ sender.help.dialog.title = Verzender Instellingen Help
 communicator.exception.port = Geen driver voor de poort aanwezig/gevonden
 controller.exception.booting = GRBL is nog niet klaar met opstarten.
 controller.exception.sendError = Fout bij verzenden van  '%s'\: %s. Streaming is gepauseerd
+controller.exception.unexpectedError = controller.exception.unexpectedError
 controller.exception.homing = Deze versie ondersteund geen 'homing method'.
 controller.exception.reset = Deze versie ondersteund geen 'coordinate reset'.
 controller.exception.gohome = Deze versie ondersteund geen 'home' coordinaten.
@@ -149,7 +197,9 @@ controller.exception.softreset = Deze versie ondersteund geen 'soft reset'.
 controller.exception.sendingstatus = IO-Uitzondering bij het opvragen van de status.
 controller.exception.rowStatInvalid = Regel teller niet beschikbaar bij ruw bestand lezer
 controller.error.response = Fout, tijdens verwerken van het antwoord
+controller.log.version = GRBL versie
 controller.log.notconnected = Niet aangesloten
+controller.log.error.reported = controller.log.error.rapport
 connection.exception.inuse = Deze poort is al in gebruik bij een ander proces.
 settings.log.location = Locatie Instellings bestand.
 settings.log.loading = Instellingen inladen.
@@ -162,7 +212,9 @@ VisualizerCanvas.width = Breedte
 platform.menu.jog = jog
 platform.menu.jog.size = Stapgrootte
 platform.menu.actions = Akties
+platform.actions.homing.disabled.tooltip = platform.actions.homing.disabled.tooltip
 incomplete.localization = Universal Gcode Sender is niet volledig vertaald in deze taal.\nBezoek https\://translate.universalgcodesender.com voor uw bijdrage
+mainWindow.swing.softReset = Soft reset
 mainWindow.swing.resetX = Reset X as
 mainWindow.swing.resetY = Reset Y as
 mainWindow.swing.resetZ = Reset Z as
@@ -172,12 +224,28 @@ jogging.yPlus = Jog Y+
 jogging.yMinus = Jog Y-
 jogging.zPlus = Jog Z+
 jogging.zMinus = Jog Z-
+jogging.xPlus.yMinus = jogging.xPlus.yMinus
+jogging.xPlus.yPlus = jogging.xPlus.yPlus
+jogging.xMinus.yPlus = jogging.xMinus.yPlus
+jogging.xMinus.yMinus = jogging.xMinus.yMinus
 jogging.divide = Deel door 10
 jogging.multiply = Vermenigvuldig met 10
 jogging.increase = Verhoog
 jogging.decrease = Verlaag
+jogging.divide.z = jogging.divide.z
+jogging.multiply.z = joggen.multiply.z
+jogging.increase.z = joggen.increase.z
+jogging.decrease.z = jogging.decrease.z
+jogging.increase.feed = joggen.verhoog.voeding
+jogging.decrease.feed = joggen.decrease.feed
+jogging.multiply.feed = joggen.multiply.feed
+jogging.divide.feed = joggen.divide.feed
+jogging.units.inch = joggen.eenheden.inch
+jogging.units.mm = joggen.eenheden.mm
+jogging.units.toggle = joggen.eenheden.toggle
 grbl.exception.Alarm = Bestanden versturen is uitgeschakeld als GRBL in alamtoestand is.
 grbl.exception.cancelReset = Timeout bij wachten tot Grbl stopt tijdens cancel, aanvraag onvolledig
+tinyg.exception.unknownVersion = tinyg.exception.unknownVersion
 platform.menu.window = Venster
 platform.menu.classic = Klassiek
 platform.window.dro = Toestand kontroller (DRO)
@@ -202,6 +270,7 @@ platform.window.visualizer.tooltip = 3D weergave van huidige bewerking
 platform.visualizer.color.background = Achtergrondkleur
 platform.visualizer.color.tool = Gereedschapskleur
 platform.visualizer.color.highlight = Editor kleur lijnmarkering
+platform.visualizer.color.linear = Kleur rechtlijnige beweging (G1)
 platform.visualizer.color.rapid = Kleur snelle beweging (G0)
 platform.visualizer.color.arc = Kleur boogvormige beweging (G2/G3)
 platform.visualizer.color.plunge = Kleur Duik/Verhoog beweging 
@@ -212,6 +281,8 @@ platform.visualizer.color.x-axis = Kleur (en doorzichtigheid) van A-as lijn
 platform.visualizer.color.y-axis = Kleur (en doorzichtigheid) van Y-as lijn
 platform.visualizer.color.z-axis = Kleur (en doorzichtigheid) van Z-as lijn
 platform.visualizer.color.sizedisplay = Kleur van grootte weergave lijnen en tekst
+platform.visualizer.color.boundry-base = platform.visualizer.color.boundry-base
+platform.visualizer.color.boundry-sides = platform.visualizer.color.boundry-sides
 
 PendantMenu.item.StartServer = Start ...
 PendantMenu.item.StopServer = Stop ...
@@ -232,6 +303,8 @@ settings.processors.remove = Verwijder selectie
 settings.processors.help = Deze filters verwerken gcode vooraleer te versturen naar kontroller.Sommigen moeten ingeschakeld worden,anderen kunnen uitgeschakeld blijven.De meeste worden geconfigureerd door instellingen in het menu verzendingsinstellingen.Zelfgeschreven filters kunnen toegevoegd worden om specifieke patronen te verwijderen. Vb \:"Td+" verwijdert elke instantie van "T1","T2" etc.
 settings.processors.loadError = Processor kan niet geladen worden
 settings.language = Taal
+settings.connectionDriver = settings.connectionDriver
+settings.workspaceDirectory = settings.workspaceDirectory
 ArcExpander = Boogverlenger
 CommandLengthProcessor = Kommando lengte processor
 CommandSplitter = Kommando splitter
@@ -243,6 +316,12 @@ PatternRemover = Verwijderaar regelmatige expressiepatronen
 WhitespaceProcessor = Spaties verwijderaar
 controller.exception.smoothie.booting = Smoothie is nog niet opgestart
 mainWindow.swing.pendant = Hanger
+platform.visualizer.popup.coordinatesMenu = platform.visualizer.popup.coordinatesMenu
+platform.visualizer.popup.submenu.jogToHere = platform.visualizer.popup.submenu.jogToHere
+platform.visualizer.popup.submenu.jogToHereHint = platform.visualizer.popup.submenu.jogToHereHint
+platform.visualizer.popup.submenu.setWorkOffsetToHere = platform.visualizer.popup.submenu.setWorkOffsetToHere
+platform.visualizer.popup.submenu.setWorkOffsetToHereHint = platform.visualizer.popup.submenu.setWorkOffsetToHereHint
+platform.visualizer.popup.submenu.copyCoordinates = platform.visualizer.popup.submenu.copyCoordinates
 
 mainWindow.error.error = Operatie kan niet worden voltooid
 mainWindow.ui.connectDisconnect = Verbindt of verbreek
@@ -298,9 +377,11 @@ platform.visualizer.renderable.selection = Muis selektie box
 platform.visualizer.renderable.gcode-model-size = Gcode grootte
 platform.visualizer.renderable.tool-location = Lokatie gereedschap
 platform.visualizer.renderable.autolevel-preview = AutoLeveler voorvertoning
+platform.visualizer.renderable.machine-boundries = platform.visualizer.renderable.machine-boundries
 autoleveler.panel.z-surface = Gcode Z oppervlak
 autoleveler.panel.resolution = Resolutie
 autoleveler.panel.use-file = Gebruik geladen bestand
+autoleveler.panel.scan-surface = Skan oppervlakte
 autoleveler.panel.apply = Pas toe in Gcode
 autoleveler.option.z-zero = Z Hoogte van sonde oppervlak in gcode
 autoleveler.option.arc-segment-length = Booglengte (mm)
@@ -309,6 +390,7 @@ autoleveler.option.offset-y = Sonde Y offset
 autoleveler.option.offset-z = Sonde Z offset
 experimental.feature = Dit is een expirimenteel onderdeel.Wees zeer voorzichtig en rapporteer fouten in Github.
 # Window title for platform GUI
+platform-title = Universal Gcode Platform
 mainWindow.swing.alarmLock = Ontgrendel
 mainWindow.swing.checkMode = Kontroleer Wijze
 mainWindow.swing.getState = Bekijk toestand
@@ -325,6 +407,7 @@ parser.gcode.multiple-axis-commands = Meerdere kodes met asaanduidingen per lijn
 parser.gcode.missing-axis-commands = Asaanduiding ontbreekt voor bewegingskommando
 sender.nightly-warning = Vertoon waarschuwings popup voor Nightly Builds
 sender.help.spindle-dwell = Voeg een configureerbare vertraging toe (in seconden) na inschakelen van spindle met "M3" kommando.
+SpindleOnDweller = SpindleOnDweller
 platform.window.dowel-module = Paspen maker
 platform.window.dowel-module.tooltip = Genereer Gcode voor paspennen in verschillende vormen en maten
 platform.plugin.dowel-module.generate = Genereer Gcode
@@ -334,6 +417,62 @@ platform.plugin.dowel-module.dowel = Paspen
 platform.plugin.dowel-module.x = X teller
 platform.plugin.dowel-module.y = Y teller
 platform.plugin.dowel-module.length = Lengte
+platform.plugin.setupwizard.port = platform.plugin.setupwizard.port
+platform.plugin.setupwizard.port-rate = platform.plugin.setupwizard.port-rate
+platform.plugin.setupwizard.connect = platform.plugin.setupwizard.connect
+platform.plugin.setupwizard.unknown-version = platform.plugin.setupwizard.unknown-versie
+platform.plugin.setupwizard.reset-to-zero = platform.plugin.setupwizard.reset-to-zero
+platform.plugin.setupwizard.move = platform.plugin.setupwizard.move
+platform.plugin.setupwizard.home = platform.plugin.setupwizard.home
+platform.plugin.setupwizard.measure = platform.plugin.setupwizard.measure
+platform.plugin.setupwizard.calibrate = platform.plugin.setupwizard.calibrate
+platform.plugin.setupwizard.update = platform.plugin.setupwizard.update
+platform.plugin.setupwizard.update-settings = platform.plugin.setupwizard.update-instellingen
+platform.plugin.setupwizard.connection.title = platform.plugin.setupwizard.connection.title
+platform.plugin.setupwizard.connection.intro = platform.plugin.setupwizard.connection.intro
+platform.plugin.setupwizard.connection.not-supported = platform.plugin.setupwizard.connection.nniet ondersteund
+platform.plugin.setupwizard.connection.connecting = platform.plugin.setupwizard.connection.connecting
+platform.plugin.setupwizard.connection.connected-to = platform.plugin.setupwizard.connection.connected-to
+platform.plugin.setupwizard.import-settings.title = platform.plugin.setupwizard.import-settings.title
+platform.plugin.setupwizard.import-settings.intro = platform.plugin.setupwizard.import-settings.intro
+platform.plugin.setupwizard.import-settings.firmware = platform.plugin.setupwizard.import-settings.firmware
+platform.plugin.setupwizard.import-settings.created-by = platform.plugin.setupwizard.import-settings.created-by
+platform.plugin.setupwizard.import-settings.created-date = platform.plugin.setupwizard.import-settings.created-date
+platform.plugin.setupwizard.import-settings.finished-title = platform.plugin.setupwizard.import-settings.finished-title
+platform.plugin.setupwizard.import-settings.finished-description = platform.plugin.setupwizard.import-settings.finished-description
+platform.plugin.setupwizard.import-settings.open-settings = platform.plugin.setupwizard.import-settings.open-settings
+platform.plugin.setupwizard.import-settings.import = platform.plugin.setupwizard.import-settings.import
+platform.plugin.setupwizard.import-settings.overwrite-message = platform.plugin.setupwizard.import-settings.overwrite-message
+platform.plugin.setupwizard.import-settings.overwrite-title = platform.plugin.setupwizard.import-settings.overwrite-title
+platform.plugin.setupwizard.motor-wiring.title = platform.plugin.setupwizard.motor-bedrading.titel
+platform.plugin.setupwizard.motor-wiring.intro = platform.plugin.setupwizard.motorbedrading.intro
+platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = platform.plugin.setupwizard.motor-bedrading.soft-limieten-ingeschakeld
+platform.plugin.setupwizard.motor-wiring.reverse-direction = platform.plugin.setupwizard.motorbedrading.omgekeerde richting
+platform.plugin.setupwizard.calibration.title = platform.plugin.setupwizard.calibration.title
+platform.plugin.setupwizard.calibration.intro = platform.plugin.setupwizard.calibration.intro
+platform.plugin.setupwizard.calibration.actual-movement = platform.plugin.setupwizard.calibration.actual-movement
+platform.plugin.setupwizard.calibration.adjust = platform.plugin.setupwizard.calibration.adjust
+platform.plugin.setupwizard.calibration.setting = platform.plugin.setupwizard.calibration.setting
+platform.plugin.setupwizard.calibration.computer-speed-warning =  platform.plugin.setupwizard.calibration.computer-speed-waarschuwing
+platform.plugin.setupwizard.limit-switches.title = platform.plugin.setupwizard.limit-switches.title
+platform.plugin.setupwizard.limit-switches.intro = platform.plugin.setupwizard.limit-switches.intro
+platform.plugin.setupwizard.limit-switches.instruction = platform.plugin.setupwizard.limit-switches.instruction
+platform.plugin.setupwizard.limit-switches.not-available = platform.plugin.setupwizard.limit-switches.not-beschikbaar
+platform.plugin.setupwizard.limit-switches.invert = platform.plugin.setupwizard.limit-switches.invert
+platform.plugin.setupwizard.soft-limits.title = platform.plugin.setupwizard.soft-limits.title
+platform.plugin.setupwizard.soft-limits.intro = platform.plugin.setupwizard.soft-limieten.intro
+platform.plugin.setupwizard.soft-limits.instructions = platform.plugin.setupwizard.soft-limieten.instructies
+platform.plugin.setupwizard.soft-limits.require-homing = platform.plugin.setupwizard.soft-limits.require-homing
+platform.plugin.setupwizard.soft-limits.not-available = platform.plugin.setupwizard.soft-limieten.niet-beschikbaar
+platform.plugin.setupwizard.homing.title = platform.plugin.setupwizard.homing.title
+platform.plugin.setupwizard.homing.intro = platform.plugin.setupwizard.homing.intro
+platform.plugin.setupwizard.homing.enable = platform.plugin.setupwizard.homing.enable
+platform.plugin.setupwizard.homing.require-limit-switches = platform.plugin.setupwizard.homing.require-limit-switches
+platform.plugin.setupwizard.homing.not-available = platform.plugin.setupwizard.homing.nniet beschikbaar
+platform.plugin.setupwizard.homing.instruction1 = platform.plugin.setupwizard.homing.instruction1
+platform.plugin.setupwizard.homing.instruction2 = platform.plugin.setupwizard.homing.instruction2
+platform.plugin.setupwizard.homing.try-homing = platform.plugin.setupwizard.homing.try-homing
+platform.plugin.setupwizard.homing.abort = platform.plugin.setupwizard.homing.abort
 gcode.setting.units = Eenheden
 gcode.setting.feed = Voedingssnelheid
 gcode.setting.xy-feed = Voedingssnelheid (XY)
@@ -371,43 +510,49 @@ mainWindow.status.check = Kontroleer
 mainWindow.status.door = Deur
 mainWindow.status.idle = Stationair
 platform.window.diagnostics.tooltip = Interne UGS diagnostics informatie
+platform.visualizer.popup.viewPresets = platform.visualizer.popup.viewPresets
+platform.visualizer.popup.presets.reset = platform.visualizer.popup.presets.reset
+platform.visualizer.popup.presets.top = platform.visualizer.popup.presets.top
+platform.visualizer.popup.presets.left = platform.visualizer.popup.presets.links
+platform.visualizer.popup.presets.front = platform.visualizer.popup.presets.front
+platform.plugin.jog.useSeparateStepSize = platform.plugin.jog.useSeparateStepSize
+platform.plugin.jog.feedRate = platform.plugin.jog.feedRate
+platform.plugin.jog.stepSize = platform.plugin.jog.stepSize
+platform.plugin.jog.stepSizeZ = platform.plugin.jog.stepSizeZ
+platform.plugin.jog.stepSizeXY = platform.plugin.jog.stepSizeXY
+platform.plugin.jog.stepLarger = platform.plugin.jog.stepLarger
 platform.plugin.jog.stepSmaller = Kleiner
-autoleveler.panel.max = Max
-autoleveler.panel.min = Min
-autoleveler.panel.scan-surface = Skan oppervlakte
-autoleveler.panel.view-data = Bekijk Data
-controller.log.realtime = Real time mode
-controller.log.version = GRBL versie
-gcode.g20 = Inch
-help = Help
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-macroPanel.text = GCode
-mainWindow.status.alarm = Alarm
-mainWindow.status.jog = Jog
-mainWindow.status.offline = Off-line
-mainWindow.swing.controlContextTabbedPane.macros = Macros
-mainWindow.swing.firmwareLabel = Firmware\:
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.keyboardMovementPanel = Jog
-mainWindow.swing.macroInstructions = <html>Elke marco kan een aantal GCode opdrachten bevatten, gescheiden met ';'.<br /> Om de macro uit te voeren, klik op de knop 'C' aan de linkerkant.</html>
-mainWindow.swing.softReset = Soft reset
-mainWindow.swing.statusPanel = Machine status
-mainWindow.swing.stopButton = Stop
-overrides.rapid.medium = Medium
-overrides.spindle.short = Spindle
-platform-title = Universal Gcode Platform
-platform.menu.machine = Machine
-platform.menu.macros = Macros
-platform.menu.plugins = Plugins
-platform.plugin.dowel-module.diameter = Diameter
-platform.visualizer.color.linear = Kleur rechtlijnige beweging (G1)
-platform.visualizer.renderable.gcode-model = Gcode
-platform.window.macros = Macros
-probe.measure.inside-corner = Meet binnenhoek
-probe.measure.outside-corner = Meet buitenhoek
-probe.retract-height = Terugtrekhoogte
-probe.z-distance = Sonde Z afstand
-title = Universal Gcode Sender
-visualizer.title = G-Code Visualizer
\ No newline at end of file
+platform.plugin.jog.stealKeyboardFocus = platform.plugin.jog.stealKeyboardFocus
+platform.window.edit.macros = platform.window.edit.macros
+platform.action.outline = platform.action.outline
+platform.plugin.joystick.activate = platform.plugin.joystick.activate
+platform.plugin.joystick.buttonControls = platform.plugin.joystick.buttonControls
+platform.plugin.joystick.analogControls = platform.plugin.joystick.analogControls
+platform.plugin.joystick.clear = platform.plugin.joystick.clear
+platform.plugin.joystick.a = platform.plugin.joystick.a
+platform.plugin.joystick.b = platform.plugin.joystick.b
+platform.plugin.joystick.x = platform.plugin.joystick.x
+platform.plugin.joystick.y = platform.plugin.joystick.y
+platform.plugin.joystick.back = platform.plugin.joystick.back
+platform.plugin.joystick.select = platform.plugin.joystick.select
+platform.plugin.joystick.start = platform.plugin.joystick.start
+platform.plugin.joystick.l1 = platform.plugin.joystick.l1
+platform.plugin.joystick.l2 = platform.plugin.joystick.l2
+platform.plugin.joystick.l3 = platform.plugin.joystick.l3
+platform.plugin.joystick.r1 = platform.plugin.joystick.r1
+platform.plugin.joystick.r2 = platform.plugin.joystick.r2
+platform.plugin.joystick.r3 = platform.plugin.joystick.r3
+platform.plugin.joystick.padUp = platform.plugin.joystick.padUp
+platform.plugin.joystick.padDown = platform.plugin.joystick.padDown
+platform.plugin.joystick.padRight = platform.plugin.joystick.padRight
+platform.plugin.joystick.padLeft = platform.plugin.joystick.padLeft
+platform.plugin.joystick.leftX = platform.plugin.joystick.leftX
+platform.plugin.joystick.leftY = platform.plugin.joystick.leftY
+platform.plugin.joystick.rightX = platform.plugin.joystick.rightX
+platform.plugin.joystick.rightY = platform.plugin.joystick.rightY
+platform.plugin.joystick.action.continuousJogging = platform.plugin.joystick.action.continuousJogging
+platform.plugin.joystick.reverseAxis = platform.plugin.joystick.reverseAxis
+platform.plugin.joystick.axisThreshold = platform.plugin.joystick.axisThreshold
+platform.plugin.cloud.s3Id = platform.plugin.cloud.s3Id
+platform.plugin.cloud.s3Secret = platform.plugin.cloud.s3Secret
+platform.plugin.cloud.open = platform.plugin.cloud.open
diff --git a/ugs-core/src/resources/MessagesBundle_nn_NO.properties b/ugs-core/src/resources/MessagesBundle_nn_NO.properties
index 13e2c397f..170989cdc 100644
--- a/ugs-core/src/resources/MessagesBundle_nn_NO.properties
+++ b/ugs-core/src/resources/MessagesBundle_nn_NO.properties
@@ -89,6 +89,7 @@ mainWindow.swing.softResetMachineControl = Mjuk Tilbakestilling
 mainWindow.swing.stepSizeLabel = XY Stegstorleik
 mainWindow.swing.visualizeButton = Visualiser
 mainWindow.swing.workPositionLabel = Arbeidsposisjon\:
+mainWindow.swing.macroInstructions = <html>Kvar boks kan innehalde ei serie av GKode kommandoar separert av '';''.<br />For å utføre kommandoa, klikk på knappen til venstre for teksen.<br /><br />Interaktiv utbyttingar kan gjerast med\: <br /> <ul><li>{machine_x} - Maskinens X plassering</li><li>{machine_y} - Maskinens Y plassering</li><li>{machine_z} - maskinens Z plassering</li><li>{work_x} - Arbeids X plassering</li><li>{work_y} - Arbeids Y plassering</li><li>{work_z} - Arbeids Z plassering</li><li>{prompt|name} - Spør brukaren etter ei verdi med namnet ''name''.</li></html>
 mainWindow.swing.inchRadioButton = Tommar
 mainWindow.swing.mmRadioButton = Millimeter
 gcodeTable.command = Kommando
@@ -132,6 +133,7 @@ controller.exception.killalarm = Ingen støtte 'kill alarm' låsemetode for denn
 controller.exception.softreset = Mjuktilbakestilling er ikkje støtta for denne versjonen.
 controller.exception.sendingstatus = IOUnntak medan sending av statuskommando.
 controller.exception.rowStatInvalid = Radteljing er ikkje tilgjengeleg med råfillesaren
+controller.log.version = Grbl versjon
 controller.log.realtime = Sanntidsmodus
 controller.log.notconnected = Ikkje tilkopla
 connection.exception.inuse = Porten er allereie i bruk av ei anna prosess
@@ -149,6 +151,7 @@ platform.menu.actions = Handlingar
 platform.menu.macros = Makroar
 platform.menu.machine = Maskin
 incomplete.localization = Universal Gkode sender er ikkje ferdig lokalisert for denne språket.\nBesøk https\://translate.universalgcodesender.com for å sjå korleis du kan hjelpa til.
+mainWindow.swing.softReset = Mjuk tilbakestilling
 mainWindow.swing.resetX = Tilbakestill X Akse
 mainWindow.swing.resetY = Tilbakestill Y Akse
 mainWindow.swing.resetZ = Tilbakestill Z Akse
@@ -224,26 +227,3 @@ platform.visualizer.renderable.machine-boundries = Maskingrenser
 mainWindow.swing.alarmLock = Lås opp
 platform.plugin.dowel-module.length = Lengd
 gcode.g20 = Tomme
-PendantMenu.item.StartServer = Start...
-PendantMenu.item.StopServer = Stop...
-controller.log.version = Grbl versjon
-gcode.g21 = Millimeter
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-mainWindow.status.alarm = Alarm
-mainWindow.status.hold = Hold
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.keyboardMovementPanel = Jog
-mainWindow.swing.macroInstructions = <html>Kvar boks kan innehalde ei serie av GKode kommandoar separert av '';''.<br />For å utføre kommandoa, klikk på knappen til venstre for teksen.<br /><br />Interaktiv utbyttingar kan gjerast med\: <br /> <ul><li>{machine_x} - Maskinens X plassering</li><li>{machine_y} - Maskinens Y plassering</li><li>{machine_z} - maskinens Z plassering</li><li>{work_x} - Arbeids X plassering</li><li>{work_y} - Arbeids Y plassering</li><li>{work_z} - Arbeids Z plassering</li><li>{prompt|name} - Spør brukaren etter ei verdi med namnet ''name''.</li></html>
-mainWindow.swing.pauseButton = Pause
-mainWindow.swing.portLabel = Port\:
-mainWindow.swing.sendButton = Send
-mainWindow.swing.softReset = Mjuk tilbakestilling
-mainWindow.swing.stopButton = Stop
-mainWindow.ui.pauseButton = Pause
-overrides.rapid.full = Full
-overrides.rapid.medium = Medium
-platform.menu.jog = Jog
-platform.plugin.dowel-module.diameter = Diameter
-title = Universal Gcode Sender
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_pl_PL.properties b/ugs-core/src/resources/MessagesBundle_pl_PL.properties
index b09d3e6bc..1756f3caa 100644
--- a/ugs-core/src/resources/MessagesBundle_pl_PL.properties
+++ b/ugs-core/src/resources/MessagesBundle_pl_PL.properties
@@ -72,6 +72,9 @@ mainWindow.swing.pauseButton = Wstrzymaj
 mainWindow.swing.remainingRowsLabel = Pozostało wierszy\:
 mainWindow.swing.remainingTimeLabel = Szacowany czas do zakończenia\:
 mainWindow.swing.resetCoordinatesButton = Resetuj wartości do zera
+action.resetXCoordinatesButton = Kasuj Z do zera
+action.resetYCoordinatesButton = Kasuj Y do zera
+action.resetZCoordinatesButton = Kasuj Z do zera
 mainWindow.swing.returnToZeroButton = Powrót w pozycję zerową
 mainWindow.swing.homeMachine = mainWindow.swing.homeMachine
 mainWindow.swing.rowsLabel = Wierszy w pliku
@@ -80,6 +83,7 @@ mainWindow.swing.sendButton = Wyślij
 mainWindow.swing.sentRowsLabel = Wysłane wiersze\:
 mainWindow.swing.showVerboseOutputCheckBox = Pokaż dokładniejsze dane wyjścia
 mainWindow.swing.showCommandTableCheckBox = Aktywuj tabelę komend
+mainWindow.swing.macroInstructions = <html> Každé pole může obsahovat řadu příkazů G-Kód oddělených znakem '''';''''. <br /> Chcete-li příkaz provést, klikněte na tlačítko vlevo od textu. <br /> <br /> Interaktivní substituce lze provádět with\\\: <br /> <ul> <li> {machine_x} - Umístění stroje X </li> <li> {machine_y} - Umístění stroje Y </li> <li> {machine_z} - Umístění stroje Z </li> <li> {work_x} - Pracovní umístění X </li> <li> {work_y} - Pracovní umístění Y </li> <li> {work_z} - Pracovní umístění Z </li> < li> {prompt | name} - Vyzvěte uživatele k zadání hodnoty s názvem ''''name''''. </li> </html>
 mainWindow.swing.inchRadioButton = Cale
 mainWindow.swing.mmRadioButton = Milimetry
 gcodeTable.command = Komenda
@@ -144,6 +148,7 @@ controller.exception.booting = Grbl nie skończył się uruchamiać
 controller.exception.sendError = Wystąpił błąd podczas wysyłania '%s'\: %s. Wysyłanie zostało wstrzymane.
 controller.exception.unexpectedError = Nastąpił niespodziewany błąd\: %s
 controller.exception.sendingstatus = Błąd We/Wy podczas wysyłania komendy
+controller.log.version = Wersja Grbl
 controller.log.realtime = Tryb czasu rzeczywistego
 controller.log.notconnected = Nie połączono
 controller.log.error.reported = Wystąpił błąd
@@ -170,6 +175,16 @@ macro.substitution = makroodstawienie
 settings.language = Język
 settings.connectionDriver = Sterownik połączenia
 settings.workspaceDirectory = Folder obszaru roboczego
+ArcExpander = ArcExpander
+CommandLengthProcessor = CommandLengthProcessor
+CommandSplitter = CommandSplitter
+CommentProcessor = CommentProcessor
+DecimalProcessor = DecimalProcessor
+FeedOverrideProcessor = FeedOverrideProcessor
+M30Processor = M30Processor
+PatternRemover = PatternRemover
+WhitespaceProcessor = WhitespaceProcessor
+mainWindow.swing.pendant = mainWindow.swing.pendant
 platform.visualizer.popup.coordinatesMenu = Współrzędne\: X\=%s, Y\=%s
 platform.visualizer.popup.submenu.jogToHereHint = Rusz głowicą do wybranej pozycji X/Y. Wysokość Z się nie zmienia
 platform.visualizer.popup.submenu.copyCoordinates = Kopiuj współrzędne
@@ -177,7 +192,9 @@ platform.visualizer.popup.submenu.copyCoordinates = Kopiuj współrzędne
 overrides.feed = przesłanianie
 restart = uruchom ponownie
 platform.visualizer.renderable.machine-boundries = Granice maszyny
+autoleveler.panel.visible = Pokaż AutoLeveler
 # Window title for platform GUI
+platform-title = tytuł platformy
 platform.plugin.setupwizard.port-rate = Prędkość portu\:
 platform.plugin.setupwizard.connect = Połącz
 platform.plugin.setupwizard.unknown-version = Nieznana wersja
@@ -218,12 +235,47 @@ platform.plugin.setupwizard.limit-switches.instruction = Spróbuj wcisnąć każ
 platform.plugin.setupwizard.limit-switches.not-available = Niestety wyłączniki krańcowe nie są dostępne w twoim oprogramowaniu.
 platform.plugin.setupwizard.limit-switches.invert = Odwróć krańcówki
 platform.plugin.setupwizard.homing.abort = Porzuć
+gcode.setting.units = gcode.setting.units
+gcode.setting.feed = 
+gcode.setting.xy-feed = 
+gcode.setting.z-feed = gcode.setting.z-feed
+gcode.setting.endmill-radius = gcode.setting.endmill-radius
+gcode.setting.endmill-diameter = gcode.setting.endmill-diameter
+gcode.setting.safety-height = gcode.setting.safety-height
+gcode.setting.cut-depth = gcode.setting.cut-depth
+platform.window.states = platform.window.states
+platform.window.states.tooltip = 
+platform.plugin.gcode-tools.tiler.window = 
+platform.plugin.gcode-tools.tiler.tooltip = 
+platform.plugin.gcode-tools.tiler.padding = 
+gcode.g20 = gcode.g20
+gcode.g21 = gcode.g21
+gcode.current-motion = gcode.current-motion
+gcode.g0 = gcode.g0
+gcode.g1 = gcode.g1
+gcode.g2 = gcode.g2
+gcode.g3 = gcode.g3
+gcode.g38.2 = gcode.g38.2
+gcode.g38.3 = gcode.g38.3
+gcode.g38.4 = gcode.g38.4
+gcode.g38.5 = gcode.g38.5
+gcode.g80 = gcode.g80
+gcode.distance-mode = gcode.distance-mode
+gcode.g90 = gcode.g90
+gcode.g91 = gcode.g91
+gcode.feed-rate-mode = gcode.feed-rate-mode
+gcode.g93 = gcode.g93
+gcode.g94 = gcode.g94
+gcode.g95 = gcode.g95
+gcode.work-offset = gcode.work-offset
+gcode.plane = gcode.plane
 mainWindow.status.check = Sprawdź
 mainWindow.status.idle = Bezczynny
 mainWindow.status.jog = Bieg
 mainWindow.status.offline = Rozłączony
 platform.window.diagnostics = Diagnostyka UGS
 platform.window.diagnostics.tooltip = Informacja wewnętrznej diagnostyki UGS.
+platform.visualizer.popup.showFeatures = Pokaż właściwości
 platform.visualizer.popup.viewPresets = Pokaż presety
 platform.visualizer.popup.presets.reset = Resetuj widok
 platform.visualizer.popup.presets.top = Góra
@@ -239,16 +291,3 @@ platform.plugin.jog.stepSmaller = Mniejszy
 platform.plugin.jog.stealKeyboardFocus = Sprawdzanie aktywności kontroli klawiaturą
 platform.window.edit.macros = Edytuj makra...
 platform.action.outline = Kontur
-action.resetXCoordinatesButton = Kasuj Z do zera
-action.resetYCoordinatesButton = Kasuj Y do zera
-action.resetZCoordinatesButton = Kasuj Z do zera
-autoleveler.panel.visible = Pokaż AutoLeveler
-controller.log.version = Wersja Grbl
-macroPanel.text = GCode
-mainWindow.status.alarm = Alarm
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.portLabel = Port\:
-platform-title = tytuł platformy
-platform.plugin.setupwizard.port = Port\:
-platform.visualizer.popup.showFeatures = Pokaż właściwości
-title = Universal Gcode Sender
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_pt_BR.properties b/ugs-core/src/resources/MessagesBundle_pt_BR.properties
index 414b3cfb4..9fd24f915 100644
--- a/ugs-core/src/resources/MessagesBundle_pt_BR.properties
+++ b/ugs-core/src/resources/MessagesBundle_pt_BR.properties
@@ -93,6 +93,12 @@ mainWindow.swing.hostLabel = Servidor\:
 mainWindow.swing.remainingRowsLabel = Linhas restantes\:
 mainWindow.swing.remainingTimeLabel = Tempo Restante Estimado\:
 mainWindow.swing.resetCoordinatesButton = Redefine Zero
+action.resetXCoordinatesButton = Redefinir Zero de X
+action.resetYCoordinatesButton = Redefinir Zero de Y
+action.resetZCoordinatesButton = Redefinir Zero de Z
+action.resetACoordinatesButton = Zerar eixo A
+action.resetBCoordinatesButton = Zerar eixo B
+action.resetCCoordinatesButton = Zerar eixo C
 mainWindow.swing.returnToZeroButton = Retorna ao Zero
 mainWindow.swing.homeMachine = Home da Máquina
 mainWindow.swing.openDoor = Abrir porta
@@ -107,6 +113,7 @@ mainWindow.swing.softResetMachineControl = Reset por Software
 mainWindow.swing.stepSizeLabel = Tamanho dos passos em XY\:
 mainWindow.swing.visualizeButton = Visualizar
 mainWindow.swing.workPositionLabel = Trabalho\:
+mainWindow.swing.macroInstructions = <html>Cada caixa pode conter uma série de comandos G-Code separados por '';''.<br /> Para executar o comando, clique no botão à esquerda do texto.<br /><br />Substituições interativas podem ser feitas com\: <br /> <ul><li>{machine_x} - Localização X da máquina</li><li>{machine_y} - Localização Y da máquina</li><li>{machine_z} - Localização Z da máquina</li><li>{work_x} - Localização X de trabalho</li><li>{work_y} - Localização Y de trabalho</li><li>{work_z} - Localização Z de trabalho</li><li>{prompt|name} - Pede ao usuário um valor chamado ''name''.</li></html>
 mainWindow.swing.inchRadioButton = Polegadas
 mainWindow.swing.mmRadioButton = Milímetros
 gcodeTable.command = Comando
@@ -211,6 +218,7 @@ controller.exception.softreset = Esta versão não suporta Reset por Software.
 controller.exception.sendingstatus = Exceção de Entrada/Saída enquanto enviando comando de estado.
 controller.exception.rowStatInvalid = A contagem de linhas não está disponível com o leitor de arquivos raw.
 controller.error.response = Erro enquanto processando a resposta
+controller.log.version = Versão Grbl
 controller.log.realtime = Modo de tempo real
 controller.log.notconnected = Não conectado
 controller.log.error.reported = ocorreu um erro
@@ -317,6 +325,7 @@ platform.visualizer.mouseover = Exibir a posição do mouse
 platform.visualizer.mouseover.desc = Exibir a posição do mouse
 platform.visualizer.orientation.cube = Mostra o cubo de orientação
 platform.visualizer.color.highlight = Cor da Linha com Realce no Editor
+platform.visualizer.color.linear = Cor do Movimento Linear (G1)
 platform.visualizer.color.rapid = Cor do Movimento Rápido (G0)
 platform.visualizer.color.arc = Cor do Movimento Arco (G2/G3)
 platform.visualizer.color.plunge = Cor do Movimento de Baixar/Levantar
@@ -600,6 +609,7 @@ mainWindow.status.jog = Movimento
 mainWindow.status.offline = Desligado
 platform.window.diagnostics = Diagnósticos UGS
 platform.window.diagnostics.tooltip = Informação diagnósticos internos UGS.
+platform.visualizer.popup.showFeatures = Mostrar recursos
 platform.visualizer.popup.viewPresets = Visualizar predefinições
 platform.visualizer.popup.presets.reset = Redefinir vista
 platform.visualizer.popup.presets.top = Superior
@@ -653,25 +663,3 @@ platform.plugin.cloud.s3Secret = Chave de acesso secreto da AWS
 platform.plugin.cloud.open = Abrir arquivo na nuvem
 platform.plugin.toolbox.title=Ferramentas
 platform.plugin.toolbox.tooltip=Ferramentas
-action.resetACoordinatesButton = Zerar eixo A
-action.resetBCoordinatesButton = Zerar eixo B
-action.resetCCoordinatesButton = Zerar eixo C
-action.resetXCoordinatesButton = Redefinir Zero de X
-action.resetYCoordinatesButton = Redefinir Zero de Y
-action.resetZCoordinatesButton = Redefinir Zero de Z
-autoleveler.panel.min = Min
-autoleveler.panel.view-data = Exibir dados
-controller.log.version = Versão Grbl
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-macroPanel.text = GCode
-mainWindow.swing.macroInstructions = <html>Cada caixa pode conter uma série de comandos G-Code separados por '';''.<br /> Para executar o comando, clique no botão à esquerda do texto.<br /><br />Substituições interativas podem ser feitas com\: <br /> <ul><li>{machine_x} - Localização X da máquina</li><li>{machine_y} - Localização Y da máquina</li><li>{machine_z} - Localização Z da máquina</li><li>{work_x} - Localização X de trabalho</li><li>{work_y} - Localização Y de trabalho</li><li>{work_z} - Localização Z de trabalho</li><li>{prompt|name} - Pede ao usuário um valor chamado ''name''.</li></html>
-platform.visualizer.color.linear = Cor do Movimento Linear (G1)
-platform.visualizer.popup.showFeatures = Mostrar recursos
-platform.visualizer.renderable.gcode-model = Gcode
-probe.measure.inside-corner = Medir canto interno
-probe.measure.outside-corner = Medir canto externo
-probe.retract-height = Altura de retração
-probe.z-distance = Distância Z do Probe
-title = Universal Gcode Sender
diff --git a/ugs-core/src/resources/MessagesBundle_ru_RU.properties b/ugs-core/src/resources/MessagesBundle_ru_RU.properties
index ba81cc3d0..d7075a695 100644
--- a/ugs-core/src/resources/MessagesBundle_ru_RU.properties
+++ b/ugs-core/src/resources/MessagesBundle_ru_RU.properties
@@ -89,6 +89,9 @@ mainWindow.swing.portLabel = \#\:
 mainWindow.swing.remainingRowsLabel = Осталось\:
 mainWindow.swing.remainingTimeLabel = Время\:
 mainWindow.swing.resetCoordinatesButton = Обнулить
+action.resetXCoordinatesButton = Сброс X
+action.resetYCoordinatesButton = Сброс Z
+action.resetZCoordinatesButton = Сброс Z
 mainWindow.swing.returnToZeroButton = Вернуться в ноль
 mainWindow.swing.homeMachine = В начало осей
 mainWindow.swing.rowsLabel = Всего\:
@@ -101,6 +104,7 @@ mainWindow.swing.softResetMachineControl = Сброс контроллера
 mainWindow.swing.stepSizeLabel = Размер шага XY
 mainWindow.swing.visualizeButton = 3D вид
 mainWindow.swing.workPositionLabel = Позиция
+mainWindow.swing.macroInstructions = <HTML> Каждый макрос может содержать ряд команд G кодов, разделенных символом ';'<br> Чтобы выполнить команду, нажмите кнопку слева от текста.</html>
 mainWindow.swing.inchRadioButton = Дюймы
 mainWindow.swing.mmRadioButton = Миллиметры
 gcodeTable.command = Команда
@@ -204,6 +208,7 @@ controller.exception.softreset = Не поддерживается програ
 controller.exception.sendingstatus = Ошибка ввода-вывода при отправке команды состояния.
 controller.exception.rowStatInvalid = число строк не доступно при открытии файла.
 controller.error.response = Ошибка при обработке ответа
+controller.log.version = Grbl версия
 controller.log.realtime = Режим реального времени
 controller.log.notconnected = нет соединения
 controller.log.error.reported = Ошибка
@@ -224,6 +229,7 @@ platform.menu.macros = Макрос
 platform.menu.machine = Станок
 platform.actions.homing.disabled.tooltip = Самонаведение должно быть включено в настройках прошивки
 incomplete.localization = Данная программа не полностью локализована для этого языка.\nПожалуйста, посетите https\://translate.universalgcodesender.com, чтобы посмотреть, как вы можете помочь. Перевод SadovovAlex https\://github.com/SadovovAlex
+mainWindow.swing.softReset = Мягкий сброс
 mainWindow.swing.resetX = Обнулить ось X
 mainWindow.swing.resetY = Обнулить ось Y
 mainWindow.swing.resetZ = Обнулить ось Z
@@ -281,6 +287,7 @@ platform.window.visualizer.tooltip = 3D вид для текущей опера
 platform.visualizer.color.background = Цвет фона
 platform.visualizer.color.tool = Цвет инструмента
 platform.visualizer.color.highlight = Настройка цветов подсветки
+platform.visualizer.color.linear = Цвет раб.хода (G1)
 platform.visualizer.color.rapid = Цвет ускор.перем. (G0)
 platform.visualizer.color.arc = Цвет круг.движ. (G2 / G3)
 platform.visualizer.color.plunge = Цвет обработки фрезой
@@ -399,7 +406,9 @@ autoleveler.panel.max = Максимум
 autoleveler.panel.z-surface = УП поверхность Z
 autoleveler.panel.resolution = Разрешение
 autoleveler.panel.use-file = Использовать загруженный файл
+autoleveler.panel.scan-surface = Сканировать поверхность
 autoleveler.panel.apply = Применить к управляющей программе
+autoleveler.panel.visible = Видимый Автоуровень
 autoleveler.option.z-zero = Z высота поверхности зонда в УП
 autoleveler.option.arc-segment-length = Длина сегмента дуговой линии (мм)
 autoleveler.option.offset-x = Смещение зонда X
@@ -407,6 +416,7 @@ autoleveler.option.offset-y = Смещение зонда Y
 autoleveler.option.offset-z = Смещение зонда Z
 experimental.feature = Это экспериментальная особенность. Пожалуйста, будьте осторожны и сообщайте о любых ошибках, которые вы найдете на GitHub.
 # Window title for platform GUI
+platform-title = Universal Gcode Platform
 mainWindow.swing.alarmLock = Разблокировать
 mainWindow.swing.checkMode = Проверка
 mainWindow.swing.getState = Состояние
@@ -529,6 +539,7 @@ mainWindow.status.jog = Ручное
 mainWindow.status.offline = Автономный режим
 platform.window.diagnostics = Диагностика
 platform.window.diagnostics.tooltip = Внутренняя информация о диагностике
+platform.visualizer.popup.showFeatures = Показать особенности
 platform.visualizer.popup.viewPresets = Просмотр пресетов
 platform.visualizer.popup.presets.reset = Сброс вида
 platform.visualizer.popup.presets.top = Верх
@@ -563,34 +574,3 @@ platform.plugin.joystick.action.continuousJogging = Аналоговое упр
 platform.plugin.joystick.reverseAxis = Реверс
 platform.plugin.joystick.axisThreshold = Нулевой порог (%)
 platform.plugin.cloud.open = Открыть облачный файл
-action.resetXCoordinatesButton = Сброс X
-action.resetYCoordinatesButton = Сброс Z
-action.resetZCoordinatesButton = Сброс Z
-autoleveler.panel.scan-surface = Сканировать поверхность
-autoleveler.panel.view-data = Просмотр данных
-autoleveler.panel.visible = Видимый Автоуровень
-controller.log.version = Grbl версия
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.macroInstructions = <HTML> Каждый макрос может содержать ряд команд G кодов, разделенных символом ';'<br> Чтобы выполнить команду, нажмите кнопку слева от текста.</html>
-mainWindow.swing.softReset = Мягкий сброс
-platform-title = Universal Gcode Platform
-platform.plugin.joystick.a = A
-platform.plugin.joystick.b = B
-platform.plugin.joystick.l1 = L1
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.r1 = R1
-platform.plugin.joystick.r2 = R2
-platform.plugin.joystick.r3 = R3
-platform.plugin.joystick.x = X
-platform.plugin.joystick.y = Y
-platform.visualizer.color.linear = Цвет раб.хода (G1)
-platform.visualizer.popup.showFeatures = Показать особенности
-platform.window.dowel-module = Dowel Maker
-probe.measure.inside-corner = Измерить внутренний угол
-probe.measure.outside-corner = Измерить внешний угол
-probe.retract-height = Поднять высоту
-probe.z-distance = Расстояние Зонда Z
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_sk_SK.properties b/ugs-core/src/resources/MessagesBundle_sk_SK.properties
index 3adcb23c5..2ddbcb7b2 100644
--- a/ugs-core/src/resources/MessagesBundle_sk_SK.properties
+++ b/ugs-core/src/resources/MessagesBundle_sk_SK.properties
@@ -151,6 +151,7 @@ controller.exception.checkmode = Pre túto verziu nie je podporovaný režim kon
 controller.exception.softreset = Žiadný podporovaný Softvérový reštart pre túto verziu.
 controller.exception.sendingstatus = IOVýnimka pri odosielaní príkazu o stave.
 controller.error.response = Chyba pri spracovaní odpovede
+controller.log.version = Grbl verzia
 controller.log.realtime = Mód reálneho času
 controller.log.notconnected = Nepripojené
 controller.log.error.reported = Doslo k chybe
@@ -169,6 +170,7 @@ platform.menu.actions = Funkcie
 platform.menu.macros = Makrá
 platform.menu.machine = Stroj
 incomplete.localization = Slovenský preklad pre Universal Gcode Sender nie je dokončený.\nNavštívte stránku https\://translate.universalgcodesender.com kde zistíte, ako môžete pomôcť.
+mainWindow.swing.softReset = Softvérový reštart
 mainWindow.swing.resetX = Resetovať X Os
 mainWindow.swing.resetY = Resetovať Y Os
 mainWindow.swing.resetZ = Resetovať Z Os
@@ -220,6 +222,7 @@ platform.window.visualizer = 3D náhľad
 platform.window.visualizer.tooltip = 3D pohľad na aktuálnu činnosť.
 platform.visualizer.color.background = Farba pozadia
 platform.visualizer.color.tool = Farba nástroja
+platform.visualizer.color.linear = Farba lineárneho posuvu (G1)
 platform.visualizer.color.rapid = Farba rýchleho posuvu (G0)
 platform.visualizer.color.arc = Farba pohybu oblúka (G2/G3)
 platform.visualizer.color.completed = Farba čiar ktoré boli dokončené
@@ -291,7 +294,9 @@ platform.visualizer.renderable.gcode-model-size = Veľkosť G-kódu
 platform.visualizer.renderable.tool-location = Umiestnenie nástroja
 autoleveler.panel.resolution = Rozlíšenie
 autoleveler.panel.use-file = Použiť načítaný súbor
+autoleveler.panel.scan-surface = Sken povrchu
 # Window title for platform GUI
+platform-title = Universal Gcode Platform
 mainWindow.swing.alarmLock = Odomknúť
 mainWindow.swing.checkMode = Režim kontroly
 mainWindow.swing.getState = Zobraziť stav
@@ -385,6 +390,7 @@ mainWindow.status.jog = Voľný pohyb
 mainWindow.status.offline = Off-line\n
 platform.window.diagnostics = UGS Diagnostika
 platform.window.diagnostics.tooltip = Interné UGS diagnostické informácie.
+platform.visualizer.popup.showFeatures = Zobraziť funkcie
 platform.visualizer.popup.viewPresets = Zobraziť predvoľby
 platform.visualizer.popup.presets.reset = Obnoviť pohľad
 platform.visualizer.popup.presets.top = Zhora
@@ -408,48 +414,3 @@ platform.plugin.joystick.reverseAxis = Vzad
 platform.plugin.cloud.s3Id = AWS ID pristupoveho kuca
 platform.plugin.cloud.s3Secret = AWS Tajný Pristupovy Kluc
 platform.plugin.cloud.open = Otvorit Cloudovy subor
-PendantMenu.item.StopServer = Stop...
-autoleveler.panel.max = Max
-autoleveler.panel.min = Min
-autoleveler.panel.scan-surface = Sken povrchu
-autoleveler.panel.view-data = Zobrazenie údajov
-controller.log.version = Grbl verzia
-firmware.settings.importSettingsFirmware = Firmware
-firmware.tinyg.group.description.1 = Motor 1
-firmware.tinyg.group.description.2 = Motor 2
-firmware.tinyg.group.description.3 = Motor 3
-firmware.tinyg.group.description.4 = Motor 4
-firmware.tinyg.group.description.5 = Motor 5
-firmware.tinyg.group.description.6 = Motor 6
-jogging.xMinus.yMinus = Jog\: X- Y-
-jogging.xMinus.yPlus = Jog\: X- Y+
-jogging.xPlus.yMinus = Jog\: X+ Y-
-jogging.xPlus.yPlus = Jog\: X+ Y+
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-macroPanel.text = GCode
-mainWindow.status.alarm = Alarm
-mainWindow.swing.baudLabel = Baud\:
-mainWindow.swing.firmwareLabel = Firmware\:
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.portLabel = Port\:
-mainWindow.swing.reset = Reset
-mainWindow.swing.softReset = Softvérový reštart
-platform-title = Universal Gcode Platform
-platform.plugin.joystick.a = A
-platform.plugin.joystick.b = B
-platform.plugin.joystick.l1 = L1
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.r1 = R1
-platform.plugin.joystick.r2 = R2
-platform.plugin.joystick.r3 = R3
-platform.plugin.joystick.start = Start
-platform.plugin.joystick.x = X
-platform.plugin.joystick.y = Y
-platform.plugin.setupwizard.import-settings.firmware = Firmware\:
-platform.plugin.setupwizard.port = Port\:
-platform.visualizer.color.linear = Farba lineárneho posuvu (G1)
-platform.visualizer.popup.showFeatures = Zobraziť funkcie
-title = Universal Gcode Sender
diff --git a/ugs-core/src/resources/MessagesBundle_sr_CS.properties b/ugs-core/src/resources/MessagesBundle_sr_CS.properties
index c26b6e5eb..e3775e7bf 100644
--- a/ugs-core/src/resources/MessagesBundle_sr_CS.properties
+++ b/ugs-core/src/resources/MessagesBundle_sr_CS.properties
@@ -1,22 +1,26 @@
+version = Verzija
+error = Greska
+success = Uspesno
 close = Zatvori
+save = Snimi
+open = Otvori
+setting = Podesavanja
+value = Vrednost
 description = Opis
-error = Greska
 help = Pomoc
+save.close = Snimi i zatvori
+unknown = Nepoznato
 macroPanel.button = Izvrsi
-macroPanel.description = Opis
 macroPanel.name = Ime makroa
 macroPanel.text = Gcode
-mainWindow.alarmLock = Otkljucaj kontroler\: otkljucavanje kontrolera posle alarma.
+macroPanel.description = Opis
 mainWindow.helpDialog = Pomoc oko kontrole masine
-mainWindow.homing = Pocetni polozaj masine
 mainWindow.resetZero = Resetovanje nule\: koordinate ce biti promenjene na nulu bez pomeranja masine
 mainWindow.returnToZero = Vracanje na nulu\: Masina ce doci na koordinate 0, 0, 0 .
 mainWindow.softReset = Soft reset\: resetovanje cnc kontrolera bez pomeranja masine
-open = Otvori
-save = Snimi
-save.close = Snimi i zatvori
-setting = Podesavanja
-success = Uspesno
-unknown = Nepoznato
-value = Vrednost
-version = Verzija
\ No newline at end of file
+mainWindow.homing = Pocetni polozaj masine
+mainWindow.alarmLock = Otkljucaj kontroler\: otkljucavanje kontrolera posle alarma.
+# mainWindow.error.noFirmware = Cannot edit firmware settings until you have connected to the firmware.
+
+
+# Window title for platform GUI
diff --git a/ugs-core/src/resources/MessagesBundle_sv_SE.properties b/ugs-core/src/resources/MessagesBundle_sv_SE.properties
index 89ed54d77..d1c6cce37 100644
--- a/ugs-core/src/resources/MessagesBundle_sv_SE.properties
+++ b/ugs-core/src/resources/MessagesBundle_sv_SE.properties
@@ -24,8 +24,8 @@ macroPanel.text = Gcode
 macroPanel.description = Makrobeskrivning
 macroPanel.try = Prova
 mainWindow.resetZero = Nollställ koordinater\: Sätter maskinens position till noll utan att göra någon förflyttning.
-mainWindow.returnToZero = Förflytta till noll\: Förflyttar maskinen till position 0, 0, 0
-mainWindow.softReset = Mjuk omstart\: Startar om GRBL utan att uppdatera positionen
+mainWindow.returnToZero = Förflytta till noll\: Förflyttar maskinen till position 0, 0, 0.
+mainWindow.softReset = Mjuk omstart\: Startar om kontrollern utan att uppdatera positionen.
 mainWindow.homing = Återgå hem\: Utför en hempositioneringscykel. Detta kräver Grbl 0.8c för fullt stöd
 mainWindow.alarmLock = Lås upp\: Låser upp larmlåset
 mainWindow.checkMode = Testläge\: Kontrollerar Gcode-koden i GRBL men förflyttar inte maskinen
@@ -42,6 +42,9 @@ mainWindow.status.hold = Håll
 mainWindow.status.queue = Kö
 mainWindow.status.run = Kör
 platform.menu.runFrom = Kör från...
+platform.menu.toggleUnit = Växla enheter
+platform.menu.toggleUnit.tooltip = Växlar önskad enhet i applikationen
+platform.menu.insertPosition = Infoga position
 mainWindow.error.openingFile = Kunde inte öppna filen
 mainWindow.error.processingFile = Okänt IO-fel vid läsning av fil
 mainWindow.error.pauseResume = Fel uppstod vid paus/fortsätt
@@ -66,6 +69,7 @@ mainWindow.swing.arrowMovementEnabled = Aktivera förflyttning med tangentbord
 mainWindow.swing.baudLabel = Baud
 mainWindow.swing.browseButton = Bläddra
 mainWindow.swing.cancelButton = Avbryt
+mainWindow.swing.okButton = OK
 mainWindow.swing.commandLabel = Kommando
 mainWindow.swing.connectionPanel = Anslutning
 mainWindow.swing.controlContextTabbedPane.commands = Kommandon
@@ -77,30 +81,42 @@ mainWindow.swing.fileLabel = Fil
 mainWindow.swing.firmwareLabel = Firmware
 mainWindow.swing.firmwareSettingsMenu = Firmwareinställningar
 mainWindow.swing.grblConnectionSettingsMenuItem = Inställningar
+mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
 mainWindow.swing.keyboardMovementPanel = Jogg
 mainWindow.swing.settingsMenu = Inställningar
 mainWindow.swing.statusPanel = Maskinstatus
 mainWindow.swing.bottomTabbedPane.console = Konsol
 mainWindow.swing.bottomTabbedPane.table = Kommandolista
-mainWindow.swing.latestCommentLabel = Senaste kommandot
+mainWindow.swing.latestCommentLabel = Senaste kommentaren\:
 mainWindow.swing.machinePosition = Maskinens position
 mainWindow.swing.opencloseButton = Öppna
 mainWindow.swing.pauseButton = Pausa
+mainWindow.swing.portLabel = Port\:
+mainWindow.swing.hostLabel = Värd\:
 mainWindow.swing.remainingRowsLabel = Återstående rader\:
 mainWindow.swing.remainingTimeLabel = Återstående tid\:
 mainWindow.swing.resetCoordinatesButton = Nollställ koordinater
+action.resetXCoordinatesButton = Nollställ X
+action.resetYCoordinatesButton = Nollställ Y
+action.resetZCoordinatesButton = Nollställ Z
+action.resetACoordinatesButton = Nollställ A
+action.resetBCoordinatesButton = Nollställ B
+action.resetCCoordinatesButton = Nollställ C
 mainWindow.swing.returnToZeroButton = Förflytta till noll
 mainWindow.swing.homeMachine = Återgå hem
+mainWindow.swing.openDoor = Öppna dörr
 mainWindow.swing.rowsLabel = Antal rader i fil\:
 mainWindow.swing.scrollWindowCheckBox = Skrolla utskrifter i konsol
 mainWindow.swing.sendButton = Skicka
 mainWindow.swing.sentRowsLabel = Skickade rader\:
 mainWindow.swing.showVerboseOutputCheckBox = Använd utökad loggning
+mainWindow.swing.clearOutput = Rensa
 mainWindow.swing.showCommandTableCheckBox = Aktivera kommandotabell
 mainWindow.swing.softResetMachineControl = Mjuk omstart
 mainWindow.swing.stepSizeLabel = XY stegstorlek
 mainWindow.swing.visualizeButton = Visualisera
 mainWindow.swing.workPositionLabel = Arbetsposition\:
+mainWindow.swing.macroInstructions = <html>Varje ruta kan innehålla en serie med Gcode-kommandon separerade med '';''.<br />För att exekvera ett kommando, klicka på knappen bredvid till vänster.<br /><br />Variabelvärden kan läggas in med\: <br /> <ul><li>{machine_x} - Maskinens X-position</li><li>{machine_y} - Maskinens Y-position</li><li>{machine_z} - Maskinens Z-position</li><li>{work_x} - X-arbetsposition</li><li>{work_y} - Y-arbetsposition</li><li>{work_z} - Z-arbetsstation</li><li>{prompt|name} - Fråga användaren om ett värde för variabeln ''name''.</li></html>
 mainWindow.swing.inchRadioButton = Tum
 mainWindow.swing.mmRadioButton = Millimeter
 gcodeTable.command = Kommando
@@ -121,6 +137,7 @@ firmware.settings.importSettingsTitle = Importera inställningsfil
 firmware.settings.importSettingsName = Namn
 firmware.settings.importSettingsDate = Datum
 firmware.settings.importSettingsCreatedBy = Skapad av
+firmware.settings.importSettingsFirmware = Firmware
 firmware.tinyg.setting.short.description.vm = Maxhastiget
 firmware.tinyg.setting.short.description.fr = Max matningshastighet
 firmware.tinyg.setting.short.description.tn = Minsta förflyttning
@@ -155,7 +172,7 @@ firmware.tinyg.group.description.4 = Motor 4
 firmware.tinyg.group.description.5 = Motor 5
 firmware.tinyg.group.description.6 = Motor 6
 sender.header = Inställningar för skicka
-sender.speed.override = Aktivera hastighetsöver
+sender.speed.override = Aktivera hastighetsöverskridning
 sender.speed.percent = Överridning av hastighet i procent
 sender.command.length = Kommandons maxlängd
 sender.truncate = Trunkera decimaler
@@ -169,7 +186,7 @@ sender.arcs.threshold = Tröskelvärde för båge (mm)
 sender.arcs.length = Bågens längd på segment (mm)
 sender.autoconnect = Anslut automatiskt vid uppstart
 sender.autoreconnect = Automatisk återanslutning
-sender.autostartpendant = Starta pendant automatiskt
+sender.autostartpendant = Starta fjärrkontrollen automatiskt
 sender.invertMouseZoom = Invertera musens zoom
 sender.notification.nightlyBuild.title = Nattligt bygge
 sender.notification.nightlyBuild.message = Denna version av Universal Gcode Sender är ett nattligt bygge.\nDen innehåller de senaste funktionerna och förbättringarna, men den kan även innehålla buggar som fortfarande behöver åtgärdas.\n\nOm stöter på några problem, rapportera detta på github.
@@ -186,7 +203,7 @@ sender.help.state = Färg för display\: Visar en särskild färg för att indik
 sender.help.arcs = Konvertera bågar till linjer\: Konverterar kommandon för bågar (G2/G3) till flera G1-kommandon
 sender.help.arcs.threshold = Tröskelvärde för båge\: Den minsta längden (i mm) innan bågar konverteras till G1-kommandon
 sender.help.arcs.length = Bågens längd på segment\: Längden på segmentent (i mm) för ett konverterat segment
-sender.help.autoconnect = Ansluter till den senast användna kontrollern vid uppstart.
+sender.help.autoconnect = Ansluter till den senast använda kontrollern vid uppstart.
 sender.help.autoreconnect = Återanslut till kontrollern vid en avbruten anslutning
 sender.help.dialog.title = Hjälp
 communicator.exception.port = Ingen anslutningsdrivrutin hittades för porten
@@ -203,9 +220,16 @@ controller.exception.softreset = Stöd för mjuk omstart saknas i denna version.
 controller.exception.sendingstatus = Ett IO-fel uppstod när statuskommando skulle skickas.
 controller.exception.rowStatInvalid = Antal rader kan inte hämtas när "raw file reader" används.
 controller.error.response = Ett fel uppstod vid tolkning av svar från kontrollern
+controller.log.version = GRBL-version
 controller.log.realtime = Realtidsläge
 controller.log.notconnected = Inte ansluten
 controller.log.error.reported = Ett fel har uppstått
+controller.cancel.send = Avbryter filöverföringen
+controller.resume.send = Återupptar filöverföringen
+controller.pause.send = Pausa filöverföringen
+controller.finished.send = Skickade filen på
+controller.connected.to = Ansluten till
+controller.connection.closed = Anslutningen stängdes
 connection.exception.inuse = Porten används redan av ett annat program.
 settings.log.location = Plats för inställningar
 settings.log.loading = Laddar inställningar.
@@ -218,15 +242,19 @@ VisualizerCanvas.height = höjd
 VisualizerCanvas.width = bredd
 platform.menu.jog = Jogg
 platform.menu.jog.size = Steglängd
+platform.menu.jog.feed = Matningshastighet
 platform.menu.actions = Aktiviteter
 platform.menu.macros = Makron
 platform.menu.machine = Maskin
 platform.actions.program.not.saved.message = Du måste spara filen först
 platform.actions.program.not.saved.title = Inte sparad
 platform.actions.homing.disabled.tooltip = Hempositionering behöver aktiveras i firmwareinställningarna
+platform.actions.unlock.tooltip = Rensa larmläget och lås upp maskinen
+platform.actions.softreset.tooltip = Starta om kontrollern
 incomplete.localization.title = Inte fullt översatt
 incomplete.localization = Universal Gcode Sender har inte en komplett översättning för detta språk. Gå till https\://translate.universalgcodesender.com för att hjälpa till.
 incomplete.localization.doNotShowAgain = Visa inte detta meddelande igen
+mainWindow.swing.softReset = Mjuk omstart
 mainWindow.swing.resetX = Nollställ X-axeln
 mainWindow.swing.resetY = Nollställ Y-axeln
 mainWindow.swing.resetZ = Nollställ Z-axeln
@@ -263,6 +291,7 @@ jogging.decrease.feed = Minska matningshastighet
 jogging.multiply.feed = Multiplicera matningshastighet med 10
 jogging.divide.feed = Dividera matningshastighet med 10
 jogging.units.inch = Jog\: TUM
+jogging.units.mm = Jogg\: MM
 jogging.units.toggle = Jog\: Växla enheter
 grbl.exception.Alarm = Filström är inaktiverad när GRBL har fått ett larm
 grbl.exception.cancelReset = För lång tid har passerat i väntan på återställning, återställning har inte slutförts korrekt.
@@ -291,9 +320,32 @@ platform.window.serialconsole.tooltip = Visa meddelanden som skickas och tas emo
 platform.window.visualizer = Visualisering
 platform.window.visualizer.tooltip = 3D-vy av aktuellt kommando
 platform.window.fileBrowser = Filhanterare
+platform.window.fileBrowser.tooltip = Ladda en mapp för att visa och arbeta med filer.
+platform.visualizer.edit.options.title = Visualiseringsinställningar
+platform.visualizer.legacy = Använd den äldre renderingsmotorn
+platform.visualizer.legacy.desc = Använd den gamla äldre renderingsmotorn vid kompatibilitetsproblem
 platform.visualizer.color.background = Bakgrundsfärg
+platform.visualizer.tool = Visa verktygets position
 platform.visualizer.color.tool = Verktygsfärg
+platform.visualizer.tool.desc = Visar verktygets position
+platform.visualizer.model = Visa modell
+platform.visualizer.model.desc = Visar verktygsbanan för modellen
+platform.visualizer.mouseover = Visar muspekarens position
+platform.visualizer.mouseover.desc = Visar muspekarens position
+platform.visualizer.orientation.cube = Visar orienteringskuben
+platform.visualizer.orientation.cube.desc = Visar scenens orientering med hjälp av en 3D-kub
+platform.visualizer.selection = Visa markerade linjer
+platform.visualizer.selection.desc = Visar de markerade raderna från redigeraren
+platform.visualizer.size.display = Visa storleken
+platform.visualizer.size.display.desc = Visar modellstorleken i den valda enheten
+platform.visualizer.editor.position = Visa redigerarens position
+platform.visualizer.editor.position.desc = Visar positionen för den valda raden i redigeraren
+platform.visualizer.probe.preview = Visa prob
+platform.visualizer.probe.preview.desc = Visar förhandsgranskning för probning
+platform.visualizer.dowel.preview = Visa förhandsgranskning av plugg
+platform.visualizer.dowel.preview.desc = Visa förhandsgranskning av plugg
 platform.visualizer.color.highlight = Redigerare markeringsfärg
+platform.visualizer.color.linear = Färg för linjär förflyttning
 platform.visualizer.color.rapid = Färg för snabb förflyttning
 platform.visualizer.color.arc = Färg för förflyttning i en båge
 platform.visualizer.color.plunge = Färg för höjning/säkning
@@ -310,6 +362,11 @@ platform.visualizer.color.z-axis = Färg (och transparens) för Z-axel.
 platform.visualizer.color.sizedisplay = Färg för displayens linjer och text.
 platform.visualizer.color.boundry-base = Färg för maskinens botten
 platform.visualizer.color.boundry-sides = Färg för maskinens sidor
+platform.visualizer.boundary.desc = Visar maskinens gräns som en begränsningsruta. Gränsens storlek och position bestäms av kontrollerns inställningar.
+platform.visualizer.boundary.invert.x = Invertera maskingränsen för X
+platform.visualizer.boundary.invert.y = Invertera maskingränsen för Y
+platform.visualizer.boundary.invert.z = Invertera maskingränsen för Z
+platform.visualizer.boundary.invert.desc = På vissa kontrollrar är maskinen max/min inverterad vilket gör att maskingränser visas på fel plats. Använd denna inställning för att invertera dem.
 
 PendantMenu.item.StartServer = Starta...
 PendantMenu.item.StopServer = Stoppa...
@@ -319,6 +376,7 @@ parser.processor.arc.start-error = Det finns ingen startpunkt så bågen kunde i
 parser.processor.arc.multiple-commands = Flera kommandon upptäcktes på samma rad när en båge skulle behandlas. Kan ej fortsätta. Verktyget för att dela upp kommandon kan användas för att fortsätta.
 sender.help.commandSplitter = Splittra Gcode-kommandon i flera delar för bättre felrapporter.
 sender.help.patternRemover = Tar bort text som matchar reguljärt utryck
+sender.help.empty-line-remover = Tar bort tomma rader från gcode-filen
 controller.exception.ignoreFutureErrors = Vill du skippa kommandon likt denna i fortsättningen?
 settings.processors.header = Konfiguration för bearbetning av Gcode
 settings.file.outOfDate.title = Inställningar är inte aktuella
@@ -332,6 +390,9 @@ settings.processors.loadError = Kunde inte starta behandling
 settings.language = Språk
 settings.connectionDriver = Anslutningsdrivrutin
 settings.workspaceDirectory = Projektkatalog
+settings.help.disableAxis = Varje inaktiverad axel tas bort om möjligt
+settings.disableAxis = Inaktivera axel\: %s
+settings.pendantPort = Port för fjärrkontroll
 ArcExpander = Expandera bågar
 CommandLengthProcessor = Kommandolängdsbearbetning
 CommandSplitter = Kommandosplittrare
@@ -342,6 +403,7 @@ M30Processor = M30 borttagning
 PatternRemover = Borttagning genom reguljära uttryck
 WhitespaceProcessor = Blankstegsborttagning
 controller.exception.smoothie.booting = Smoothie är inte klar med uppstarten
+mainWindow.swing.pendant = Fjärrkontroll
 platform.visualizer.popup.coordinatesMenu = Koordinater\: X\=%s, Y\=%s
 platform.visualizer.popup.submenu.jogToHere = Jogga hit
 platform.visualizer.popup.submenu.jogToHereHint = Förflytta till vald X/Y-position. Ändrar inte Z-positionen.
@@ -357,6 +419,8 @@ toolbar.icon.small = Små ikoner
 toolbar.icon.large = Stora ikoner
 sender.help.verbose.console = Visa utökad information i konsolen
 platform.menu.open = Öppna Gcodefil...
+platform.menu.open.recent = Öppna senaste
+platform.menu.save = Spara
 platform.menu.edit = Redigera Gcodefil...
 mainWindow.swing.reset = Nollställ
 machineStatus.pin.x = X
@@ -375,6 +439,7 @@ controller.exception.unexpectedCommand = Ett okänt kommando slutfördes av kont
 platform.window.probe = Probverktyg
 platform.window.probe.tooltip = Verktyg för att nollställa maskinen med prob
 probe.feed-rate = Probhastighet
+probe.scan-rate = Snabb probhastighet
 probe.probe-distance = Avstånd för prob
 probe.plane = Probaxel
 probe.plate-thickness = Tjocklek för probplatta
@@ -394,6 +459,7 @@ overrides.rapid.full = Stor
 overrides.mist = Spray-kylning
 overrides.flood = Kylningsmedel
 overrides.toggle.short = Toggla
+overrides.not.supported = Den här kontrollern stödjer inte överridningar
 restart = En omstart krävs
 platform.window.restart.changed.settings = <html><a href\="\#">Klicka här för att starta om och börja använda de nya inställningarna.
 mainWindow.ui.connect = Anslut
@@ -420,12 +486,21 @@ autoleveler.panel.max = Max
 autoleveler.panel.z-surface = Gcode Z yta
 autoleveler.panel.resolution = Noggrannhet
 autoleveler.panel.use-file = Använd laddad fil
+autoleveler.panel.scan-surface = Skanna ytan
 autoleveler.panel.apply = Applicera till Gcode
+autoleveler.panel.overwrite = Vill du ersätta nuvarande probdata?
+autoleveler.panel.visible = Visa AutoLeveler
 autoleveler.option.z-zero = Z höjd för probe av yta i gcode
+autoleveler.panel.generate-test-date = Generera testdata
+autoleveler.panel.open = Öppna skanning
+autoleveler.panel.save = Spara skanning
 autoleveler.option.arc-segment-length = Längd på bågar (mm)
 autoleveler.option.offset-x = Proba X offset
 autoleveler.option.offset-y = Proba Y offset
 autoleveler.option.offset-z = Proba Z offset
+autoleveler.probe-failed = Probe misslyckades
+autoleveler.panel.clear = Rensa skanning
+autoleveler.panel.export = Exportera GCode
 experimental.feature = Detta är en experimentell funktion. Använd försiktighet och rapportera eventuella buggar på GitHub
 # Window title for platform GUI
 platform-title = Universal Gcode Sender
@@ -435,12 +510,29 @@ mainWindow.swing.getState = Hämta status
 platform.window.probe-module = Probemodul
 platform.window.probe-module.tooltip = Ett antal verktyg för att hantera probning.
 probe.find-rate = Snabb sökhastighet
+probe.find-rate.tooltip = Den snabba mäthastigheten för proben
 probe.measure-rate = Sökhastighet
+probe.measure-rate.tooltip = Den långsamma mäthastigheten för proben
 probe.x-distance = Avstånd X för prob
 probe.y-distance = Avstånd Y för prob
 probe.retract-amount = Avstånd för tillbakadragning
+probe.retract-amount.tooltip = Avstånd att dra tillbaka efter den snabba probningen innan den långsamma probningen körs
 probe.hole-diameter = Ungefärlig håldiameter
+probe.hole-center-hint = Flytta proben in i hålets ungefärliga centrum
+probe.work-coordinates = Arbetskoordinater
+probe.action.settings = Inställningar...
+probe.action.z = Proba och nollställ Z
+probe.action.z.confirmation = Är du säker på att du vill proba Z med nuvarande inställningar?
+probe.action.xy = Proba och nollställ XY
+probe.action.xy.confirmation = Är du säker på att du vill proba XY med nuvarande inställningar?
+probe.action.xyz = Proba och nollställ XYZ
+probe.action.xyz.confirmation = Är du säker på att du vill proba XYZ med nuvarande inställningar?
+probe.action.hole-center = Proba och nollställ i hålets centrum
+probe.action.hole-center.confirmation = Är du säker på att du vill proba hålet med nuvarande inställningar?
+probe.action.tooltip.disabled = Maskinen måste vara ansluten och inaktiv för att kunna använda probning
+probe.action.tooltip.enabled = Tryck start för att starta probning
 probe.visualizer.corner-preview = Förhandsgranskning av hörnprobning
+probe.visualizer.hole-center-preview = Förhandsgranskning av probning
 probe.visualizer.z-preview = Förhandsgranskning av Z-probning
 parser.gcode.multiple-axis-commands = Multipla kommandon kräver axis-ord på en rad
 parser.gcode.missing-axis-commands = Axis-ord saknas för förflyttnings-kommando
@@ -455,6 +547,7 @@ platform.plugin.dowel-module.preview = Förhandsgranskning av träplugg
 platform.plugin.dowel-module.dowel = Träplugg
 platform.plugin.dowel-module.x = X antal
 platform.plugin.dowel-module.y = Y antal
+platform.plugin.dowel-module.diameter = Diameter
 platform.plugin.dowel-module.length = Längd
 platform.plugin.setupwizard.port = Port\:
 platform.plugin.setupwizard.port-rate = Hastighet\:
@@ -600,10 +693,16 @@ platform.plugin.joystick.leftX = Vänster joystick X
 platform.plugin.joystick.leftY = Vänster joystick Y
 platform.plugin.joystick.rightX = Höger joystick X
 platform.plugin.joystick.rightY = Höger joystick Y
+platform.plugin.joystick.misc1 = Övrigt 1
+platform.plugin.joystick.paddle1 = Paddel 1
+platform.plugin.joystick.paddle2 = Paddel 2
+platform.plugin.joystick.paddle3 = Paddel 3
+platform.plugin.joystick.paddle4 = Paddel 4
 platform.plugin.joystick.touchpad = Pekplatta
 platform.plugin.joystick.action.continuousJogging = Analog jogg
 platform.plugin.joystick.reverseAxis = Invertera
 platform.plugin.joystick.axisThreshold = Nolltröskel (%)
+platform.plugin.joystick.axisThreshold.description = Du måste öka nolltröskeln om de analoga kontrollerna rapporterar rörelse när de är i en vilande position.
 platform.plugin.joystick.customMappings = Egna mappningar
 platform.plugin.joystick.customMappings.title = Ändra anpassade kontrollmappningar
 platform.plugin.joystick.connectedTo = Ansluten till
@@ -639,36 +738,3 @@ platform.plugin.designer.clipart.weather=Väder
 platform.plugin.console.title=Konsol
 platform.plugin.console.action.verbose.disable = Inaktivera utökad loggning
 platform.plugin.console.action.verbose.enable = Aktivera utökad loggning
-action.resetACoordinatesButton = Nollställ A
-action.resetBCoordinatesButton = Nollställ B
-action.resetCCoordinatesButton = Nollställ C
-action.resetXCoordinatesButton = Nollställ X
-action.resetYCoordinatesButton = Nollställ Y
-action.resetZCoordinatesButton = Nollställ Z
-autoleveler.panel.scan-surface = Skanna ytan
-autoleveler.panel.view-data = Visa data
-autoleveler.panel.visible = Visa AutoLeveler
-controller.log.version = GRBL-version
-firmware.settings.importSettingsFirmware = Firmware
-firmware.tinyg.setting.short.description.am = Axis mode
-jogging.units.mm = Jog\: MM
-mainWindow.helpDialog = Machine Control Help
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.macroInstructions = <html>Varje ruta kan innehålla en serie med Gcode-kommandon separerade med '';''.<br />För att exekvera ett kommando, klicka på knappen bredvid till vänster.<br /><br />Variabelvärden kan läggas in med\: <br /> <ul><li>{machine_x} - Maskinens X-position</li><li>{machine_y} - Maskinens Y-position</li><li>{machine_z} - Maskinens Z-position</li><li>{work_x} - X-arbetsposition</li><li>{work_y} - Y-arbetsposition</li><li>{work_z} - Z-arbetsstation</li><li>{prompt|name} - Fråga användaren om ett värde för variabeln ''name''.</li></html>
-mainWindow.swing.openDoor = Öppna dörr
-mainWindow.swing.pendant = Pendant
-mainWindow.swing.portLabel = Port\:
-mainWindow.swing.softReset = Mjuk omstart
-platform.menu.save = Spara
-platform.plugin.dowel-module.diameter = Diameter
-platform.plugin.setupwizard.import-settings.firmware = Firmware\:
-platform.visualizer.color.linear = Färg för linjär förflyttning
-platform.visualizer.renderable.gcode-model = Gcode
-platform.window.autoleveler = AutoLeveler
-probe.measure.inside-corner = Mät hörnets insida
-probe.measure.outside-corner = Mät hörnets utsida
-probe.retract-height = Höjd för tillbakadrag
-probe.z-distance = Avstånd Z för prob
-settings.disableAxis = Inaktivera axel\: %s
-settings.help.disableAxis = Varje inaktiverad axel tas bort om möjligt
-settings.pendantPort = Port för pendant
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_tr_TR.properties b/ugs-core/src/resources/MessagesBundle_tr_TR.properties
index bada2f520..4897f4782 100644
--- a/ugs-core/src/resources/MessagesBundle_tr_TR.properties
+++ b/ugs-core/src/resources/MessagesBundle_tr_TR.properties
@@ -80,6 +80,9 @@ mainWindow.swing.pauseButton = Duraklat
 mainWindow.swing.remainingRowsLabel = Kalan Satırlar\:
 mainWindow.swing.remainingTimeLabel = Tahmini Kalan Süre\:
 mainWindow.swing.resetCoordinatesButton = Sıfırlama
+action.resetXCoordinatesButton = X Sıfırını Resetle
+action.resetYCoordinatesButton = Y Sıfırını Resetle
+action.resetZCoordinatesButton = Z Sıfırını Resetle
 mainWindow.swing.returnToZeroButton = Sıfıra Dön
 mainWindow.swing.homeMachine = Makine Başlangıcı
 mainWindow.swing.rowsLabel = Dosyadaki Satırlar\:
@@ -92,6 +95,7 @@ mainWindow.swing.softResetMachineControl = Yumuşak Reset
 mainWindow.swing.stepSizeLabel = XY Adım boyu\:
 mainWindow.swing.visualizeButton = Canlandırma
 mainWindow.swing.workPositionLabel = Çalışma Pozisyonu\:
+mainWindow.swing.macroInstructions = <html>Her kutu, bir GKod komutu dizisi içerebilir '';''.<br />Komutu çalıştırmak için metnin solundaki düğmeyi tıklayın.<br /><br />Etkileşimli değiştirmeler şu alanlarla yapılabilir\: <br /> <ul><li>{machine_x} - Makine X konumu</li><li>{machine_y} - Makine Y konumu</li><li>{machine_z} - Makine Z konumu</li><li>{work_x} - Çalışma X konumu</li><li>{work_y} - Çalışma Y konumu</li><li>{work_z} - Çalışma Z konumu</li><li>{prompt|name} - Kullanıcıya ''name'' adını sor.</li></html>
 mainWindow.swing.inchRadioButton = İnc
 mainWindow.swing.mmRadioButton = Milimetre
 gcodeTable.command = Komut
@@ -152,6 +156,7 @@ controller.exception.softreset = Bu versiyonda yumuşak sıfırlama desteklenmiy
 controller.exception.sendingstatus = Durum komutu gönderilirken IO istisnası.
 controller.exception.rowStatInvalid = Satır sayısı, ham dosya okuyucusu ile kullanılamaz.
 controller.error.response = Yanıt hazırlanırken hata oluştu.
+controller.log.version = Grbl sürümü
 controller.log.realtime = Gerçek zamanlı mod
 controller.log.notconnected = Bağlanamadı
 connection.exception.inuse = Bu port zaten başka bir işleme ait.
@@ -171,6 +176,7 @@ platform.menu.macros = Makrolar
 platform.menu.machine = Makine
 platform.actions.homing.disabled.tooltip = Program ayarlarında başlangıç noktasına dönüş etkinleştirilmeli
 incomplete.localization = Genel Gkod taşıyıcısı bu dilde tam yerelleştirilememiştir. Lütfen nasıl yardım edebileceğinizi görmek için https\://translate.universalgcodesender.com sitesini ziyaret edin.
+mainWindow.swing.softReset = Yumuşak Sıfırlama
 mainWindow.swing.resetX = X Eksenini Sıfırla
 mainWindow.swing.resetY = Y Eksenini Sıfırla
 mainWindow.swing.resetZ = Z Eksenini Sıfırla
@@ -222,6 +228,7 @@ platform.window.visualizer.tooltip = Mevcut operasyonun 3D görünümü.
 platform.visualizer.color.background = Arka plan rengi
 platform.visualizer.color.tool = Uç Rengi
 platform.visualizer.color.highlight = Düzenleyici Hattı Vurgulama Rengi
+platform.visualizer.color.linear = Düz İlerleme Rengi (G1)
 platform.visualizer.color.rapid = Hızlı Hareket Rengi (G0)
 platform.visualizer.color.arc = Yay Hareket Rengi (G2/G3)
 platform.visualizer.color.plunge = Dalma/Çıkma Hareket Rengi
@@ -320,6 +327,7 @@ autoleveler.panel.min = Minimum
 autoleveler.panel.max = Maksimum
 autoleveler.panel.z-surface = G Kod Z Düzlemi
 autoleveler.panel.use-file = Yüklenen Dosyayı Kullan
+autoleveler.panel.scan-surface = Yüzeyi Tara
 autoleveler.panel.apply = G Kodu Uygula
 autoleveler.option.z-zero = Prob Yüzeyinin G Koddaki Z Yüksekliği
 # Window title for platform GUI
@@ -355,6 +363,7 @@ gcode.g95 = Devir Bsşına Birim
 gcode.plane = Aktif Düzlem
 mainWindow.status.idle = Boşta
 mainWindow.status.offline = Çevrim Dışı
+platform.visualizer.popup.showFeatures = Özellikleri Göster
 platform.visualizer.popup.presets.reset = Görüntüyü Resetle
 platform.visualizer.popup.presets.top = Üst
 platform.visualizer.popup.presets.left = Sol
@@ -367,28 +376,3 @@ platform.plugin.jog.stepSizeXY = XY Adım Miktarı
 platform.plugin.jog.stepLarger = Daha Büyük
 platform.plugin.jog.stepSmaller = Daha Küçük
 platform.plugin.jog.stealKeyboardFocus = Klavye kontrollerinin etkin olduğundan emin olun
-action.resetXCoordinatesButton = X Sıfırını Resetle
-action.resetYCoordinatesButton = Y Sıfırını Resetle
-action.resetZCoordinatesButton = Z Sıfırını Resetle
-autoleveler.panel.scan-surface = Yüzeyi Tara
-controller.log.version = Grbl sürümü
-jogging.units.mm = Jog\: MM
-jogging.xMinus.yMinus = Jog\: X- Y-
-jogging.xMinus.yPlus = Jog\: X- Y+
-jogging.xPlus.yMinus = Jog\: X+ Y-
-jogging.xPlus.yPlus = Jog\: X+ Y+
-machineStatus.pin.softReset = Soft Reset
-machineStatus.pin.x = X
-machineStatus.pin.y = Y
-machineStatus.pin.z = Z
-mainWindow.status.alarm = Alarm
-mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
-mainWindow.swing.macroInstructions = <html>Her kutu, bir GKod komutu dizisi içerebilir '';''.<br />Komutu çalıştırmak için metnin solundaki düğmeyi tıklayın.<br /><br />Etkileşimli değiştirmeler şu alanlarla yapılabilir\: <br /> <ul><li>{machine_x} - Makine X konumu</li><li>{machine_y} - Makine Y konumu</li><li>{machine_z} - Makine Z konumu</li><li>{work_x} - Çalışma X konumu</li><li>{work_y} - Çalışma Y konumu</li><li>{work_z} - Çalışma Z konumu</li><li>{prompt|name} - Kullanıcıya ''name'' adını sor.</li></html>
-mainWindow.swing.portLabel = Port\:
-mainWindow.swing.reset = Reset
-mainWindow.swing.softReset = Yumuşak Sıfırlama
-platform.visualizer.color.linear = Düz İlerleme Rengi (G1)
-platform.visualizer.popup.showFeatures = Özellikleri Göster
-probe.retract-height = Geri Çekme Yüksekliği
-probe.z-distance = Prob Z Mesafesi
-title = Universal Gcode Sender
\ No newline at end of file
diff --git a/ugs-core/src/resources/MessagesBundle_uk_UA.properties b/ugs-core/src/resources/MessagesBundle_uk_UA.properties
index 042343160..340a8f384 100644
--- a/ugs-core/src/resources/MessagesBundle_uk_UA.properties
+++ b/ugs-core/src/resources/MessagesBundle_uk_UA.properties
@@ -25,6 +25,7 @@ mainWindow.helpDialog = Допомога по керуванню станком
 mainWindow.resetZero = Скидання нуля\: Скидання поточних координат в нульову точку, без переміщення.
 mainWindow.returnToZero = Повертутись в нульову точку.
 mainWindow.softReset = Скидання, без переміщення.
+mainWindow.getState = Отримати стан\: Запросити інформацію про стан контролера (результат в консоль).
 mainWindow.helpKeyboard = Керування з клавіатури
 mainWindow.status.alarm = Увага
 mainWindow.status.hold = Утримати
@@ -34,6 +35,7 @@ mainWindow.error.openingFile = Проблема при відкритті фай
 mainWindow.error.processingFile = Невідома помилка воду-виводу при обробці файла
 mainWindow.error.pauseResume = Помилка при встановленні Паузи/Продовження
 # mainWindow.error.noFirmware = Cannot edit firmware settings until you have connected to the firmware.
+mainWindow.error.noSerialPort = Порти не знайдено.
 mainWindow.ui.pauseButton = Пауза
 mainWindow.swing.cancelButton = Відміна
 mainWindow.swing.commandLabel = Команда\:
@@ -42,17 +44,16 @@ mainWindow.swing.controlContextTabbedPane.commands = Команди
 mainWindow.swing.controlContextTabbedPane.fileMode = Режим файлу
 mainWindow.swing.controlContextTabbedPane.macros = Макроси
 mainWindow.swing.fileLabel = Файл
-firmware.feature.linesToArc = Конверт дуги в лінії
-firmware.feature.removeWhitespace = Видалити всі пробіли
-mainWindow.error.noSerialPort = Порти не знайдено.
-mainWindow.getState = Отримати стан\: Запросити інформацію про стан контролера (результат в консоль).
 mainWindow.swing.bottomTabbedPane.console = Консоль
-mainWindow.swing.inchRadioButton = Дюйми
 mainWindow.swing.machinePosition = Машинна позиція\:
-mainWindow.swing.mmRadioButton = Міліметри
 mainWindow.swing.pauseButton = Пауза
 mainWindow.swing.portLabel = Порт\:
 mainWindow.swing.returnToZeroButton = Поверн в нуль
+mainWindow.swing.inchRadioButton = Дюйми
+mainWindow.swing.mmRadioButton = Міліметри
+firmware.feature.removeWhitespace = Видалити всі пробіли
+firmware.feature.linesToArc = Конверт дуги в лінії
 sender.command.length = Макс довж команди
 
+
 # Window title for platform GUI
diff --git a/ugs-core/src/resources/MessagesBundle_zh_CN.properties b/ugs-core/src/resources/MessagesBundle_zh_CN.properties
index 5810f9f48..17dacb885 100644
--- a/ugs-core/src/resources/MessagesBundle_zh_CN.properties
+++ b/ugs-core/src/resources/MessagesBundle_zh_CN.properties
@@ -42,6 +42,7 @@ mainWindow.status.alarm = 警报
 mainWindow.status.hold = 暂停
 mainWindow.status.queue = 队列
 mainWindow.status.run = 运行
+platform.menu.runFrom = 运行自...
 platform.menu.toggleUnit = 切换单位
 platform.menu.toggleUnit.tooltip = 切换应用程序中的首选单位
 platform.menu.insertPosition = 插入位置
@@ -50,6 +51,7 @@ mainWindow.error.processingFile = 文件进程出现未知的IO异常
 mainWindow.error.pauseResume = 试图暂停/恢复时发生错误
 mainWindow.error.startingStream = 启动文件流时出现错误
 mainWindow.error.noFirmware = 固件未找到
+# mainWindow.error.noFirmware = Cannot edit firmware settings until you have connected to the firmware.
 mainWindow.error.notGrbl = 未使用GRBL连接
 mainWindow.error.duringSave = 存储时出现意外
 mainWindow.error.noSerialPort = 端口未找到
@@ -94,6 +96,12 @@ mainWindow.swing.hostLabel = 主机\:
 mainWindow.swing.remainingRowsLabel = 剩余行：
 mainWindow.swing.remainingTimeLabel = 预计剩余时间：
 mainWindow.swing.resetCoordinatesButton = 重置零点
+action.resetXCoordinatesButton = X轴归零
+action.resetYCoordinatesButton = Y轴归零
+action.resetZCoordinatesButton = Z轴归零
+action.resetACoordinatesButton = A轴清零
+action.resetBCoordinatesButton = B轴清零
+action.resetCCoordinatesButton = C轴清零
 mainWindow.swing.returnToZeroButton = 返回零点
 mainWindow.swing.homeMachine = 归位
 mainWindow.swing.openDoor = 打开门
@@ -108,6 +116,7 @@ mainWindow.swing.softResetMachineControl = 软复位
 mainWindow.swing.stepSizeLabel = XY步进大小
 mainWindow.swing.visualizeButton = 可视化
 mainWindow.swing.workPositionLabel = 工作位置
+mainWindow.swing.macroInstructions = <html>每个框可以包含一系列用 ; 符号分隔的GCode命令<br/>要执行命令，请单击文本左侧的按钮<br/><br/>交互式替换可以使用以下内容进行：<br/><ul><li>{machine_x}-机器x位置</li><li>{machine_y}-机器y位置</li><li>｛machine_z｝-机器z位置</li>>｛work_x｝-工作x位置</li><li>｛work_y｝-工作y位置</li><li>{work_z｝-工作z位置</li>>｛prompt | name｝-提示用户输入名为“name”的值</li></html>
 mainWindow.swing.inchRadioButton = 英寸
 mainWindow.swing.mmRadioButton = 毫米
 gcodeTable.command = 命令
@@ -122,6 +131,47 @@ firmware.feature.removeWhitespace = 移除所有空行
 firmware.feature.linesToArc = 将弧转换为线断
 firmware.feature.statusUpdates = 状态更新
 firmware.feature.statusUpdateRate = 状态更新率
+firmware.settings.exportSettingsDefaultName = 导出的设置
+firmware.settings.importSettings = 导入设置文件，确定吗？
+firmware.settings.importSettingsTitle = 导入设置文件
+firmware.settings.importSettingsName = 名称
+firmware.settings.importSettingsDate = 日期
+firmware.settings.importSettingsCreatedBy = 作者
+firmware.settings.importSettingsFirmware = 固件
+firmware.tinyg.setting.short.description.am = 轴模式
+firmware.tinyg.setting.short.description.vm = 最大速度
+firmware.tinyg.setting.short.description.fr = 最大进给速度
+firmware.tinyg.setting.short.description.tn = 最低行程
+firmware.tinyg.setting.short.description.tm = 最大行程
+firmware.tinyg.setting.short.description.jm = 最大加速度
+firmware.tinyg.setting.short.description.jh = 最高加速
+firmware.tinyg.setting.short.description.ra = 半径设置
+firmware.tinyg.setting.short.description.hi = 归位输入
+firmware.tinyg.setting.short.description.hd = 归位方向
+firmware.tinyg.setting.short.description.sv = 搜索速度
+firmware.tinyg.setting.short.description.lv = 限位速度
+firmware.tinyg.setting.short.description.lb = 限位退回
+firmware.tinyg.setting.short.description.zb = 零退避
+firmware.tinyg.setting.short.description.ma = 映射到轴
+firmware.tinyg.setting.short.description.sa = 步距角
+firmware.tinyg.setting.short.description.tr = 丝标螺距
+firmware.tinyg.setting.short.description.mi = 微调步距
+firmware.tinyg.setting.short.description.su = 每mm步数
+firmware.tinyg.setting.short.description.po = 反转引脚
+firmware.tinyg.setting.short.description.pm = 电源模式
+firmware.tinyg.setting.short.description.pl = 能量等级
+firmware.tinyg.group.description.x = X轴
+firmware.tinyg.group.description.y = Y轴
+firmware.tinyg.group.description.z = Z轴
+firmware.tinyg.group.description.a = A轴
+firmware.tinyg.group.description.b = B轴
+firmware.tinyg.group.description.c = C轴
+firmware.tinyg.group.description.1 = 电机1
+firmware.tinyg.group.description.2 = 电机2
+firmware.tinyg.group.description.3 = 电机3
+firmware.tinyg.group.description.4 = 电机4
+firmware.tinyg.group.description.5 = 电机5
+firmware.tinyg.group.description.6 = 电机6
 sender.header = 发送器设置
 sender.speed.override = 开启速度覆写
 sender.speed.percent = 速度覆写比例
@@ -137,7 +187,11 @@ sender.arcs.threshold = 小弧临界值(mm)
 sender.arcs.length = 小弧段长度(mm)
 sender.autoconnect = 开启时自动连接
 sender.autoreconnect = 自动重连
+sender.autostartpendant = 启动时自动启用插件
 sender.invertMouseZoom = 反转鼠标缩放
+sender.notification.nightlyBuild.title = 每晚构建
+sender.notification.nightlyBuild.message = 此版本的Universal Gcode Sender是最新测试版。\n它包含所有最新功能和改进，\n但也可能存在仍需要修复的错误。\n\n如果您遇到任何问题，请在 github 上报告。
+sender.notification.nightlyBuild.doNotShowAgain = 不再显示该消息
 sender.help.speed.override = 启用速度覆盖：启用或禁用速度覆盖。
 sender.help.speed.percent = 速度覆盖比率：速度将按此比率缩放。
 sender.help.command.length = 最大命令长度：设置触发错误的命令最大长度
@@ -146,25 +200,48 @@ sender.help.singlestep = 启用单步模式：打开单步模式，这是非常
 sender.help.whitespace = 移除所有空白\: 在G代码中移除不必要的空白
 sender.help.status = 启动轮询状态\: 如果支持，则打开固件的轮询状态
 sender.help.status.rate = 轮询状态速率\: 发送状态请求速率(ms)
+sender.help.state = 状态颜色显示：根据状态突出显示控制器状态红/橙/黄。
+sender.help.arcs = 将圆弧转换为直线：将小圆弧命令 (G2/G3) 转换为一系列 G1 命令。
+sender.help.arcs.threshold = 小圆弧阈值：小于该圆弧长度（单位：mm）将转换为 G1 指令。
+sender.help.arcs.length = 小圆弧段长度：扩展圆弧中各段的长度（以毫米为单位）。
+sender.help.autoconnect = 启动时尝试连接到最后一次连接成功的的控制器。
+sender.help.autoreconnect = 如果检测到断开连接，请尝试重新连接到控制器。
 sender.help.dialog.title = 发送器设置帮助
 communicator.exception.port = 端口没有驱动
 controller.exception.booting = GRBL未完成启动
+controller.exception.sendError = 发送“%s”时检测到错误：%s。 队列已暂停。
+controller.exception.unexpectedError = 检测到意外错误：%s
 controller.exception.homing = 此版本不支持归位方式
+controller.exception.reset = 此版本不支持坐标重置。
+controller.exception.gohome = 此版本不支持一键Home
+controller.exception.killalarm = 此版本不支持警报解锁
+controller.exception.checkmode = 此版本不支持检查模式切换
+controller.exception.parserstate = 此版本不支持视图解析器状态方法。
 controller.exception.softreset = 此版本不支持重置
+controller.exception.sendingstatus = 发送状态命令时发生 IOException 异常。
+controller.exception.rowStatInvalid = 行数不可用，请使用RAW文件工具
 controller.error.response = 处理响应错误
+controller.log.version = GRBL版本
 controller.log.realtime = 实时模式
 controller.log.notconnected = 未连接
+controller.log.error.reported = 发生错误
 connection.exception.inuse = 此端口被其他进程占用
+settings.log.location = 设置文件位置
 settings.log.loading = 载入设置
 settings.log.saving = 储存设置
 settings.log.error = 无法读取设置，使用默认
 settings.log.saveerror = 无法储存设置！
 visualizer.title = 可视化
+VisualizerCanvas.dimensions = 尺寸
 VisualizerCanvas.height = 高
 VisualizerCanvas.width = 宽
+platform.menu.jog = 手控点动
+platform.menu.jog.size = 步长
 platform.menu.jog.feed = 进给率
 platform.menu.actions = 动作
+platform.menu.macros = 宏
 platform.menu.machine = 机器
+platform.actions.homing.disabled.tooltip = 需要在固件设置中启用归位
 incomplete.localization.title = 未完全翻译
 incomplete.localization = UGS未完成中文的全部本地化翻译文件，详情请访问：https\://translate.universalgcodesender.com 网站。
 incomplete.localization.doNotShowAgain = 不要再次显示此对话框
@@ -178,6 +255,10 @@ jogging.yPlus = 慢跑
 jogging.yMinus = 慢跑
 jogging.zPlus = 慢跑
 jogging.zMinus = 慢跑
+jogging.xPlus.yMinus = 点动\:X+ Y-
+jogging.xPlus.yPlus = 点动\:X+Y+
+jogging.xMinus.yPlus = 点动\: X- Y+
+jogging.xMinus.yMinus = 点动\: X- Y-
 jogging.aPlus = 点动\: A+
 jogging.aMinus = 点动\: A-
 jogging.bPlus = 点动\: B+
@@ -204,18 +285,29 @@ jogging.units.inch = 慢跑单位
 jogging.units.mm = 慢跑单位
 jogging.units.toggle = 慢跑单位切换
 grbl.exception.Alarm = GRBL处于警报状态时文件流无法开启
+grbl.exception.cancelReset = GBRL状态为空闲，指令发送超时。
+tinyg.exception.unknownVersion = 这是未知的 TinyG 版本：%s。 如果您正在运行 g2core，请更新您的连接设置。
 platform.menu.window = 窗口
 platform.menu.classic = 经典
 platform.menu.plugins = 插件
 platform.window.dro = 控制器状态（DRO）
 platform.window.dro.tooltip = 实时机器状态
 platform.window.actions = 一般动作
+platform.window.actions.tooltip = 常见 gcode 命令和机器操作的快捷方式
 platform.window.workflow = 工作流助手
 platform.window.workflow.tooltip = 帮助你在多个文件中运行工作
 platform.window.filebrowser = 文件浏览器
+platform.window.filebrowser.tooltip = 加载要使用的文件。
+platform.window.jogcontrol = 手动控制器
+platform.window.jogcontrol.tooltip = 手动控制机器位置
 platform.window.macros = 宏
+platform.window.macros.tooltip = 可以在此处使用在首选项中创建的宏。
 platform.window.overrides = 覆写
+platform.window.overrides.tooltip = 发送并监听进给率。
+platform.window.sendstatus = 发送进度
+platform.window.sendstatus.tooltip = 文件发送进度。
 platform.window.serialconsole = 控制栏
+platform.window.serialconsole.tooltip = 控制台显示来自控制器的消息。
 platform.window.visualizer = 可视化
 platform.window.visualizer.tooltip = 当前操作的3D视角
 platform.visualizer.edit.options.title = 可视化选项
@@ -241,7 +333,20 @@ platform.visualizer.dowel.preview = 显示销钉预览
 platform.visualizer.dowel.preview.desc = 显示销钉预览
 platform.visualizer.highlight = 显示高亮线
 platform.visualizer.highlight.desc = 在编辑器中显示选中的行
+platform.visualizer.color.highlight = 编辑器线条突出显示颜色
+platform.visualizer.color.linear = 直线运动颜色（G1）
+platform.visualizer.color.rapid = 高速移动彩色(G0)
+platform.visualizer.color.arc = 弧形运动颜色（G2/G3）
+platform.visualizer.color.plunge = 下降/上升运动颜色
 platform.visualizer.color.completed = 已完成行颜色
+platform.visualizer.color.xy-grid = XY 网格线的颜色（含透明度）。
+platform.visualizer.color.xy-plane = XY 平面的颜色（含透明度）。
+platform.visualizer.color.x-axis = X 轴线的颜色（含透明度）。
+platform.visualizer.color.y-axis = Y 轴线的颜色（含透明度）。
+platform.visualizer.color.z-axis = Z 轴线的颜色（含透明度）。
+platform.visualizer.color.sizedisplay = 标尺线条和文本的颜色。
+platform.visualizer.color.boundry-base = 机器底座的颜色（含透明度）
+platform.visualizer.color.boundry-sides = 机器侧面的颜色（含透明度）
 platform.visualizer.boundary = 显示机床边界
 platform.visualizer.boundary.desc = 显示机器边界作为边界框。边界的大小和位置将由控制器的设置决定。
 platform.visualizer.boundary.invert.x = 反向边界 X
@@ -257,21 +362,48 @@ PendantMenu.item.StartServer = 开始
 PendantMenu.item.StopServer = 停止
 restore = 恢复
 macro.substitution = 宏观替代
+parser.processor.arc.start-error = 没有起点，无法扩孔。
+parser.processor.arc.multiple-commands = 扩孔时发现一行有多个命令，无法继续。 将命令分割后可以继续。
+sender.help.commandSplitter = 将 gcode 命令拆分为多个部分，以便精准地报告错误。
+sender.help.patternRemover = 删除与正则表达式模式匹配的文本
 sender.help.empty-line-remover = 从 gcode 文件中删除空行
+controller.exception.ignoreFutureErrors = 您想以后直接跳过这样的命令吗？
 settings.processors.header = GCODE处理器配置
+settings.file.outOfDate.title = 过时的配置
+settings.file.outOfDate.message = 一项或多项配置设置已过时，应更新。 某些设置将使用默认值重置。 您想更新固件配置吗？
+settings.file.generalError = 初始化固件配置文件时发生错误：
 settings.processors.enabled = 开启
 settings.processors.add = 增加
 settings.processors.remove = 移除选择
+settings.processors.help = 这些过滤器用于在将 gcode 发送到控制器之前对其进行处理。 其中一些必须启用，另一些则可以禁用。 大多数是通过发件人设置菜单中的全局设置进行配置的。 可以添加自定义过滤器来删除特定模式，例如“Td+”将删除“T1”、“T12”等的任何实例。
 settings.processors.loadError = 无法载入处理器
+settings.language = 语言
+settings.connectionDriver = 连接设备
+settings.workspaceDirectory = 工作目录
 settings.help.disableAxis = 如果可能，每个禁用的轴都会从 UI 中删除。
 settings.disableAxis = 禁用轴\: %s
+settings.pendantPort = Pendant 网站端口
+ArcExpander = 扩孔器
 CommandLengthProcessor = 命令长度处理器
+CommandSplitter = 指令分配器
+CommentProcessor = 删除注释
 DecimalProcessor = 小数处理器
 FeedOverrideProcessor = 给进速度覆盖
 M30Processor = M30移除器
 PatternRemover = 模式删除
 WhitespaceProcessor = 空白空间移除
+controller.exception.smoothie.booting = Smoothie 尚未完成启动。
+mainWindow.swing.pendant = 挂件
+platform.visualizer.popup.coordinatesMenu = 坐标：X\=%s，Y\=%s
+platform.visualizer.popup.submenu.jogToHere = 点动控制移动到这里
+platform.visualizer.popup.submenu.jogToHereHint = 将头部移动到选定的 X/Y 位置。 不改变 Z 高度
+platform.visualizer.popup.submenu.setWorkOffsetToHere = 将工作偏移设置到此处
+platform.visualizer.popup.submenu.setWorkOffsetToHereHint = 只设置当前坐标系的偏移量，不移动头部
+platform.visualizer.popup.submenu.copyCoordinates = 复制坐标
+
+mainWindow.error.error = 操作无法完成
 mainWindow.ui.connectDisconnect = 连接或断开
+mainWindow.swing.stepSizeZLabel = Z轴步长：
 mainWindow.swing.feedRateLabel = 给进速率
 toolbar.icon.small = 小图标
 toolbar.icon.large = 大图标
@@ -318,6 +450,7 @@ overrides.mist = 雾化冷却剂
 overrides.flood = 水冷液
 overrides.toggle.short = 切换
 restart = 需要重启
+platform.window.restart.changed.settings = <html><a href\="\#">单击此处应用设置并重启程序。
 mainWindow.ui.connect = 连接
 mainWindow.ui.disconnect = 断开
 mainWindow.swing.stopButton = 停止
@@ -325,7 +458,9 @@ mainWindow.swing.filebrowser.toolbarTitle = 文件浏览
 mainWindow.swing.firmware.toolbarTitle = 固件选择
 mainWindow.swing.serialport.toolbarTitle = 串口选择
 mainWindow.swing.baudrate.toolbarTitle = 波特率
+parser.processor.general.multiple-commands = 在一行上发现了该处理器不支持的多个命令。 启用命令拆分器处理器以继续。
 platform.window.autoleveler = 自动调平
+platform.window.autoleveler.tooltip = 探测材料表面并根据结果转换 gcode。
 platform.visualizer.renderable.gcode-model = G代码
 platform.visualizer.renderable.grid = 坐标与平面
 platform.visualizer.renderable.highlight = G代码编辑器的高亮显示
@@ -336,6 +471,7 @@ platform.visualizer.renderable.selection = 鼠标选择栏
 platform.visualizer.renderable.gcode-model-size = G代码大小
 platform.visualizer.renderable.tool-location = 刀具定位
 platform.visualizer.renderable.autolevel-preview = 自动调平预览
+platform.visualizer.renderable.machine-boundries = 机器边界
 autoleveler.panel.min = 最小
 autoleveler.panel.max = 最大
 autoleveler.panel.z-surface = G代码Z平面
@@ -359,10 +495,12 @@ autoleveler.probe-failed = 探测失败
 autoleveler.panel.clear = 清除扫描
 experimental.feature = 实验特征
 # Window title for platform GUI
+platform-title = 通用G代码平台
 mainWindow.swing.alarmLock = 解锁
 mainWindow.swing.checkMode = 检测模式
 mainWindow.swing.getState = 状态获取
 platform.window.probe-module = 探测模块
+platform.window.probe-module.tooltip = 一套用于管理探针操作的实用程序。
 probe.find-rate = 快速查找率
 probe.measure-rate = 慢测量率
 probe.x-distance = 探测X距离
@@ -370,12 +508,79 @@ probe.y-distance = 探测Y距离
 probe.retract-amount = 探测缩回量
 probe.retract-amount.tooltip = 快速探头循环后运行慢速探头之前的缩回距离
 probe.hole-diameter = 大约孔径
+probe.visualizer.corner-preview = 寻边探测预览
+probe.visualizer.z-preview = Z轴探针预览
+parser.gcode.multiple-axis-commands = 需要在一行上显示多个轴字的代码
+parser.gcode.missing-axis-commands = 运动命令缺少轴的名称(如X Y Z)
+sender.nightly-warning = 对非正式版本更新也弹窗提示
+sender.help.spindle-dwell = 使用“M3”或“M4”命令启用主轴后添加可配置的延迟（以秒为单位）。
+SpindleOnDweller = 主轴启动延时
+platform.window.dowel-module = 榫卯生成
+platform.window.dowel-module.tooltip = 生成用于制作各种形状和尺寸榫卯结构的 g 代码。
+platform.plugin.dowel-module.generate = 生成g代码
+platform.plugin.dowel-module.export = 导出g代码
+platform.plugin.dowel-module.preview = 榫卯预览
+platform.plugin.dowel-module.dowel = 榫卯
 platform.plugin.dowel-module.x = X计数
 platform.plugin.dowel-module.y = Y计数
 platform.plugin.dowel-module.diameter = 直径
 platform.plugin.dowel-module.length = 长度
+platform.plugin.setupwizard.port = 端口\:
+platform.plugin.setupwizard.port-rate = 端口速率：
+platform.plugin.setupwizard.connect = 连接
+platform.plugin.setupwizard.unknown-version = platform.plugin.setupwizard.unknown-version
+platform.plugin.setupwizard.reset-to-zero = 重置为零
+platform.plugin.setupwizard.move = 移动
+platform.plugin.setupwizard.home = 归位
+platform.plugin.setupwizard.measure = 测量
+platform.plugin.setupwizard.calibrate = 校准
+platform.plugin.setupwizard.update = 更新
+platform.plugin.setupwizard.update-settings = 更新设置
+platform.plugin.setupwizard.connection.title = 连接
+platform.plugin.setupwizard.connection.intro = 本向导将帮助您使用<b>USG</b>设置 CNC 控制器。 让我们从连接到控制器开始。
+platform.plugin.setupwizard.connection.not-supported = 该控制器不支持设置向导
+platform.plugin.setupwizard.connection.connecting = 连接中...
+platform.plugin.setupwizard.connection.connected-to = 连接到
+platform.plugin.setupwizard.import-settings.title = 导入设置
+platform.plugin.setupwizard.import-settings.intro = 如果您的设备附带配置文件或者您之前对设置进行了备份，则可以在此处加载它们。 否则单击下一步继续。
+platform.plugin.setupwizard.import-settings.firmware = 固件\:
+platform.plugin.setupwizard.import-settings.created-by = 作者\:
+platform.plugin.setupwizard.import-settings.created-date = 日期\:
+platform.plugin.setupwizard.import-settings.finished-title = 完成导入设置
+platform.plugin.setupwizard.import-settings.finished-description = 请继续使用以下步骤验证您的配置。
+platform.plugin.setupwizard.import-settings.open-settings = 打开设置文件...
+platform.plugin.setupwizard.import-settings.import = 导入设置
+platform.plugin.setupwizard.import-settings.overwrite-message = 您确定要覆盖当前的固件设置吗？
+platform.plugin.setupwizard.import-settings.overwrite-title = 覆盖固件设置？
+platform.plugin.setupwizard.motor-wiring.title = 电机接线
+platform.plugin.setupwizard.motor-wiring.intro = 我们现在将测试您的电机接线是否正确。 使用步进按钮测试每个轴。
+platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = 您已激活软限位。 任何会使机器超过这些限制的按钮都将被禁用。
+platform.plugin.setupwizard.motor-wiring.reverse-direction = 反向
+platform.plugin.setupwizard.calibration.title = 步进校准
+platform.plugin.setupwizard.calibration.intro = 我们现在将尝试校准您的机器。 尝试<b>移动</b>机器并<b>测量</b>结果，然后<b>校准</b>估计的步数。
 platform.plugin.setupwizard.calibration.actual-movement = 平台插件设置向导校准实际运动
+platform.plugin.setupwizard.calibration.adjust = 每毫米调整步数：
+platform.plugin.setupwizard.calibration.setting = 设置（步数/MM）
 platform.plugin.setupwizard.calibration.computer-speed-warning =  平台插件设置向导校准计算机速度警告
+platform.plugin.setupwizard.limit-switches.title = 限位开关
+platform.plugin.setupwizard.limit-switches.intro = 限位开关将防止机器移动超出其物理极限。
+platform.plugin.setupwizard.limit-switches.instruction = 尝试手动触发每个限位开关。 确保将其触发至少两秒钟才能显示。
+platform.plugin.setupwizard.limit-switches.not-available = 限位开关在您的硬件上不可用。
+platform.plugin.setupwizard.limit-switches.invert = 限位开关引脚反转
+platform.plugin.setupwizard.soft-limits.title = 软限位
+platform.plugin.setupwizard.soft-limits.intro = 软限位将防止机器移出其安全工作区域。
+platform.plugin.setupwizard.soft-limits.instructions = 将机器归位，然后沿相反方向将其移至最大安全位置。 使用这个位置作为你的软限位。
+platform.plugin.setupwizard.soft-limits.require-homing = 启用软限制之前需要启用归位功能。
+platform.plugin.setupwizard.soft-limits.not-available = 软限位在您的硬件上不可用
+platform.plugin.setupwizard.homing.title = 归位
+platform.plugin.setupwizard.homing.intro = 归位是一种查找绝对机器坐标的方法。
+platform.plugin.setupwizard.homing.enable = 启用归位
+platform.plugin.setupwizard.homing.require-limit-switches = 在启用归位之前需要启用 IMIT 开关。
+platform.plugin.setupwizard.homing.not-available = 您的硬件不支持归位。
+platform.plugin.setupwizard.homing.instruction1 = 花点时间找出限位开关的方向
+platform.plugin.setupwizard.homing.instruction2 = 现在测试一个归位循环，但是如果它朝错误的方向移动，<b>准备中止</b>！
+platform.plugin.setupwizard.homing.try-homing = 尝试归位
+platform.plugin.setupwizard.homing.abort = 终止
 gcode.setting.units = 单位
 gcode.setting.feed = 给进率
 gcode.setting.xy-feed = 给进速率(XY)
@@ -417,11 +622,63 @@ mainWindow.status.jog = 点动
 mainWindow.status.offline = 离线
 platform.window.diagnostics = UGS诊断
 platform.window.diagnostics.tooltip = 内部UGS诊断信息
+platform.visualizer.popup.showFeatures = 显示功能
 platform.visualizer.popup.viewPresets = 查看预设
 platform.visualizer.popup.presets.reset = 重置视图
 platform.visualizer.popup.presets.top = 上
 platform.visualizer.popup.presets.left = 左
 platform.visualizer.popup.presets.front = 前
+platform.plugin.jog.useSeparateStepSize = 对 Z轴 和 XY轴 使用不同的步长
+platform.plugin.jog.showABCStepSize = 显示 ABC 步长
+platform.plugin.jog.feedRate = 进给速度
+platform.plugin.jog.stepSize = 步长
+platform.plugin.jog.stepSizeZ = Z轴步长
+platform.plugin.jog.stepSizeXY = XY轴步长
+platform.plugin.jog.stepSizeABC = ABC 步长 
+platform.plugin.jog.stepLarger = 较大
+platform.plugin.jog.stepSmaller = 较小
+platform.plugin.jog.stealKeyboardFocus = 确保键盘控件处于活动状态
+platform.window.edit.macros = 编辑宏...
+platform.action.outline = 概述
+platform.action.outline.tooltip = 使用当前深度在模型周围移动机器
+platform.plugin.joystick.activate = 激活操纵杆
+platform.plugin.joystick.buttonControls = 按钮控制：
+platform.plugin.joystick.analogControls = 模拟控制：
+platform.plugin.joystick.clear = 清除
+platform.plugin.joystick.a = A轴
+platform.plugin.joystick.b = B轴
+platform.plugin.joystick.x = X轴
+platform.plugin.joystick.y = Y轴
+platform.plugin.joystick.back = 返回
+platform.plugin.joystick.select = 选择
+platform.plugin.joystick.start = 开始
+platform.plugin.joystick.l1 = platform.plugin.joystick.l1
+platform.plugin.joystick.l2 = platform.plugin.joystick.l2
+platform.plugin.joystick.l3 = platform.plugin.joystick.l3
+platform.plugin.joystick.r1 = platform.plugin.joystick.r1
+platform.plugin.joystick.r2 = platform.plugin.joystick.r2
+platform.plugin.joystick.r3 = platform.plugin.joystick.r3
+platform.plugin.joystick.padUp = 抬高
+platform.plugin.joystick.padDown = 降低
+platform.plugin.joystick.padRight = 垫右
+platform.plugin.joystick.padLeft = 垫左
+platform.plugin.joystick.leftX = 左摇杆X
+platform.plugin.joystick.leftY = 左摇杆Y
+platform.plugin.joystick.rightX = 右摇杆X
+platform.plugin.joystick.rightY = 右摇杆Y
+platform.plugin.joystick.action.continuousJogging = 模拟点动
+platform.plugin.joystick.reverseAxis = 撤销
+platform.plugin.joystick.axisThreshold = 零阈值(%)
+platform.plugin.cloud.s3Id = AWS 访问密钥 ID
+platform.plugin.cloud.s3Secret = AWS 访问私钥
+platform.plugin.cloud.open = 打开云端文件
+platform.plugin.toolbox.title=工具箱
+platform.plugin.toolbox.tooltip=工具箱 
+platform.plugin.toolbox.settings.title=编辑工具箱按钮...
+platform.plugin.editor.showOnOpen=打开 g 代码文件时显示编辑器
+platform.plugin.designer.clipart.animals=动物
+platform.plugin.designer.clipart.buildings=构建
+platform.plugin.designer.clipart.computer=公司
 platform.plugin.designer.clipart.decorations=裝飾品
 platform.plugin.designer.clipart.electronics=电子元件
 platform.plugin.designer.clipart.food=切削液
@@ -442,263 +699,3 @@ platform.plugin.designer.clipart.weather=天气
 platform.plugin.console.title=控制台
 platform.plugin.console.action.verbose.disable = 禁用详细日志
 platform.plugin.console.action.verbose.enable = 启用详细日志记录
-action.resetACoordinatesButton = A轴清零
-action.resetBCoordinatesButton = B轴清零
-action.resetCCoordinatesButton = C轴清零
-action.resetXCoordinatesButton = X轴归零
-action.resetYCoordinatesButton = Y轴归零
-action.resetZCoordinatesButton = Z轴归零
-autoleveler.panel.view-data = 查看数据
-controller.log.version = GRBL版本
-mainWindow.swing.macroInstructions = <html>每个框可以包含一系列用 ; 符号分隔的GCode命令<br/>要执行命令，请单击文本左侧的按钮<br/><br/>交互式替换可以使用以下内容进行：<br/><ul><li>{machine_x}-机器x位置</li><li>{machine_y}-机器y位置</li><li>｛machine_z｝-机器z位置</li>>｛work_x｝-工作x位置</li><li>｛work_y｝-工作y位置</li><li>{work_z｝-工作z位置</li>>｛prompt | name｝-提示用户输入名为“name”的值</li></html>
-platform-title = 通用G代码平台
-platform.action.outline.tooltip = 使用当前深度在模型周围移动机器
-platform.plugin.designer.clipart.animals = 动物
-platform.plugin.designer.clipart.buildings = 构建
-platform.plugin.designer.clipart.computer = 公司
-platform.plugin.editor.showOnOpen = 打开 g 代码文件时显示编辑器
-platform.plugin.jog.showABCStepSize = 显示 ABC 步长
-platform.plugin.jog.stepSizeABC = ABC 步长 
-platform.plugin.toolbox.settings.title = 编辑工具箱按钮...
-platform.plugin.toolbox.title = 工具箱
-platform.plugin.toolbox.tooltip = 工具箱 
-platform.visualizer.color.linear = 直线运动颜色（G1）
-platform.visualizer.popup.showFeatures = 显示功能
-probe.measure.inside-corner = 角内探查措施
-probe.measure.outside-corner = 角外探量
-probe.retract-height = 缩回高度
-probe.z-distance = 探测Z距离
-ArcExpander = 扩孔器
-CommandSplitter = 指令分配器
-CommentProcessor = 删除注释
-SpindleOnDweller = 主轴启动延时
-VisualizerCanvas.dimensions = 尺寸
-controller.exception.checkmode = 此版本不支持检查模式切换
-controller.exception.gohome = 此版本不支持一键Home
-controller.exception.ignoreFutureErrors = 您想以后直接跳过这样的命令吗？
-controller.exception.killalarm = 此版本不支持警报解锁
-controller.exception.parserstate = 此版本不支持视图解析器状态方法。
-controller.exception.reset = 此版本不支持坐标重置。
-controller.exception.rowStatInvalid = 行数不可用，请使用RAW文件工具
-controller.exception.sendError = 发送“%s”时检测到错误：%s。 队列已暂停。
-controller.exception.sendingstatus = 发送状态命令时发生 IOException 异常。
-controller.exception.smoothie.booting = Smoothie 尚未完成启动。
-controller.exception.unexpectedError = 检测到意外错误：%s
-controller.log.error.reported = 发生错误
-firmware.settings.exportSettingsDefaultName = 导出的设置
-firmware.settings.importSettings = 导入设置文件，确定吗？
-firmware.settings.importSettingsCreatedBy = 作者
-firmware.settings.importSettingsDate = 日期
-firmware.settings.importSettingsFirmware = 固件
-firmware.settings.importSettingsName = 名称
-firmware.settings.importSettingsTitle = 导入设置文件
-firmware.tinyg.group.description.1 = 电机1
-firmware.tinyg.group.description.2 = 电机2
-firmware.tinyg.group.description.3 = 电机3
-firmware.tinyg.group.description.4 = 电机4
-firmware.tinyg.group.description.5 = 电机5
-firmware.tinyg.group.description.6 = 电机6
-firmware.tinyg.group.description.a = A轴
-firmware.tinyg.group.description.b = B轴
-firmware.tinyg.group.description.c = C轴
-firmware.tinyg.group.description.x = X轴
-firmware.tinyg.group.description.y = Y轴
-firmware.tinyg.group.description.z = Z轴
-firmware.tinyg.setting.short.description.am = 轴模式
-firmware.tinyg.setting.short.description.fr = 最大进给速度
-firmware.tinyg.setting.short.description.hd = 归位方向
-firmware.tinyg.setting.short.description.hi = 归位输入
-firmware.tinyg.setting.short.description.jh = 最高加速
-firmware.tinyg.setting.short.description.jm = 最大加速度
-firmware.tinyg.setting.short.description.lb = 限位退回
-firmware.tinyg.setting.short.description.lv = 限位速度
-firmware.tinyg.setting.short.description.ma = 映射到轴
-firmware.tinyg.setting.short.description.mi = 微调步距
-firmware.tinyg.setting.short.description.pl = 能量等级
-firmware.tinyg.setting.short.description.pm = 电源模式
-firmware.tinyg.setting.short.description.po = 反转引脚
-firmware.tinyg.setting.short.description.ra = 半径设置
-firmware.tinyg.setting.short.description.sa = 步距角
-firmware.tinyg.setting.short.description.su = 每mm步数
-firmware.tinyg.setting.short.description.sv = 搜索速度
-firmware.tinyg.setting.short.description.tm = 最大行程
-firmware.tinyg.setting.short.description.tn = 最低行程
-firmware.tinyg.setting.short.description.tr = 丝标螺距
-firmware.tinyg.setting.short.description.vm = 最大速度
-firmware.tinyg.setting.short.description.zb = 零退避
-grbl.exception.cancelReset = GBRL状态为空闲，指令发送超时。
-jogging.xMinus.yMinus = 点动\: X- Y-
-jogging.xMinus.yPlus = 点动\: X- Y+
-jogging.xPlus.yMinus = 点动\:X+ Y-
-jogging.xPlus.yPlus = 点动\:X+Y+
-mainWindow.error.error = 操作无法完成
-mainWindow.swing.pendant = 挂件
-mainWindow.swing.stepSizeZLabel = Z轴步长：
-parser.gcode.missing-axis-commands = 运动命令缺少轴的名称(如X Y Z)
-parser.gcode.multiple-axis-commands = 需要在一行上显示多个轴字的代码
-parser.processor.arc.multiple-commands = 扩孔时发现一行有多个命令，无法继续。 将命令分割后可以继续。
-parser.processor.arc.start-error = 没有起点，无法扩孔。
-parser.processor.general.multiple-commands = 在一行上发现了该处理器不支持的多个命令。 启用命令拆分器处理器以继续。
-platform.action.outline = 概述
-platform.actions.homing.disabled.tooltip = 需要在固件设置中启用归位
-platform.menu.jog = 手控点动
-platform.menu.jog.size = 步长
-platform.menu.macros = 宏
-platform.menu.runFrom = 运行自...
-platform.plugin.cloud.open = 打开云端文件
-platform.plugin.cloud.s3Id = AWS 访问密钥 ID
-platform.plugin.cloud.s3Secret = AWS 访问私钥
-platform.plugin.dowel-module.dowel = 榫卯
-platform.plugin.dowel-module.export = 导出g代码
-platform.plugin.dowel-module.generate = 生成g代码
-platform.plugin.dowel-module.preview = 榫卯预览
-platform.plugin.jog.feedRate = 进给速度
-platform.plugin.jog.stealKeyboardFocus = 确保键盘控件处于活动状态
-platform.plugin.jog.stepLarger = 较大
-platform.plugin.jog.stepSize = 步长
-platform.plugin.jog.stepSizeXY = XY轴步长
-platform.plugin.jog.stepSizeZ = Z轴步长
-platform.plugin.jog.stepSmaller = 较小
-platform.plugin.jog.useSeparateStepSize = 对 Z轴 和 XY轴 使用不同的步长
-platform.plugin.joystick.a = A轴
-platform.plugin.joystick.action.continuousJogging = 模拟点动
-platform.plugin.joystick.activate = 激活操纵杆
-platform.plugin.joystick.analogControls = 模拟控制：
-platform.plugin.joystick.axisThreshold = 零阈值(%)
-platform.plugin.joystick.b = B轴
-platform.plugin.joystick.back = 返回
-platform.plugin.joystick.buttonControls = 按钮控制：
-platform.plugin.joystick.clear = 清除
-platform.plugin.joystick.l1 = L1
-platform.plugin.joystick.l2 = L2
-platform.plugin.joystick.l3 = L3
-platform.plugin.joystick.leftX = 左摇杆X
-platform.plugin.joystick.leftY = 左摇杆Y
-platform.plugin.joystick.padDown = 降低
-platform.plugin.joystick.padLeft = 垫左
-platform.plugin.joystick.padRight = 垫右
-platform.plugin.joystick.padUp = 抬高
-platform.plugin.joystick.r1 = R1
-platform.plugin.joystick.r2 = R2
-platform.plugin.joystick.r3 = R3
-platform.plugin.joystick.reverseAxis = 撤销
-platform.plugin.joystick.rightX = 右摇杆X
-platform.plugin.joystick.rightY = 右摇杆Y
-platform.plugin.joystick.select = 选择
-platform.plugin.joystick.start = 开始
-platform.plugin.joystick.x = X轴
-platform.plugin.joystick.y = Y轴
-platform.plugin.setupwizard.calibrate = 校准
-platform.plugin.setupwizard.calibration.adjust = 每毫米调整步数：
-platform.plugin.setupwizard.calibration.intro = 我们现在将尝试校准您的机器。 尝试<b>移动</b>机器并<b>测量</b>结果，然后<b>校准</b>估计的步数。
-platform.plugin.setupwizard.calibration.setting = 设置（步数/MM）
-platform.plugin.setupwizard.calibration.title = 步进校准
-platform.plugin.setupwizard.connect = 连接
-platform.plugin.setupwizard.connection.connected-to = 连接到
-platform.plugin.setupwizard.connection.connecting = 连接中...
-platform.plugin.setupwizard.connection.intro = 本向导将帮助您使用<b>USG</b>设置 CNC 控制器。 让我们从连接到控制器开始。
-platform.plugin.setupwizard.connection.not-supported = 该控制器不支持设置向导
-platform.plugin.setupwizard.connection.title = 连接
-platform.plugin.setupwizard.home = 归位
-platform.plugin.setupwizard.homing.abort = 终止
-platform.plugin.setupwizard.homing.enable = 启用归位
-platform.plugin.setupwizard.homing.instruction1 = 花点时间找出限位开关的方向
-platform.plugin.setupwizard.homing.instruction2 = 现在测试一个归位循环，但是如果它朝错误的方向移动，<b>准备中止</b>！
-platform.plugin.setupwizard.homing.intro = 归位是一种查找绝对机器坐标的方法。
-platform.plugin.setupwizard.homing.not-available = 您的硬件不支持归位。
-platform.plugin.setupwizard.homing.require-limit-switches = 在启用归位之前需要启用 IMIT 开关。
-platform.plugin.setupwizard.homing.title = 归位
-platform.plugin.setupwizard.homing.try-homing = 尝试归位
-platform.plugin.setupwizard.import-settings.created-by = 作者\:
-platform.plugin.setupwizard.import-settings.created-date = 日期\:
-platform.plugin.setupwizard.import-settings.finished-description = 请继续使用以下步骤验证您的配置。
-platform.plugin.setupwizard.import-settings.finished-title = 完成导入设置
-platform.plugin.setupwizard.import-settings.firmware = 固件\:
-platform.plugin.setupwizard.import-settings.import = 导入设置
-platform.plugin.setupwizard.import-settings.intro = 如果您的设备附带配置文件或者您之前对设置进行了备份，则可以在此处加载它们。 否则单击下一步继续。
-platform.plugin.setupwizard.import-settings.open-settings = 打开设置文件...
-platform.plugin.setupwizard.import-settings.overwrite-message = 您确定要覆盖当前的固件设置吗？
-platform.plugin.setupwizard.import-settings.overwrite-title = 覆盖固件设置？
-platform.plugin.setupwizard.import-settings.title = 导入设置
-platform.plugin.setupwizard.limit-switches.instruction = 尝试手动触发每个限位开关。 确保将其触发至少两秒钟才能显示。
-platform.plugin.setupwizard.limit-switches.intro = 限位开关将防止机器移动超出其物理极限。
-platform.plugin.setupwizard.limit-switches.invert = 限位开关引脚反转
-platform.plugin.setupwizard.limit-switches.not-available = 限位开关在您的硬件上不可用。
-platform.plugin.setupwizard.limit-switches.title = 限位开关
-platform.plugin.setupwizard.measure = 测量
-platform.plugin.setupwizard.motor-wiring.intro = 我们现在将测试您的电机接线是否正确。 使用步进按钮测试每个轴。
-platform.plugin.setupwizard.motor-wiring.reverse-direction = 反向
-platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = 您已激活软限位。 任何会使机器超过这些限制的按钮都将被禁用。
-platform.plugin.setupwizard.motor-wiring.title = 电机接线
-platform.plugin.setupwizard.move = 移动
-platform.plugin.setupwizard.port = 端口\:
-platform.plugin.setupwizard.port-rate = 端口速率：
-platform.plugin.setupwizard.reset-to-zero = 重置为零
-platform.plugin.setupwizard.soft-limits.instructions = 将机器归位，然后沿相反方向将其移至最大安全位置。 使用这个位置作为你的软限位。
-platform.plugin.setupwizard.soft-limits.intro = 软限位将防止机器移出其安全工作区域。
-platform.plugin.setupwizard.soft-limits.not-available = 软限位在您的硬件上不可用
-platform.plugin.setupwizard.soft-limits.require-homing = 启用软限制之前需要启用归位功能。
-platform.plugin.setupwizard.soft-limits.title = 软限位
-platform.plugin.setupwizard.unknown-version = Unknown version
-platform.plugin.setupwizard.update = 更新
-platform.plugin.setupwizard.update-settings = 更新设置
-platform.visualizer.color.arc = 弧形运动颜色（G2/G3）
-platform.visualizer.color.boundry-base = 机器底座的颜色（含透明度）
-platform.visualizer.color.boundry-sides = 机器侧面的颜色（含透明度）
-platform.visualizer.color.highlight = 编辑器线条突出显示颜色
-platform.visualizer.color.plunge = 下降/上升运动颜色
-platform.visualizer.color.rapid = 高速移动彩色(G0)
-platform.visualizer.color.sizedisplay = 标尺线条和文本的颜色。
-platform.visualizer.color.x-axis = X 轴线的颜色（含透明度）。
-platform.visualizer.color.xy-grid = XY 网格线的颜色（含透明度）。
-platform.visualizer.color.xy-plane = XY 平面的颜色（含透明度）。
-platform.visualizer.color.y-axis = Y 轴线的颜色（含透明度）。
-platform.visualizer.color.z-axis = Z 轴线的颜色（含透明度）。
-platform.visualizer.popup.coordinatesMenu = 坐标：X\=%s，Y\=%s
-platform.visualizer.popup.submenu.copyCoordinates = 复制坐标
-platform.visualizer.popup.submenu.jogToHere = 点动控制移动到这里
-platform.visualizer.popup.submenu.jogToHereHint = 将头部移动到选定的 X/Y 位置。 不改变 Z 高度
-platform.visualizer.popup.submenu.setWorkOffsetToHere = 将工作偏移设置到此处
-platform.visualizer.popup.submenu.setWorkOffsetToHereHint = 只设置当前坐标系的偏移量，不移动头部
-platform.visualizer.renderable.machine-boundries = 机器边界
-platform.window.actions.tooltip = 常见 gcode 命令和机器操作的快捷方式
-platform.window.autoleveler.tooltip = 探测材料表面并根据结果转换 gcode。
-platform.window.dowel-module = 榫卯生成
-platform.window.dowel-module.tooltip = 生成用于制作各种形状和尺寸榫卯结构的 g 代码。
-platform.window.edit.macros = 编辑宏...
-platform.window.filebrowser.tooltip = 加载要使用的文件。
-platform.window.jogcontrol = 手动控制器
-platform.window.jogcontrol.tooltip = 手动控制机器位置
-platform.window.macros.tooltip = 可以在此处使用在首选项中创建的宏。
-platform.window.overrides.tooltip = 发送并监听进给率。
-platform.window.probe-module.tooltip = 一套用于管理探针操作的实用程序。
-platform.window.restart.changed.settings = <html><a href\="\#">单击此处应用设置并重启程序。
-platform.window.sendstatus = 发送进度
-platform.window.sendstatus.tooltip = 文件发送进度。
-platform.window.serialconsole.tooltip = 控制台显示来自控制器的消息。
-probe.visualizer.corner-preview = 寻边探测预览
-probe.visualizer.z-preview = Z轴探针预览
-sender.autostartpendant = 启动时自动启用插件
-sender.help.arcs = 将圆弧转换为直线：将小圆弧命令 (G2/G3) 转换为一系列 G1 命令。
-sender.help.arcs.length = 小圆弧段长度：扩展圆弧中各段的长度（以毫米为单位）。
-sender.help.arcs.threshold = 小圆弧阈值：小于该圆弧长度（单位：mm）将转换为 G1 指令。
-sender.help.autoconnect = 启动时尝试连接到最后一次连接成功的的控制器。
-sender.help.autoreconnect = 如果检测到断开连接，请尝试重新连接到控制器。
-sender.help.commandSplitter = 将 gcode 命令拆分为多个部分，以便精准地报告错误。
-sender.help.patternRemover = 删除与正则表达式模式匹配的文本
-sender.help.spindle-dwell = 使用“M3”或“M4”命令启用主轴后添加可配置的延迟（以秒为单位）。
-sender.help.state = 状态颜色显示：根据状态突出显示控制器状态红/橙/黄。
-sender.nightly-warning = 对非正式版本更新也弹窗提示
-sender.notification.nightlyBuild.doNotShowAgain = 不再显示该消息
-sender.notification.nightlyBuild.message = 此版本的Universal Gcode Sender是最新测试版。\n它包含所有最新功能和改进，\n但也可能存在仍需要修复的错误。\n\n如果您遇到任何问题，请在 github 上报告。
-sender.notification.nightlyBuild.title = 每晚构建
-settings.connectionDriver = 连接设备
-settings.file.generalError = 初始化固件配置文件时发生错误：
-settings.file.outOfDate.message = 一项或多项配置设置已过时，应更新。 某些设置将使用默认值重置。 您想更新固件配置吗？
-settings.file.outOfDate.title = 过时的配置
-settings.language = 语言
-settings.log.location = 设置文件位置
-settings.pendantPort = Pendant 网站端口
-settings.processors.help = 这些过滤器用于在将 gcode 发送到控制器之前对其进行处理。 其中一些必须启用，另一些则可以禁用。 大多数是通过发件人设置菜单中的全局设置进行配置的。 可以添加自定义过滤器来删除特定模式，例如“Td+”将删除“T1”、“T12”等的任何实例。
-settings.workspaceDirectory = 工作目录
-tinyg.exception.unknownVersion = 这是未知的 TinyG 版本：%s。 如果您正在运行 g2core，请更新您的连接设置。
\ No newline at end of file