diff --git a/ugs-core/src/resources/MessagesBundle_af_ZA.properties b/ugs-core/src/resources/MessagesBundle_af_ZA.properties
index c52d14db5..01854d0fb 100644
--- a/ugs-core/src/resources/MessagesBundle_af_ZA.properties
+++ b/ugs-core/src/resources/MessagesBundle_af_ZA.properties
@@ -2,6 +2,7 @@ title = Universele G-kode Stuurder
 version = Weergawe
 error = Probleem
 success = Sukses
+verbose = verbose
 close = Maak toe
 save = Spaar
 open = Maak oop
@@ -26,6 +27,7 @@ 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
@@ -63,6 +65,7 @@ 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 c503c26d2..923467000 100644
--- a/ugs-core/src/resources/MessagesBundle_ca_ES.properties
+++ b/ugs-core/src/resources/MessagesBundle_ca_ES.properties
@@ -1,4 +1,6 @@
+title = Universal Gcode Sender
 version = Versió
+error = Error
 success = Èxit
 verbose = Detallat
 close = Tanca
@@ -12,6 +14,7 @@ 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.
@@ -60,11 +63,13 @@ 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
@@ -74,6 +79,7 @@ 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
@@ -156,12 +162,14 @@ 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.
+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
 mainWindow.swing.resetX = Restableix l'eix X
 mainWindow.swing.resetY = Restableix l'eix Y
diff --git a/ugs-core/src/resources/MessagesBundle_cs_CZ.properties b/ugs-core/src/resources/MessagesBundle_cs_CZ.properties
index 2e2d139c1..fd940ad13 100644
--- a/ugs-core/src/resources/MessagesBundle_cs_CZ.properties
+++ b/ugs-core/src/resources/MessagesBundle_cs_CZ.properties
@@ -1,3 +1,4 @@
+title = Universal Gcode Sender
 version = Verze
 error = Chyba
 success = Úspěch
@@ -37,6 +38,7 @@ 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
@@ -57,6 +59,7 @@ 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\:
@@ -75,6 +78,8 @@ 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
@@ -86,10 +91,8 @@ 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
@@ -121,6 +124,7 @@ 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
@@ -149,6 +153,12 @@ 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ě
@@ -201,6 +211,15 @@ 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í.
@@ -211,12 +230,16 @@ 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
-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.
+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
 mainWindow.swing.resetY = Resetování osy Y
@@ -235,6 +258,7 @@ 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é.
@@ -250,6 +274,7 @@ 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.
@@ -263,8 +288,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.highlight = Editor barvy zvýraznění řádku
 platform.visualizer.color.linear = Barva lineárního pohybu (G1)
+platform.visualizer.color.highlight = Editor barvy zvýraznění řádku
 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
@@ -307,6 +332,7 @@ 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
@@ -323,6 +349,10 @@ 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
@@ -403,11 +433,10 @@ 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.hole-diameter = Približný průmer díry
-probe.hole-center-hint = Přesuňte sondu do přibližného středu
-probe.measure.hole-center = Změrit střed díry
 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
 probe.visualizer.hole-center-preview = Náhled měření středu díry
 probe.visualizer.z-preview = Náhled Z měření sondy
@@ -426,11 +455,13 @@ 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
@@ -442,6 +473,7 @@ 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
@@ -470,6 +502,7 @@ 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.
@@ -488,6 +521,7 @@ 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
@@ -514,6 +548,8 @@ 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
@@ -536,9 +572,15 @@ 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
@@ -547,9 +589,13 @@ 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 95bf81ee6..0f1c747a7 100644
--- a/ugs-core/src/resources/MessagesBundle_de_DE.properties
+++ b/ugs-core/src/resources/MessagesBundle_de_DE.properties
@@ -1,30 +1,31 @@
 title = Universal G-Code Sender
+version = Version
 error = Fehler
 success = Erfolgreich
-verbose = ausführlich
-close = Schließen
+verbose = ausführlich
+close = Schließen
 save = Sichern
-open = Öffnen
-add = Hinzufügen
-delete = Löschen
+open = Öffnen
+add = Hinzufügen
+delete = Löschen
 setting = Einstellung
 value = Wert
 description = Beschreibung
 help = Hilfe
 import = Importieren
 export = Exportieren
-save.close = Speichern und Schließen
+save.close = Speichern und Schließen
 unknown = unbekannt
 millimeters = Millimeter
 inches = Inch
-macroPanel.button = Ausführen
+macroPanel.button = Ausführen
 macroPanel.name = Makro Name
 macroPanel.text = G-Code
 macroPanel.description = Makro Beschreibung
 macroPanel.try = Versuch
-mainWindow.helpDialog = Hilfe für Fräseinstellung
-mainWindow.resetZero = Nullpunkt zurücksetzen\: Koordinaten auf Null setzen ohne die Maschine zu bewegen
-mainWindow.returnToZero = Zurück auf Null\: Bewegt die Maschine zur Position 0, 0, 0.
+mainWindow.helpDialog = Hilfe für Fräseinstellung
+mainWindow.resetZero = Nullpunkt zurücksetzen\: Koordinaten auf Null setzen ohne die Maschine zu bewegen
+mainWindow.returnToZero = Zurück auf Null\: Bewegt die Maschine zur Position 0, 0, 0.
 mainWindow.softReset = Soft Reset\: Setzt GRBL-Zustand zurück, ohne die Positionsdaten zu verändern.
 mainWindow.homing = $H\: Beginn Referenzfahrt. Benötigt mindestens Grbl Version 0.8c für volle Unterstützung
 mainWindow.alarmLock = $X\: Deaktiviert die GRBL Alarm-Sperre
@@ -34,14 +35,17 @@ mainWindow.helpKeyboard = Tastatursteuerung\:
 mainWindow.helpKeyX = X\: Pfeil links/rechts; Ziffernblock links/rechts; Numpad\: 4/6
 mainWindow.helpKeyY = Y\: Pfeil auf/ab; Ziffernblock auf/ab; Numpad\: 8/2
 mainWindow.helpKeyZ = Z\: Bild Auf/Ab; Ziffernblock Bild Auf/Ab; Ziffernblock\: 9/3
-mainWindow.helpKeyPlusMinus = Schritte Vergrößern/Verkleinern\: Ziffernblock  +/-
-mainWindow.helpKeyDivMul = Schritte ändern\: Ziffernblock ÷/*
+mainWindow.helpKeyPlusMinus = Schritte Vergrößern/Verkleinern\: Ziffernblock  +/-
+mainWindow.helpKeyDivMul = Schritte ändern\: Ziffernblock ÷/*
 mainWindow.helpKeyZero = Reset Null\: Ziffernblock Einfg/0
+mainWindow.status.alarm = Alarm
 mainWindow.status.hold = Pause
 mainWindow.status.queue = Warteschl.
-mainWindow.status.run = läuft
+mainWindow.status.run = läuft
 platform.menu.runFrom = Starte von…
-mainWindow.error.openingFile = Problem beim  Öffnen der Datei
+platform.menu.toggleUnit = Einheiten umschalten
+platform.menu.toggleUnit.tooltip = Schaltet die bevorzugten Einheiten in der Anwendung ein
+mainWindow.error.openingFile = Problem beim  Öffnen der Datei
 mainWindow.error.processingFile = Unbekannte IOException während der Dateiverarbeitung
 mainWindow.error.pauseResume = Fehler während des Versuchs zu pausieren/fortzusetzen
 mainWindow.error.startingStream = Fehler beim Start des Datenstroms
@@ -51,16 +55,18 @@ mainWindow.error.notGrbl = Sie verwenden keine GRBL Verbindung
 mainWindow.error.duringSave = Beim Speichern ist ein Fehler aufgetreten.
 mainWindow.error.noSerialPort = Keinen seriellen Port gefunden
 mainWindow.error.firmwareSetting = Beim Festlegen einer oder mehrerer dieser Steuerungsfunktionen ist ein Problem aufgetreten.
-mainWindow.error.connection = Fehler beim Öffnen der Verbindung
+mainWindow.error.connection = Fehler beim Öffnen der Verbindung
 mainWindow.error.jobComplete = Job mit Fehler abgeschlossen.
 mainWindow.error.showTableActive = Die Befehlstabelle kann nicht aktiviert werden, solange Befehle aktiv sind.
 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.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\:
@@ -71,36 +77,36 @@ 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
 mainWindow.swing.bottomTabbedPane.table = Befehlstabelle
 mainWindow.swing.latestCommentLabel = Letzter Kommentar\:
 mainWindow.swing.machinePosition = Fräsposition
-mainWindow.swing.opencloseButton = Öffnen
+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.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.returnToZeroButton = Zurück auf Null
 mainWindow.swing.homeMachine = Home
 mainWindow.swing.rowsLabel = Zeilen in Datei
 mainWindow.swing.scrollWindowCheckBox = Ausgabefenster scrollen
 mainWindow.swing.sendButton = Senden
 mainWindow.swing.sentRowsLabel = gesendete Zeilen
-mainWindow.swing.showVerboseOutputCheckBox = Ausführl. Ausgabe
+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.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.inchRadioButton = Zoll
 mainWindow.swing.mmRadioButton = Millimeter
@@ -117,6 +123,8 @@ 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
@@ -126,19 +134,19 @@ firmware.tinyg.setting.short.description.vm = Geschwindigkeit Maximum
 firmware.tinyg.setting.short.description.fr = Vorschubgeschwindigkeit maximal
 firmware.tinyg.setting.short.description.tn = Arbeitsbereich Minimum
 firmware.tinyg.setting.short.description.tm = Arbeitsbereich Maximum
-firmware.tinyg.setting.short.description.jm = Jerk Maximum
-firmware.tinyg.setting.short.description.jh = Jerk hoch
+firmware.tinyg.setting.short.description.jm = Ruck Maximum
+firmware.tinyg.setting.short.description.jh = Ruck hoch
 firmware.tinyg.setting.short.description.ra = Radius Einstellung
 firmware.tinyg.setting.short.description.hi = Homing Eingang
 firmware.tinyg.setting.short.description.hd = Homing Richtung
 firmware.tinyg.setting.short.description.sv = Suchlauf Geschwindigkeit
-firmware.tinyg.setting.short.description.lv = Latch Geschwindigkeit
-firmware.tinyg.setting.short.description.lb = Latch Rückzug
+firmware.tinyg.setting.short.description.lv = Geschwindigkeit Verriegeln
+firmware.tinyg.setting.short.description.lb = Rückzug Verriegeln
 firmware.tinyg.setting.short.description.zb = Nullpunkt Rückzug
 firmware.tinyg.setting.short.description.ma = Auf Achse zuordnen
 firmware.tinyg.setting.short.description.sa = Schritt Winkel
-firmware.tinyg.setting.short.description.tr = Arbeitsbereicht Umdrehungen
-firmware.tinyg.setting.short.description.mi = Mikrosschritte
+firmware.tinyg.setting.short.description.tr = Arbeitsbereich Umdrehungen
+firmware.tinyg.setting.short.description.mi = Mikroschritte
 firmware.tinyg.setting.short.description.su = Schritte per Einheit
 firmware.tinyg.setting.short.description.po = Polarität
 firmware.tinyg.setting.short.description.pm = Power Modus
@@ -149,6 +157,12 @@ 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
@@ -159,8 +173,8 @@ sender.whitespace = Entferne Leerzeichen in Befehlen
 sender.status = Aktiviere Status Abfrage
 sender.status.rate = Status Abfrage-Geschwindigkeit (ms)
 sender.safety-height = Notwendige Mindesthöhe um von der Arbeitsposition zum Ausgangspunkt/Home zurückzukehren
-sender.arcs = Konvertiere B&ouml;gen zu Linien
-sender.arcs.threshold = Grenzwert kleiner B&ouml;gen (mm)
+sender.arcs = Konvertiere Bögen zu Linien
+sender.arcs.threshold = Grenzwert kleiner Bögen (mm)
 sender.arcs.length = Kleine Radien-Segmentlänge (mm)
 sender.autoconnect = Beim Start autom. verbinden
 sender.autoreconnect = Autom. neu verbinden
@@ -171,7 +185,7 @@ sender.notification.nightlyBuild.doNotShowAgain = Die Mitteilung nicht wieder an
 sender.help.speed.override = Aktiviert oder deaktiviert die Geschwindigkeitsanpassung.
 sender.help.speed.percent = Speed Override in Prozent\: Faktor mit dem die Geschwindigkeit skaliert wird.
 sender.help.command.length = Maxim. Befehlslänge\: Maximale Länge eines Befehls, bevor eine Fehler ausgelöst wird.
-sender.help.truncate = K&uuml;rzt Dezimalstellen\: Anzahl der Stellen die an die Firmware gesendet werden.
+sender.help.truncate = Kürzt Dezimalstellen\: Anzahl der Stellen die an die Firmware gesendet werden.
 sender.help.singlestep = Aktiviert Einzelschritt\: Schaltet den Einzelschritt Modus an, welcher sehr langsam ist.
 sender.help.whitespace = Entfernt Leerzeichen\: Entfernt unnötige Leerzeichen in GCode Befehlen.
 sender.help.status = Aktiviert Statusabfragen\: Schaltet die Statusabfrage an, wenn von der Firmware unterstützt.
@@ -184,19 +198,19 @@ sender.help.autoconnect = Versuche beim Start der Anwendung mit letzter verwende
 sender.help.autoreconnect = Versuche erneut mit der Steuerung zu verbinden, falls eine Trennung festgestellt wurde.
 sender.help.dialog.title = Hilfe zu Sender-Einstellung
 communicator.exception.port = keine Porttreiber vorhanden
-controller.exception.booting = GRBL ist nicht vollst&auml;ndig gestartet
+controller.exception.booting = GRBL ist nicht vollständig gestartet
 controller.exception.sendError = Fehler beim Senden von '%s'\: %s. Der Sendeprozess wurde pausiert.
 controller.exception.unexpectedError = Unerwarteter Fehler wurde erkannt\: %s
-controller.exception.homing = Keine unterst&uuml;tzte Referenzfahrt-Methode in dieser Version.
-controller.exception.reset = Keine unterst&uuml;tzte Koordiantenreset-Funktion in dieser Version.
-controller.exception.gohome = Keine unterst&uuml;tzten Home Koordinaten in dieser Version.
-controller.exception.killalarm = Keine unterst&uuml;tzte Kill-Alarmsperre-Funktion in dieser Version.
-controller.exception.checkmode = Keine unterst&uuml;tzte Toggle-Check-Modus-Methode für diese Version.
-controller.exception.parserstate = Keine unterst&uuml;tzte Funktion zur Ansicht des Parser-Zustandes in dieser Version.
+controller.exception.homing = Keine unterstützte Referenzfahrt-Methode in dieser Version.
+controller.exception.reset = Keine unterstützte Koordinatenreset-Funktion in dieser Version.
+controller.exception.gohome = Keine unterstützten Home Koordinaten in dieser Version.
+controller.exception.killalarm = Keine unterstützte Kill-Alarmsperre-Funktion in dieser Version.
+controller.exception.checkmode = Keine unterstützte Toggle-Check-Modus-Methode für diese Version.
+controller.exception.parserstate = Keine unterstützte Funktion zur Ansicht des Parser-Zustandes in dieser Version.
 controller.exception.softreset = Kein unterstützter Soft Reset in dieser Version.
 controller.exception.sendingstatus = IOException während dem Senden eines Status Kommandos.
 controller.exception.rowStatInvalid = Zeilenzählung bei Rohdateilesen nicht verfügbar.
-controller.error.response = Fehler während der Vearbeitung einer Antwort
+controller.error.response = Fehler während der Verarbeitung einer Antwort
 controller.log.version = GRBL Version
 controller.log.realtime = Echtzeit-Modus
 controller.log.notconnected = nicht verbunden
@@ -209,14 +223,21 @@ settings.log.error = Kann Einstellungen nicht laden, verwende Grundeinstellungen
 settings.log.saveerror = Kann Einstellungen nicht speichern\!
 visualizer.title = G-Code Vorschau
 VisualizerCanvas.dimensions = Dimensionen
-VisualizerCanvas.height = H&ouml;he
+VisualizerCanvas.height = Höhe
 VisualizerCanvas.width = Breite
-platform.menu.jog.size = Schrittl&auml;nge
+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 Firmwareinstellungen aktiviert werden
-incomplete.localization = Universal Gcode Sender ist für diese Sprache nicht vollständig übersetzt.\n\nBitte besuchen Sie\n\nhttps://translate.universalgcodesender.com\n\num beim Übersetzen zu helfen.
+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
 mainWindow.swing.resetZ = Reset Z Achse
@@ -226,13 +247,23 @@ 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+
+jogging.xMinus.yMinus = Tipp\: X+ Y-
+jogging.aPlus = Tipp\: A+
 jogging.divide = 1/10
 jogging.multiply = 10-fach
 jogging.increase = Jog\: XY-Schrittweite erhöhen
 jogging.decrease = verringern
 jogging.divide.z = Dividiere Z-Schrittweite durch 10
-jogging.multiply.z = Multipliziere Z-Schrittgrösse mit 10
-jogging.increase.z = Jog\: Erh&ouml;he Z-Schrittweite
+jogging.multiply.z = Multipliziere Z-Schrittgröße mit 10
+jogging.increase.z = Jog\: Erhöhe Z-Schrittweite
 jogging.decrease.z = Jog\: Verringere Z-Schrittweite
 jogging.divide.abc = Jog\: ABC Schrittweite geteilt durch 10
 jogging.multiply.abc = Jog\: ABC Schrittweite mal 10
@@ -243,15 +274,18 @@ 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&auml;ufige Aktionen
-platform.window.actions.tooltip = Tastenk&uuml;rzel für gemeins. gcode Befehle und Maschinen Aktionen.
+platform.window.actions = Häufige Aktionen
+platform.window.actions.tooltip = Tastenkürzel für gemeins. gcode Befehle und Maschinen Aktionen.
 platform.window.workflow = Arbeitsablaufhelfer
 platform.window.workflow.tooltip = Hilft dir bei der Ausführung von Aufträgen die mehreren Dateien enthalten.
 platform.window.filebrowser = Datei-Browser
@@ -260,7 +294,7 @@ platform.window.jogcontrol = Jog
 platform.window.jogcontrol.tooltip = Manuelles steuern der Maschinenlage
 platform.window.macros = Makros
 platform.window.macros.tooltip = Makros die in den Einstellungen erstellt wurden, können hier genutzt werden.
-platform.window.overrides = &Uuml;bersteuerung
+platform.window.overrides = Übersteuerung
 platform.window.overrides.tooltip = Senden und Überschreibungen beobachten
 platform.window.sendstatus = Sendeprozess
 platform.window.sendstatus.tooltip = Fortschritt der aktuell gesendeten Datei.
@@ -268,11 +302,13 @@ platform.window.serialconsole = Konsole
 platform.window.serialconsole.tooltip = Konsole zur Anzeige von Nachrichten an und von der Steuereinheit.
 platform.window.visualizer = Vorschau
 platform.window.visualizer.tooltip = 3D-Ansicht vom aktuellen Betrieb.
+platform.window.fileBrowser.tooltip = Laden Sie einen Ordner, um Dateien anzusehen und mit ihnen zu arbeiten.
 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.linear = Farbe - lineare Bewegung (G1)
 platform.visualizer.color.rapid = Farbe - Eilgang (G0)
+platform.visualizer.color.linear = Farbe - lineare Bewegung (G1)
 platform.visualizer.color.arc = Farbe - Bogenbewegung (G2/G3)
 platform.visualizer.color.plunge = Farbe - Auf/Ab-Bewegung
 platform.visualizer.color.completed = Farbe der fertiggestellten Abschnitte
@@ -284,7 +320,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
@@ -292,19 +328,20 @@ parser.processor.arc.start-error = Kein Ausgangspunkt um Bogen zu erweitern.
 parser.processor.arc.multiple-commands = Auf einer Linie wurden, während der Erweiterung eines Bogens, mehrere Befehle gefunden. Fortsetzung nicht möglich. Zum fortsetzen kann die Befehlsaufsplittung verwendet werden.
 sender.help.commandSplitter = Splittet GCode-Befehl für eine bessere Fehler-Berichterstattung in mehrere Teile.
 sender.help.patternRemover = Entfernt Text nach dem Muster eines regulären Ausdrucks
-controller.exception.ignoreFutureErrors = Wollen sie Befehle wie diesen in Zukunft &uuml;berspringen?
+controller.exception.ignoreFutureErrors = Wollen sie Befehle wie diesen in Zukunft überspringen?
 settings.processors.header = Gcode Prozessor Einstellung
 settings.file.outOfDate.title = Veraltete Konfiguration
-settings.file.outOfDate.message = Eine oder mehrere Konfigurationen sind veraltet und sollten aktualisiert werden. Einige einstellungen werden auf Voreinstellungen zurückgesetzt.\nMöchten sie die Firmwareeinstellungen aktualisieren?
+settings.file.outOfDate.message = Eine oder mehrere Konfigurationen sind veraltet und sollten aktualisiert werden. Einige Einstellungen werden auf Voreinstellungen zurückgesetzt.\nMöchten sie die Firmwareeinstellungen aktualisieren?
 settings.file.generalError = Während der Initialisierung der Firmware-Konfigurationsdatei ist ein Fehler aufgetreten.
 settings.processors.enabled = Aktiviert
-settings.processors.add = Hinzuf&uuml;gen
-settings.processors.remove = Enferne Auswahl
+settings.processors.add = Hinzufügen
+settings.processors.remove = Entferne Auswahl
 settings.processors.help = Diese Filter werden verwendet, um G-Code zu verarbeiten, bevor dieser an die Steuerung gesendet wird. Einige von ihnen müssen aktiviert, andere deaktiviert sein. Die meisten werden in den globalen Einstellungen im Sendereinstellungsmenü konfiguriert. Benutzerdefinierte Filter können hinzugefügt werden, um bestimmte Muster zu entfernen, zum Beispiel "Td+" wird jede Instanz von "T1", "T12" usw entfernen.
 settings.processors.loadError = Prozessor kann nicht geladen werden
 settings.language = Sprache
 settings.connectionDriver = Verbindung Treiber
 settings.workspaceDirectory = Arbeitsbereich Verzeichnis
+settings.pendantPort = Pendant Webport
 ArcExpander = Bogen-Strecke Konverter
 CommandLengthProcessor = Befehlslängen-Prozessor
 CommandSplitter = Befehls-Splittung
@@ -316,6 +353,7 @@ 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.
@@ -325,28 +363,35 @@ platform.visualizer.popup.submenu.copyCoordinates = Kopiere Koordinaten
 
 mainWindow.error.error = Die Operation kann nicht beendet werden
 mainWindow.ui.connectDisconnect = Verbinden oder unterbrechen
-mainWindow.swing.stepSizeZLabel = Z Schrittgr&ouml;&szlig;e
+mainWindow.swing.stepSizeZLabel = Z Schrittgröße
 mainWindow.swing.feedRateLabel = Vorschubrate
 toolbar.icon.small = Kleine Icons
 toolbar.icon.large = Große Icons
 sender.help.verbose.console = Zeige zusätzliche Informationen in der Steuerungskonsole
-platform.menu.open = &Ouml;ffne Gcode Datei
+platform.menu.open = Öffne Gcode Datei
+platform.menu.open.recent = Letzte öffnen
+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&uuml;r
+machineStatus.pin.door = Tür
 machineStatus.pin.hold = Halt
 machineStatus.pin.softReset = Software Reset
 machineStatus.pin.cycleStart = Durchlauf starten
-sender.step.separateZ = Seperate Schrittgrösse für Z und XY Jog-Bewegungen
+sender.step.separateZ = Separate Schrittgröße für Z und XY Jog-Bewegungen
 controller.exception.unexpectedCommand = Unzulässige Eingabe wurde vom Controller gefunden
 platform.window.probe = Sonde Helfer
 platform.window.probe.tooltip = Achsen auf Null setzen mit Sonde
 probe.feed-rate = Sonde Vorschubgeschwindigkeit
+probe.scan-rate = Anfahrgeschwindigkeit zur Sonde
 probe.probe-distance = Sonde Abstand/Richtung
 probe.plane = Sonde Achse
-probe.plate-thickness = Tochfeld Dicke
+probe.plate-thickness = Tastplatte Dicke
 probe.button = Initialisiere Sonde
-platform.menu.overrides = Echtzeit überschreitung
+platform.menu.overrides = Echtzeit Überschreitung
 overrides.spindle = Spindel Vorschub
 overrides.spindle.short = Spindel
 overrides.spindle.reset = Spindel-Reset
@@ -358,7 +403,7 @@ overrides.rapid.short = Schnell
 overrides.rapid.low = Tief
 overrides.rapid.medium = Mittel
 overrides.rapid.full = Hoch
-overrides.mist = Kühlmittel Vernebel
+overrides.mist = Kühlmittel Vernebeln
 overrides.flood = Kühlmittel fluten
 overrides.toggle.short = schalten
 restart = Neustart nötig
@@ -373,30 +418,36 @@ mainWindow.swing.baudrate.toolbarTitle = Übertragungsrate Werkzeugleiste
 parser.processor.general.multiple-commands = Mehrere Befehle wurden auf einer Zeile gefunden. Dies wird von diesem Prozessor nicht unterstützt. Aktiviere den Befehlstrenn-Prozessor (command splitter processor ), um fortzufahren.
 platform.window.autoleveler = Auto-Ebenen-Abgleich
 platform.window.autoleveler.tooltip = Materialoberfläche antasten und Gcode auf der Grundlage des Ergebnisses anpassen.
+platform.visualizer.renderable.gcode-model = G-Code
 platform.visualizer.renderable.grid = Koordinaten und Ebene
 platform.visualizer.renderable.highlight = Gcode-Editor Anzeige
 platform.visualizer.renderable.editor-position=Editiere Cursor Position
 platform.visualizer.renderable.mouse-indicator = Mauskoordinaten
 platform.visualizer.renderable.orientation-cube = Orientierungswürfel
 platform.visualizer.renderable.selection = Mausauswahlfeld
-platform.visualizer.renderable.gcode-model-size = Gcode Gr&ouml;&szlig;e
+platform.visualizer.renderable.gcode-model-size = Gcode Größe
 platform.visualizer.renderable.tool-location = Werkzeugstandort
 platform.visualizer.renderable.autolevel-preview = Auto-Ebenen-Abgleich Vorschau
 platform.visualizer.renderable.machine-boundries = Maschinengrenzen
-autoleveler.panel.z-surface = Gcode Z-Oberfl&auml;che
-autoleveler.panel.resolution = Aufl&ouml;sung
+autoleveler.panel.z-surface = Gcode Z-Oberfläche
+autoleveler.panel.resolution = Auflösung
 autoleveler.panel.use-file = Benutze die geladene Datei
-autoleveler.panel.scan-surface = Scan-Oberfl&auml;che
+autoleveler.panel.scan-surface = Scan-Oberfläche
 autoleveler.panel.apply = Auf Gcode anwenden
-autoleveler.panel.view-data = Zeige Daten
 autoleveler.panel.visible = Sichtbarer AutoLeveler
-autoleveler.option.z-zero = Z-Höhe der Antast-Oberfl&auml;che im Gcode
+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)
 autoleveler.option.offset-x = Tester Offset X-Achse
 autoleveler.option.offset-y = Tester Offset Y-Achse
 autoleveler.option.offset-z = Tester Offset X-Achse
+autoleveler.probe-failed = Sondenfahrt fehlgeschlagen
 experimental.feature = Experimentelle Funktion. Mit besonderer Vorsicht benutzen und Fehler auf GitHub melden.
 # Window title for platform GUI
+platform-title = Universal Gcode Platform
 mainWindow.swing.alarmLock = Freischalten
 mainWindow.swing.checkMode = Test-Modus
 mainWindow.swing.getState = Status abrufen
@@ -406,21 +457,20 @@ probe.find-rate = Schnellsuch-Rate
 probe.measure-rate = Feinmess-Rate
 probe.x-distance = Antasten X-Abstand
 probe.y-distance = Antasten Y-Abstand
-probe.z-distance = Antasten Z-Abstand
-probe.retract-height = Höhe Zurückziehen
 probe.retract-amount = Anzahl Zurückziehen
 probe.hole-diameter = Ungefährer Lochdurchmesser
 probe.hole-center-hint = Bewegen Sie die Sonde ungefähr in die Mitte
-probe.measure.hole-center = Lochmitte messen
-probe.measure.outside-corner = Messung Außenecke
-probe.measure.inside-corner = Messung Innenecke
 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
-sender.help.spindle-dwell = Einstellbare Verzögerung (in Sekunden) nach Aktivierung der Spindel mit ainem "M3" Kommando
+sender.help.spindle-dwell = Einstellbare Verzögerung (in Sekunden) nach Aktivierung der Spindel mit einem "M3" Kommando
 SpindleOnDweller = Spindel Start Verzögerung
 platform.window.dowel-module = Duplizierer /  Dübel Macher
 platform.window.dowel-module.tooltip = Erstellt G-Code um Duplikate in verschiedenen Formen und Größen.
@@ -431,17 +481,22 @@ platform.plugin.dowel-module.dowel = Dübel
 platform.plugin.dowel-module.x = X Anzahl
 platform.plugin.dowel-module.y = Y Anzahl
 platform.plugin.dowel-module.diameter = Durchmesser
-platform.plugin.dowel-module.length = L&auml;nge
+platform.plugin.dowel-module.length = Länge
 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
+platform.plugin.setupwizard.update = Aktualisieren
 platform.plugin.setupwizard.update-settings = Update Einstellungen
 platform.plugin.setupwizard.connection.title = Verbindung
-platform.plugin.setupwizard.connection.intro = Diese Anleitung hilft Ihnen dabei, Ihren CNC Controller mit <b>Universal Gcode Sender</b> zu konfgurieren. Lassen Sie uns mit dem Verbinden zum Controller beginnen.
+platform.plugin.setupwizard.connection.intro = Diese Anleitung hilft Ihnen dabei, Ihren CNC Controller mit <b>Universal Gcode Sender</b> zu konfigurieren. Lassen Sie uns mit dem Verbinden zum Controller beginnen.
 platform.plugin.setupwizard.connection.not-supported = Die Einstellungshilfe wird für diesen Controller nicht unterstützt.
 platform.plugin.setupwizard.connection.connecting = Verbinde...
 platform.plugin.setupwizard.connection.connected-to = Verbunden mit
@@ -451,7 +506,7 @@ platform.plugin.setupwizard.import-settings.created-by = Erstellt von\:
 platform.plugin.setupwizard.import-settings.created-date = Datum\:
 platform.plugin.setupwizard.import-settings.finished-title = Importieren der Einstellungen beendet
 platform.plugin.setupwizard.import-settings.finished-description = Bitte fahren Sie mit den folgenden Schritten fort, um ihre Konfiguration zu überprüfen.
-platform.plugin.setupwizard.import-settings.open-settings = &Ouml;ffne Einstellungs-Datei
+platform.plugin.setupwizard.import-settings.open-settings = Öffne Einstellungs-Datei
 platform.plugin.setupwizard.import-settings.import = Importiere Einstellungen
 platform.plugin.setupwizard.import-settings.overwrite-message = Wollen Sie die aktuellen Firmware Einstellungen wirklich überschreiben?
 platform.plugin.setupwizard.import-settings.overwrite-title = Firmware Einstellungen überschreiben?
@@ -460,7 +515,7 @@ platform.plugin.setupwizard.motor-wiring.intro = Wir testen jetzt, ob die Motore
 platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = Sie haben Soft Limits aktiviert. Jeder Knopf, der die Maschine über diese Grenzen hinaus bewegen würde, wird inaktiv geschaltet.
 platform.plugin.setupwizard.motor-wiring.reverse-direction = Richtung umkehren
 platform.plugin.setupwizard.calibration.title = Schritt Kalibrierung
-platform.plugin.setupwizard.calibration.intro = Wir werden nun versuchen, Ihre Maschine zu kalibrieren. Versuchen Sie, die Maschine zu <b>bewegen</b> und die Ergebnisse zu <b>messen</b>, dann auf die geschätzen Schritte zu <b>kalibrieren</b>.
+platform.plugin.setupwizard.calibration.intro = Wir werden nun versuchen, Ihre Maschine zu kalibrieren. Versuchen Sie, die Maschine zu <b>bewegen</b> und die Ergebnisse zu <b>messen</b>, dann auf die geschätzten Schritte zu <b>kalibrieren</b>.
 platform.plugin.setupwizard.calibration.actual-movement = Aktuelle Bewegung\:
 platform.plugin.setupwizard.calibration.adjust = Einstellen Schritte pro Millimeter\:
 platform.plugin.setupwizard.calibration.setting = Einstellung (Schritte/mm)
@@ -488,7 +543,7 @@ gcode.setting.feed = Vorschubrate
 gcode.setting.xy-feed = Vorschubrate (XY)
 gcode.setting.z-feed = Vorschubrate (Z)
 gcode.setting.endmill-radius = Fräser Radius
-gcode.setting.endmill-diameter = Fraeser Durchmesser
+gcode.setting.endmill-diameter = Fräser Durchmesser
 gcode.setting.safety-height = Sicherheitshöhe
 gcode.setting.cut-depth = Tiefe per Durchgang
 platform.window.states = Zustand
@@ -502,8 +557,8 @@ gcode.g2 = Bogen im Uhrzeigersinn
 gcode.g3 = Bogen gegen den Uhrzeigersinn
 gcode.g38.2 = Antasten Vorwärts
 gcode.g38.3 = Antasten Vorwärts (kein Fehler)
-gcode.g38.4 = Antasten zur&uuml;ck
-gcode.g38.5 = Antasten zur&uuml;ck (kein Fehler)
+gcode.g38.4 = Antasten zurück
+gcode.g38.5 = Antasten zurück (kein Fehler)
 gcode.g80 = Bewegung unterbrechen
 gcode.distance-mode = Distanzmodus
 gcode.g90 = Absolut
@@ -514,15 +569,15 @@ gcode.g94 = Einheiten pro Minute
 gcode.g95 = Einheiten pro Umdrehung
 gcode.work-offset = Arbeits Offset
 gcode.plane = Aktive Ebene
-mainWindow.status.check = pr&uuml;fen
-mainWindow.status.door = T&uuml;r
+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&uuml;cksetzen
+platform.visualizer.popup.presets.reset = Ansicht zurücksetzen
 platform.visualizer.popup.presets.top = Oben
 platform.visualizer.popup.presets.left = Links
 platform.visualizer.popup.presets.front = Vorderseite
@@ -533,7 +588,7 @@ platform.plugin.jog.stepSize = Schrittweite
 platform.plugin.jog.stepSizeZ = Schrittweite Z
 platform.plugin.jog.stepSizeXY = Schrittweite XY
 platform.plugin.jog.stepSizeABC = Schritt Größe ABC
-platform.plugin.jog.stepLarger = Gr&ouml;&szlig;er
+platform.plugin.jog.stepLarger = Größer
 platform.plugin.jog.stepSmaller = Kleiner
 platform.plugin.jog.stealKeyboardFocus = Stelle sicher, dass die Tastaturkontrolle aktiv ist.
 platform.window.edit.macros = Editiere Makros…
@@ -541,9 +596,20 @@ platform.action.outline = Umriss
 platform.plugin.joystick.activate = Aktiviere Joystick
 platform.plugin.joystick.buttonControls = Tasten Kontrolle\:
 platform.plugin.joystick.analogControls = Analoge Steuerung\:
-platform.plugin.joystick.clear = L&ouml;sche
-platform.plugin.joystick.back = Zur&uuml;ck
-platform.plugin.joystick.select = Ausw&auml;hlen
+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
 platform.plugin.joystick.padDown = Joypad Runter
 platform.plugin.joystick.padRight = Joypad Rechts
@@ -555,6 +621,8 @@ platform.plugin.joystick.rightY = Rechter Stick Y
 platform.plugin.joystick.action.continuousJogging = Analoges Jog
 platform.plugin.joystick.reverseAxis = Umkehren
 platform.plugin.joystick.axisThreshold = Null Schwelle (%)
+platform.plugin.joystick.connectedTo = Verbunden mit
+platform.plugin.joystick.notConnected = Joystick nicht verbunden
 platform.plugin.cloud.s3Id = AWS Zugangsschlüssel ID
 platform.plugin.cloud.s3Secret = AWS Geheimer Zugangs Schlüssel
 platform.plugin.cloud.open = Öffne Cloud Datei
diff --git a/ugs-core/src/resources/MessagesBundle_el_GR.properties b/ugs-core/src/resources/MessagesBundle_el_GR.properties
index a8cf7a998..fc31e5c30 100644
--- a/ugs-core/src/resources/MessagesBundle_el_GR.properties
+++ b/ugs-core/src/resources/MessagesBundle_el_GR.properties
@@ -89,12 +89,6 @@ 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 = Μεταβείτε στο παράθυρο εξόδου
@@ -106,7 +100,6 @@ 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 = Εντολή
@@ -209,7 +202,6 @@ 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 = Παρουσιάστηκε σφάλμα
@@ -229,8 +221,7 @@ platform.menu.actions = Ενέργειες
 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 = Απαλή επαναφορά
+incomplete.localization = Το Universal Gcode Sender δεν είναι πλήρως προσαρμοσμένο σε αυτήν τη γλώσσα.\nΕπισκεφθείτε τη διεύθυνση https\://translate.universalgcodesender.com για να δείτε πώς μπορείτε να βοηθήσετε.
 mainWindow.swing.resetX = Επαναφορά X άξονα
 mainWindow.swing.resetY = Επαναφορά Y άξονα
 mainWindow.swing.resetZ = Επαναφορά Y άξονα
@@ -294,7 +285,6 @@ 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 = Βύθιση / αύξηση χρώματος κίνησης
@@ -414,10 +404,7 @@ 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.view-data = Προβολή δεδομένων
-autoleveler.panel.visible = Ορατό AutoLeveler
 autoleveler.option.z-zero = Z Ύψος της επιφάνειας του καθετήρα σε gcode
 autoleveler.option.arc-segment-length = Μήκος τμήματος γραμμής τόξου (mm)
 autoleveler.option.offset-x = Ανίχνευση  Χ offset
@@ -425,7 +412,6 @@ 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 = Λήψη κατάστασης
@@ -435,10 +421,7 @@ probe.find-rate = Γρήγορη τιμή εύρεσης
 probe.measure-rate = Αργός ρυθμός μέτρησης
 probe.x-distance = Probe X Απόσταση
 probe.y-distance = Probe Y Απόσταση
-probe.retract-height = Σύρετε το ύψος
 probe.retract-amount = Ανάκληση ποσού
-probe.measure.outside-corner = Μετρήστε την εξωτερική γωνία
-probe.measure.inside-corner = Μετρήστε την εσωτερική γωνία
 probe.visualizer.corner-preview = Προεπισκόπηση γωνιακού ανιχνευτή
 probe.visualizer.z-preview = προεπισκόπηση διερεύνησης άξονα Ζ
 parser.gcode.multiple-axis-commands = Πολλαπλοί κωδικοί που απαιτούν λέξεις άξονα σε μία γραμμή
@@ -550,7 +533,6 @@ 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 = Ταβάνι
@@ -595,3 +577,43 @@ 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_es_ES.properties b/ugs-core/src/resources/MessagesBundle_es_ES.properties
index fe20aca0d..65ee33d7d 100644
--- a/ugs-core/src/resources/MessagesBundle_es_ES.properties
+++ b/ugs-core/src/resources/MessagesBundle_es_ES.properties
@@ -20,19 +20,19 @@ macroPanel.text = GCode
 macroPanel.description = Descripcion
 mainWindow.helpDialog = Ayuda para el control de la maquina
 mainWindow.resetZero = Poner a cero\: Cambia las coordenadas actuales a cero sin mover la máquina.
-mainWindow.returnToZero = Regresa a cero\\\: Mueve la máquina a la ubicacion 0,0,0
+mainWindow.returnToZero = Regresa a cero\: Mueve la máquina a la ubicacion 0,0,0
 mainWindow.softReset = Reinicio del Software\: reinicia el estado del controlador sin actualizar la posicion.
 mainWindow.homing = Maquina de inicio\: Comienza el ciclo de retorno a casa. Si se utiliza GRBL, se requiere Grbl 0.8c o posterior para que sea totalmente compatible.
 mainWindow.alarmLock = Desbloqueo\: Desactiva el bloqueo de la alarma del controlador.
 mainWindow.checkMode = Modo de comprobacion\: Conmuta el modo 'check', en el que el controlador analiza el gcode pero no mueve la maquina.
 mainWindow.getState = Obtener estado\: Solicita informacion de estado al controlador (salida de resultados a la consola).
-mainWindow.helpKeyboard = Control del teclado\\\:
-mainWindow.helpKeyX = X\\\: Teclado\\\: Flecha Izq/Der; Teclado Numerico\\\: 4/6
-mainWindow.helpKeyY = Y\\\: Teclado\\\: Flecha Arr/Abajo; Teclado Numerico\\\: 8/2
-mainWindow.helpKeyZ = Z\\\: Página Arr / Página Abajo
-mainWindow.helpKeyPlusMinus = Aumentar/Disminuir pasos\\\: Teclado\\\: +/-
-mainWindow.helpKeyDivMul = Cambiar Pasos\\\: Teclado\\\: DIVIDIR / MULTIPLICAR
-mainWindow.helpKeyZero = Reset  a Cero\\\: Teclado\\\: Insertar; Teclado Numérico\\\: 0
+mainWindow.helpKeyboard = Control del teclado\:
+mainWindow.helpKeyX = X\: Teclado\: Flecha Izq/Der; Teclado Numerico\: 4/6
+mainWindow.helpKeyY = Y\: Teclado\: Flecha Arr/Abajo; Teclado Numerico\: 8/2
+mainWindow.helpKeyZ = Z\: Página Arriba/Página Abajo
+mainWindow.helpKeyPlusMinus = Aumentar/Disminuir pasos\: Teclado\: +/-
+mainWindow.helpKeyDivMul = Cambiar Pasos\: Teclado\: DIVIDIR / MULTIPLICAR
+mainWindow.helpKeyZero = Reset  a Cero\: Teclado\: Insertar; Teclado Numérico\: 0
 mainWindow.status.alarm = Alarma
 mainWindow.status.hold = Detener
 mainWindow.status.queue = Cola
@@ -56,9 +56,9 @@ mainWindow.error.rxtxMac2 = Directorio nombrado %s con los siguientes comandos
 mainWindow.ui.pauseButton = Pausa
 mainWindow.ui.resumeButton = Continuar
 mainWindow.ui.jobComplete = Trabajo completado despues de
-mainWindow.swing.activeStateLabel = Estado Activo\\\:
+mainWindow.swing.activeStateLabel = Estado Activo\:
 mainWindow.swing.arrowMovementEnabled = Activar movimiento por teclado
-mainWindow.swing.baudLabel = Baudios\\\:
+mainWindow.swing.baudLabel = Baudios\:
 mainWindow.swing.browseButton = Explorar
 mainWindow.swing.cancelButton = Cancelar
 mainWindow.swing.commandLabel = Comando\:
@@ -349,7 +349,7 @@ autoleveler.option.offset-y = Compensación de la sonda Y
 autoleveler.option.offset-z = Compensación de la sonda Z
 experimental.feature = Esto es una característica experimental. Por favor úselo con precaución y reporte   cualquier error que encuentre en GitHub.
 # Window title for platform GUI
-platform-title = Universal G-code
+platform-title = Plataforma Gcode Universal
 mainWindow.swing.alarmLock = Desbloquear
 mainWindow.swing.checkMode = Verificar
 mainWindow.swing.getState = Obtener estado
@@ -391,7 +391,7 @@ gcode.setting.safety-height = Altura segura
 gcode.setting.cut-depth = Profundidad de pasos
 platform.window.states = Estado
 platform.window.states.tooltip = Estados activos de gcode
-platform.plugin.gcode-tools.tiler.window = Gcode Tiler
+platform.plugin.gcode-tools.tiler.window = Mosaico de Codigo G
 platform.plugin.gcode-tools.tiler.tooltip = Convierte un archivo gcode en múltiples copias idénticas
 platform.plugin.gcode-tools.tiler.padding = Relleno entre copias
 gcode.g20 = Pulgadas
@@ -474,12 +474,12 @@ firmware.tinyg.setting.short.description.tm = Recorrido maximo
 firmware.tinyg.setting.short.description.jm = Jerk maximo
 firmware.tinyg.setting.short.description.jh = firmware.tinyg.setting.short.description.jh
 firmware.tinyg.setting.short.description.ra = Ajuste de radio
-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.hi = Entrada de referencia
+firmware.tinyg.setting.short.description.hd = Dirección de referencia
 firmware.tinyg.setting.short.description.sv = Velocidad de búsqueda
-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.lv = Velocidad de cierre
+firmware.tinyg.setting.short.description.lb = Cierre de retroceso
+firmware.tinyg.setting.short.description.zb = Nivel potencia
 firmware.tinyg.setting.short.description.ma = Mapa al eje
 firmware.tinyg.setting.short.description.sa = Ángulo de paso
 firmware.tinyg.setting.short.description.tr = Resolución de recorrido
@@ -487,7 +487,7 @@ firmware.tinyg.setting.short.description.mi = Micropasos
 firmware.tinyg.setting.short.description.su = Pasos por unidad
 firmware.tinyg.setting.short.description.po = Polaridad
 firmware.tinyg.setting.short.description.pm = Modo alimentacion
-firmware.tinyg.setting.short.description.pl = Nivel potencia\n
+firmware.tinyg.setting.short.description.pl = Nivel potencia
 firmware.tinyg.group.description.x = Eje X
 firmware.tinyg.group.description.y = Eje Y
 firmware.tinyg.group.description.z = Eje Z
@@ -524,16 +524,16 @@ platform.plugin.setupwizard.import-settings.created-by = Creado por\:
 platform.plugin.setupwizard.import-settings.created-date = Fecha
 platform.plugin.setupwizard.import-settings.finished-title = Ajustes importados terminados
 platform.plugin.setupwizard.import-settings.finished-description = Continue verificando su configuracion usando los siguientes pasos.
-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-cableado.title
-platform.plugin.setupwizard.motor-wiring.intro = platform.plugin.setupwizard.motor-cableado.intro
-platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = platform.plugin.setupwizard.motor-cableado.soft-limits-enabled
+platform.plugin.setupwizard.import-settings.open-settings = Abrir archivo de configuración...
+platform.plugin.setupwizard.import-settings.import = Importar configuración...
+platform.plugin.setupwizard.import-settings.overwrite-message = ¿Está seguro de que desea sobrescribir la configuración actual del firmware?
+platform.plugin.setupwizard.import-settings.overwrite-title = ¿Sobrescribir la configuración del firmware?
+platform.plugin.setupwizard.motor-wiring.title = Cableado de motores
+platform.plugin.setupwizard.motor-wiring.intro = Probaremos que sus motores están cableados correctamente. Pruebe cada eje usando los botones de paso.
+platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = Tienes los límites flexibles activados. Cualquier botón que mueva la máquina más allá de estos límites se desactivará.
 platform.plugin.setupwizard.motor-wiring.reverse-direction = Invertir direccion
 platform.plugin.setupwizard.calibration.title = Paso calibracion
-platform.plugin.setupwizard.calibration.intro = platform.plugin.setupwizard.calibration.intro
+platform.plugin.setupwizard.calibration.intro = Ahora intentaremos calibrar su máquina. Intente <b>mover</b> la máquina y <b>mida</b> los resultados, luego <b>calibre</b> a los pasos estimados.
 platform.plugin.setupwizard.calibration.actual-movement = Movimiento real
 platform.plugin.setupwizard.calibration.adjust = Ajuste los pasos por milímetro
 platform.plugin.setupwizard.calibration.setting = Ajuste (pasos/mm)
@@ -547,24 +547,24 @@ platform.plugin.setupwizard.soft-limits.intro = Los límites suaves impedirán q
 platform.plugin.setupwizard.soft-limits.instructions = Home su maquina y luego muevala a la posicion maxima segura en la direccion opuesta. Utilice esta posicion como su limite suave.
 platform.plugin.setupwizard.soft-limits.require-homing = El homing debe estar habilitado antes de habilitar los limites suaves.
 platform.plugin.setupwizard.soft-limits.not-available = Los limites suaves no estan disponibles en su hardware
-platform.plugin.setupwizard.homing.title = platform.plugin.setupwizard.homing.title
+platform.plugin.setupwizard.homing.title = Homing
 platform.plugin.setupwizard.homing.intro = Homing es un metodo para encontrar las coordenadas absolutas de la maquina.
 platform.plugin.setupwizard.homing.enable = Activar homing
 platform.plugin.setupwizard.homing.require-limit-switches = Los interruptores de limite deben habilitarse antes de habilitar el homing.
 platform.plugin.setupwizard.homing.not-available = Homing no esta disponible en su hardware.
 platform.plugin.setupwizard.homing.instruction1 = Tomese su tiempo para averiguar en que direccion estan sus interruptores de limite.
-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.instruction2 = Ahora prueba un ciclo de búsqueda, ¡pero <b>prepárate para abortar</b> si se está moviendo en la dirección equivocada\!
+platform.plugin.setupwizard.homing.try-homing = Prueba Homing
 platform.plugin.setupwizard.homing.abort = Abortar
 jogging.units.inch = Jog\: Pulgadas
-jogging.units.mm = jogging.units.mm
+jogging.units.mm = Jog\: mm
 jogging.units.toggle = Jog\: Alternar Unidades
 sender.autostartpendant = sender.autostartpendant
-sender.notification.nightlyBuild.title = sender.notification.nightlyBuild.title
+sender.notification.nightlyBuild.title = Construcción nocturna
 sender.notification.nightlyBuild.message = Esta version de Universal Gcode Sender es una compilacion nocturna.\nContiene todas las ultimas caracteristicas y mejoras,\npero tambien puede tener errores que aun deben ser corregidos.\n\nSi encuentra algun problema, por favor reportelo en github.
 sender.notification.nightlyBuild.doNotShowAgain = No mostrar este mensaje de nuevo.
 settings.workspaceDirectory = Directorio del espacio de trabajo
-autoleveler.panel.visible = Visible AutoLeveler
+autoleveler.panel.visible = Nivelador automático visible
 platform.plugin.setupwizard.calibration.computer-speed-warning = Esta configuración requiere una velocidad de cálculo de %s que excede el límite de 30kHz
 add = Añadir
 delete = Eliminar
@@ -581,7 +581,7 @@ platform.visualizer.popup.submenu.jogToHereHint = Mueva la cabeza a la posicion
 platform.visualizer.popup.submenu.setWorkOffsetToHere = Ajuste el offset de trabajo aqui
 platform.visualizer.popup.submenu.setWorkOffsetToHereHint = Solo establece el desplazamiento para el sistema de coordenadas actual, no mueve la cabeza
 platform.visualizer.popup.submenu.copyCoordinates = Copiar coordenadas
-platform.plugin.jog.stealKeyboardFocus = platform.plugin.jog.stealKeyboardFocus
+platform.plugin.jog.stealKeyboardFocus = Asegurarse de que los controles del teclado estén activos
 platform.window.edit.macros = Editar macros
 platform.plugin.jog.stepLarger = Alargar
 platform.plugin.jog.stepSmaller = Mas pequeña
@@ -600,21 +600,21 @@ platform.plugin.joystick.select = Seleccionar
 platform.plugin.joystick.start = Inicio
 platform.plugin.joystick.l3 = L3
 platform.plugin.joystick.r3 = 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 = Palanca derecha Y
+platform.plugin.joystick.padUp = Tecla Arriba
+platform.plugin.joystick.padDown = Tecla Abajo
+platform.plugin.joystick.padRight = Tecla Derecha
+platform.plugin.joystick.padLeft = Tecla Izquierda
+platform.plugin.joystick.leftX = Palanca Izquierdo X
+platform.plugin.joystick.leftY = Palanca Izquierdo Y
+platform.plugin.joystick.rightX = Palanca Derecha X
+platform.plugin.joystick.rightY = Palanca Derecha Y
 platform.plugin.joystick.l2 = L2
 platform.plugin.joystick.r2 = R2
 platform.plugin.joystick.action.continuousJogging = Movimiento analógico
 platform.plugin.joystick.reverseAxis = Invertir
 platform.plugin.joystick.axisThreshold = Umbral cero (%)
-platform.plugin.cloud.s3Id = platform.plugin.cloud.s3Id
-platform.plugin.cloud.s3Secret = platform.plugin.cloud.s3Secret
+platform.plugin.cloud.s3Id = ID de clave de acceso de AWS
+platform.plugin.cloud.s3Secret = Clave de acceso secreta de AWS
 platform.plugin.cloud.open = Abrir archivo en la nube
 platform.menu.runFrom = Correr desde...
 platform.plugin.joystick.l1 = L1
@@ -638,4 +638,36 @@ platform.visualizer.renderable.editor-position = Editar la posición del cursor
 platform.plugin.jog.showABCStepSize = Mostrar el tamaño del paso ABC
 platform.plugin.jog.stepSizeABC = Tamaño del paso ABC
 platform.plugin.toolbox.title = Caja de herramientas
-platform.plugin.toolbox.tooltip = Caja de herramientas
\ No newline at end of file
+platform.plugin.toolbox.tooltip = Caja de herramientas
+machineStatus.pin.a = A
+machineStatus.pin.b = B
+machineStatus.pin.c = C
+mainWindow.swing.openDoor = Puerta abierta
+platform.action.outline.tooltip = Mueva la máquina alrededor del modelo usando la profundidad actual
+platform.menu.save = Guardar
+platform.plugin.designer.clipart.animals = Animales
+platform.plugin.designer.clipart.buildings = Construcciones
+platform.plugin.designer.clipart.computer = Computadoras/Ordenadores
+platform.plugin.designer.clipart.decorations = Decoraciones
+platform.plugin.designer.clipart.electronics = Electronica
+platform.plugin.designer.clipart.food = Alimentos/Comida
+platform.plugin.designer.clipart.geography = Geografía
+platform.plugin.designer.clipart.holiday = Fiesta
+platform.plugin.designer.clipart.logos = Logos
+platform.plugin.designer.clipart.mythical = Mítica
+platform.plugin.designer.clipart.office = Oficina
+platform.plugin.designer.clipart.people = Personas
+platform.plugin.designer.clipart.plants = Plantes
+platform.plugin.designer.clipart.science = Ciencia
+platform.plugin.designer.clipart.signs_and_symbols = Signos y Simbolos
+platform.plugin.designer.clipart.special = ·Especiales
+platform.plugin.designer.clipart.tools = Herramientas
+platform.plugin.designer.clipart.transportation = Transporte
+platform.plugin.designer.clipart.unsorted = Sin clasificar
+platform.plugin.designer.clipart.weather = Clima
+platform.plugin.editor.showOnOpen = Mostrar editor al abrir archivos de código g
+platform.plugin.toolbox.settings.title = Editar botones de la caja de herramientas...
+sender.invertMouseZoom = Invertir el zoom del ratón
+settings.disableAxis = Deshabilitar eje\: %s
+settings.help.disableAxis = Cada eje deshabilitado se elimina de la interfaz de usuario cuando es posible.
+settings.pendantPort = Puerto web pendiente
\ 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 825f24d2e..b45037b4b 100644
--- a/ugs-core/src/resources/MessagesBundle_fr_FR.properties
+++ b/ugs-core/src/resources/MessagesBundle_fr_FR.properties
@@ -1,6 +1,6 @@
 error = Erreur
 success = Succès
-verbose = Bavard
+verbose = Détails
 close = Fermer
 save = Enregistrer
 open = Ouvrir
@@ -17,11 +17,11 @@ macroPanel.try = Essayer
 mainWindow.helpDialog = Aide sur le contrôle Machine
 mainWindow.resetZero = Mise à zéro\: Remplace les coordonnées actuelles à zéro sans mouvement machine.
 mainWindow.returnToZero = Retour position zéro\: Déplace la machine en position 0, 0, 0.
-mainWindow.softReset = Mise à Zéro de GRBL sans mise à jour de la position.
-mainWindow.homing = $H\: Cycle de retour à l'origine. Nécessite une version Grbl 0.8c ou supérieure
-mainWindow.alarmLock = $X\: Acquitte l'alarme 'lock' GRBL.
-mainWindow.checkMode = $C\: Mode 'vérification', GRBL interprête le gcode mais sans mouvement machine.
-mainWindow.getState = $G\: Demande de statut GRBL (résultat affiché dans la console de sortie).
+mainWindow.softReset = Mise à Zéro logiciel\: sans mise à jour de la position.
+mainWindow.homing = Origine machine\: $H nécessite une version Grbl 0.8c ou supérieure pour un bon fonctionnement
+mainWindow.alarmLock = $X\: Acquitte l'alarme 'ALARME' GRBL.
+mainWindow.checkMode = $C\: Mode 'vérification', pour interpreter le g-code mais sans mouvement machine.
+mainWindow.getState = Affiche le statut\: $G Affiche le statut GRBL (dans la console de sortie)
 mainWindow.helpKeyboard = Contrôles au clavier\:
 mainWindow.helpKeyX = X\: Flèche Gauche/Droite; Clavier Gauche/Droite; Pavé numérique\: 4/6
 mainWindow.helpKeyY = Y\: Flèche Haut/Bas; Clavier Haut/Bas; Pavé numérique\: 8/2
@@ -62,11 +62,11 @@ mainWindow.swing.controlContextTabbedPane.fileMode = Mode Fichier
 mainWindow.swing.controlContextTabbedPane.machineControl = Contrôle Machine
 mainWindow.swing.durationLabel = Durée\:
 mainWindow.swing.fileLabel = Fichier
-mainWindow.swing.firmwareSettingsMenu = Paramètres Firmware
+mainWindow.swing.firmwareSettingsMenu = Paramètres Microprogramme
 mainWindow.swing.grblConnectionSettingsMenuItem = Paramètres d'envoi
-mainWindow.swing.keyboardMovementPanel = Joystick
+mainWindow.swing.keyboardMovementPanel = Déplacement
 mainWindow.swing.settingsMenu = Paramètres
-mainWindow.swing.statusPanel = Statut Machine
+mainWindow.swing.statusPanel = Etat de la Machine
 mainWindow.swing.bottomTabbedPane.table = Liste des Commandes
 mainWindow.swing.latestCommentLabel = Dernier état\:
 mainWindow.swing.machinePosition = Position Machine\:
@@ -74,24 +74,21 @@ 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
 mainWindow.swing.returnToZeroButton = Retour position zéro
 mainWindow.swing.homeMachine = Origine Machine
-mainWindow.swing.rowsLabel = Lignes (total)\:
+mainWindow.swing.rowsLabel = Lignes total\:
 mainWindow.swing.scrollWindowCheckBox = Défilement console de sortie
 mainWindow.swing.sendButton = Envoi
 mainWindow.swing.sentRowsLabel = Lignes envoyées\:
-mainWindow.swing.showVerboseOutputCheckBox = Sortie en mode bavard
+mainWindow.swing.showVerboseOutputCheckBox = Afficher sortie détaillé
+mainWindow.swing.clearOutput = 
 mainWindow.swing.showCommandTableCheckBox = Activer la table de commande
-mainWindow.swing.softResetMachineControl = Reset Soft
+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 macro peut contenir une série de commandes séparées par <br >';'.<br /> pour exécuter la macro, cliquez sur le bouton 'C' à gauche du texte.</html>
-mainWindow.swing.inchRadioButton = pouces
-mainWindow.swing.mmRadioButton = millimètres
+mainWindow.swing.inchRadioButton = Pouces
+mainWindow.swing.mmRadioButton = Millimètres
 gcodeTable.command = Commande
 gcodeTable.originalCommand = Commande originale
 gcodeTable.sent = Envoyé
@@ -191,69 +188,67 @@ 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
 connection.exception.inuse = Ce port est déjà utilisé par une autre application.
 settings.log.location = Localisation du fichier de paramètres.
-settings.log.loading = Chargement fichier paramètres.
+settings.log.loading = Chargement paramètres.
 settings.log.saving = Enregistrement des paramètres.
 settings.log.error = Chargement des paramètres impossible, utilisation des valeurs par défaut.
 settings.log.saveerror = Enregistrement des paramètres impossible\!
 visualizer.title = Visualisateur G-Code
 VisualizerCanvas.height = hauteur
 VisualizerCanvas.width = largeur
-platform.menu.jog = Joystick
+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
+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.resetX = Réinitialiser l'axe X
 mainWindow.swing.resetY = Réinitialiser l'axe Y
 mainWindow.swing.resetZ = Réinitialiser l'axe Z
-jogging.xPlus = Joystick X+
-jogging.xMinus = Joystick X-
-jogging.yPlus = Joystick Y+
-jogging.yMinus = Joystick Y-
-jogging.zPlus = Joystick Z+
-jogging.zMinus = Joystick Z-
-jogging.xPlus.yMinus = Joystick\: X+ Y-
-jogging.xPlus.yPlus = Joystick\: X+ Y+
-jogging.xMinus.yPlus = Joystick\: X- Y+
-jogging.xMinus.yMinus = Joystick\: X- Y-
-jogging.divide = Joystick\: Diviser par 10 le pas XY
-jogging.multiply = Joystick\: Multiplier par 10 le pas XY
-jogging.increase = Joystick\: Augmenter le pas XY
-jogging.decrease = Joystick\: Diminuer le pas XY
-jogging.divide.z = Opération\: diviser le pas Z par 10
-jogging.multiply.z = Opération\: multiplier le pas Z par 10
-jogging.increase.z = Opération\: augmenter le pas Z
-jogging.decrease.z = Opération\: diminuer le pas Z
-jogging.increase.feed = Opération\: augmenter le débit
-jogging.decrease.feed = Opération\: diminuer le débit
-jogging.multiply.feed = Opération\: Multiplier le débit par 10
-jogging.divide.feed = Opération\: Diviser le débit par 10
-jogging.units.inch = Opération\: INCH
-jogging.units.mm = Opération\: MM
-jogging.units.toggle = Opération\: Changer les unités
+jogging.xPlus = Déplacement X+
+jogging.xMinus = Déplacement X-
+jogging.yPlus = Déplacement Y+
+jogging.yMinus = Déplacement Y-
+jogging.zPlus = Déplacement Z+
+jogging.zMinus = Déplacement Z-
+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.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
+jogging.decrease = Déplacement\: Diminuer le pas XY
+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.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
+jogging.divide.feed = Déplacement\: diviser la vitesse par 10
+jogging.units.inch = Déplacement\: INCH
+jogging.units.mm = Déplacement\: MM
+jogging.units.toggle = Déplacement\: Changer les unités
 grbl.exception.Alarm = Le flux de fichiers est désactivé lorsque GRBL est en état arrêt d'urgence
 grbl.exception.cancelReset = Délai d'attente important du GRBL vers IDLE pendant l'annulation, annulation incomplète.
 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.window.dro = État du contrôleur (DRO)
+platform.window.dro = État du controleur (DRO)
 platform.window.dro.tooltip = État de la machine en temps réel.
 platform.window.actions = Actions communes
 platform.window.actions.tooltip = Raccourcis pour les commandes de gcode et les actions de la machine.
 platform.window.workflow = Assistant sur le flux de travail
 platform.window.workflow.tooltip = Permet d'exécuter des travaux contenant plusieurs fichiers.
-platform.window.filebrowser = Charger un fichier
-platform.window.filebrowser.tooltip = Charger un fichier po
-platform.window.jogcontrol = Contrôle du joystick
+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.macros.tooltip = Les macros créées dans les préférences peuvent être utilisées ici.
-platform.window.overrides = Substitution
+platform.window.overrides = Remplacements
 platform.window.overrides.tooltip = Envoyer et surveiller les remplacements.
 platform.window.sendstatus = Envoi en cours
 platform.window.sendstatus.tooltip = Progression actuelle d'un fichier envoyer.
@@ -263,7 +258,6 @@ 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
@@ -280,7 +274,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 = Remplacements
+macro.substitution = Substitutions
 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.
@@ -290,9 +284,9 @@ settings.processors.header = Configuration du processeur Gcode
 settings.file.outOfDate.title = Configuration obsolète
 settings.file.outOfDate.message = Un ou plusieurs paramètres de configuration sont périmés et doivent être mis à jour. Certains paramètres sont réinitialisés à l'aide des valeurs par défaut. Voulez-vous mettre à jour la configuration du microprogramme?
 settings.file.generalError = Une erreur s'est produite lors de l'initialisation des fichiers de configuration du microprogramme\:
-settings.processors.enabled = Activer
+settings.processors.enabled = Activé
 settings.processors.add = Ajouter
-settings.processors.remove = Enlever la selection
+settings.processors.remove = Supprimer la selection
 settings.processors.help = Ces filtres sont utilisés pour traiter le gcode avant de l'envoyer au contrôleur. Certains d'entre eux doivent être activés, d'autres peuvent être désactivés. La plupart sont configurés par des paramètres globaux dans le menu des paramètres de l'expéditeur. Des filtres personnalisés peuvent être ajoutés pour supprimer des motifs spécifiques, par exemple "Td +" supprime toute instance de "T1", "T12", etc.
 settings.processors.loadError = Impossible de charger le processeur
 settings.language = Langue
@@ -308,7 +302,7 @@ M30Processor = M30 re-déplacé
 PatternRemover = Modèle d'expression régulière déplacé
 WhitespaceProcessor = Espace déplacé
 controller.exception.smoothie.booting = Smoothie n'a pas terminé de démarrer.
-mainWindow.swing.pendant = Commande
+mainWindow.swing.pendant = Commande externe
 platform.visualizer.popup.coordinatesMenu = Coordonnées\: X \=% s, Y \=% s
 platform.visualizer.popup.submenu.jogToHere = Déplacement ici
 platform.visualizer.popup.submenu.jogToHereHint = Déplacez la tête vers la position X / Y sélectionnée. Ne modifie pas la hauteur Z
@@ -335,18 +329,18 @@ sender.step.separateZ = Utilisez des pas différents pour les mouvements de dép
 controller.exception.unexpectedCommand = Une commande inattendue a été envoyé par le contrôleur.
 platform.window.probe = Aide Sonde
 platform.window.probe.tooltip = initialisation des axes à zéro avec rétroaction de sonde
-probe.feed-rate = Avance de la sonde
+probe.feed-rate = Vitesse de la sonde
 probe.probe-distance = Sonde Distance/Direction
 probe.plane = Axe de sonde
-probe.plate-thickness = Épaisseur de plaque tactile
-probe.button = Initier la sonde
+probe.plate-thickness = Épaisseur de plaque de sonde
+probe.button = Palpation avec sonde
 platform.menu.overrides = Remplacement en temps réel
-overrides.spindle = Remplacement de la broche
-overrides.spindle.short = broche
+overrides.spindle = Vitesses de la broche
+overrides.spindle.short = Broche
 overrides.spindle.reset = Réinitialisation de la broche
-overrides.feed = Remplacement d'alimentation
-overrides.feed.short = Alimentation
-overrides.feed.reset = Alimentation réinitialisé
+overrides.feed = Remplacement des vitesses
+overrides.feed.short = Vitesses
+overrides.feed.reset = Réinitialisé vitesses
 overrides.rapid = Remplacement rapide
 overrides.rapid.short = Rapide
 overrides.rapid.low = Faible
@@ -364,24 +358,21 @@ mainWindow.swing.firmware.toolbarTitle = Barre d'outils de sélection du micropr
 mainWindow.swing.serialport.toolbarTitle = Barre d'outils du port série
 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 = niveleur automatique
+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.grid = Coordonnées et niveau
-platform.visualizer.renderable.highlight = Répétition de l'éditeur de Gcode
+platform.visualizer.renderable.highlight = Répétition de l'éditeur de G-code
 platform.visualizer.renderable.mouse-indicator = localisation de la souris
-platform.visualizer.renderable.orientation-cube = Cube d'orientation
+platform.visualizer.renderable.orientation-cube = Orientation face XYZ
 platform.visualizer.renderable.selection = Boîte de sélection
-platform.visualizer.renderable.gcode-model-size = Taille du Gcode
-platform.visualizer.renderable.tool-location = Lieu de l'outil
+platform.visualizer.renderable.gcode-model-size = Taille du G-code
+platform.visualizer.renderable.tool-location = Position de l'outil
 platform.visualizer.renderable.autolevel-preview = Aperçu du nivellement automatique
 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 = Surface de balayage
 autoleveler.panel.apply = Appliquer à Gcode
-autoleveler.panel.view-data = Voir les données
-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
@@ -390,7 +381,7 @@ 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
 mainWindow.swing.alarmLock = Déverrouiller
-mainWindow.swing.checkMode = mode de vérification
+mainWindow.swing.checkMode = Mode de vérification
 mainWindow.swing.getState = Obtenir l'état
 platform.window.probe-module = Module sonde
 platform.window.probe-module.tooltip = Suite d'utilitaires pour gérer la sonde
@@ -398,11 +389,8 @@ probe.find-rate = Taux de recherche rapide
 probe.measure-rate = Taux de mesure lent
 probe.x-distance = Distance X de la sonde
 probe.y-distance = Distance Y de la sonde
-probe.z-distance = Distance Z de la sonde
-probe.retract-height = Hauteur de rétraction
 probe.retract-amount = Rétracter le montant
-probe.measure.outside-corner = Mesurer le coin extérieur
-probe.measure.inside-corner = Mesurer le coin intérieur
+probe.action.settings = Paramètres...
 probe.visualizer.corner-preview = Aperçu de la sonde d'angle
 probe.visualizer.z-preview = Aperçu de la sonde Z
 parser.gcode.multiple-axis-commands = Plusieurs codes nécessitant des axes sur une seule ligne
@@ -423,8 +411,8 @@ platform.plugin.dowel-module.length = Longueur
 platform.plugin.setupwizard.port-rate = Débit du port\:
 platform.plugin.setupwizard.connect = Connecter
 platform.plugin.setupwizard.unknown-version = Version inconue
-platform.plugin.setupwizard.reset-to-zero = Reset à 0
-platform.plugin.setupwizard.move = Déplace
+platform.plugin.setupwizard.reset-to-zero = Remise à 0
+platform.plugin.setupwizard.move = Déplacer
 platform.plugin.setupwizard.home = Référence
 platform.plugin.setupwizard.measure = Mesure
 platform.plugin.setupwizard.calibrate = Calibrage
@@ -441,9 +429,9 @@ 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.
 platform.plugin.setupwizard.import-settings.open-settings = Ouverture du fichier de paramètres
-platform.plugin.setupwizard.import-settings.import = Paramètres d'import
-platform.plugin.setupwizard.import-settings.overwrite-message = Êtes-vous sûr de vouloir écraser les paramètres actuels du firmware?
-platform.plugin.setupwizard.import-settings.overwrite-title = Ecraser les paramètres du firmware?
+platform.plugin.setupwizard.import-settings.import = Importation paramètres
+platform.plugin.setupwizard.import-settings.overwrite-message = Êtes-vous sûr de vouloir écraser les paramètres actuels du microprogramme?
+platform.plugin.setupwizard.import-settings.overwrite-title = Ecraser les paramètres du microprogramme?
 platform.plugin.setupwizard.motor-wiring.title = Câblage moteur
 platform.plugin.setupwizard.motor-wiring.intro = Nous allons maintenant vérifier que vos moteurs sont câblés correctement. Testez chaque axe à l'aide des boutons de pas.
 platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = Vous avez des limites logiciel activées. Tout bouton permettant de déplacer la machine au-delà de ces limites sera désactivé.
@@ -464,14 +452,14 @@ platform.plugin.setupwizard.soft-limits.intro = Les limites logiciel empêchent
 platform.plugin.setupwizard.soft-limits.instructions = Installez votre machine puis déplacez-la dans la position de sécurité maximale dans la direction opposée. Utilisez cette position comme limite logiciel.
 platform.plugin.setupwizard.soft-limits.require-homing = Le transfert d'origine doit être activé avant d'activer les limites logiciel.
 platform.plugin.setupwizard.soft-limits.not-available = Les limites logiciel ne sont pas disponible sur votre machine.
-platform.plugin.setupwizard.homing.title = Position absolues
+platform.plugin.setupwizard.homing.title = Position machine
 platform.plugin.setupwizard.homing.intro = Homing est une méthode pour trouver les coordonnées absolues de la machine.
 platform.plugin.setupwizard.homing.enable = Valide position absolues
 platform.plugin.setupwizard.homing.require-limit-switches = Les commutateurs de fin de course doivent être activés avant d'activer la prise d'origine.
-platform.plugin.setupwizard.homing.not-available = Les positions absolues ne sont pas disponible sur votre machine.
+platform.plugin.setupwizard.homing.not-available = Les positions machine ne sont pas disponible sur votre machine.
 platform.plugin.setupwizard.homing.instruction1 = Prenez le temps de déterminer dans quelle direction se trouvent vos fins de course.
 platform.plugin.setupwizard.homing.instruction2 = Testez maintenant un cycle de référencement, mais <b> soyez pret à abandonner </ b> s'il va dans la mauvaise direction\!
-platform.plugin.setupwizard.homing.try-homing = Essayez de vous diriger
+platform.plugin.setupwizard.homing.try-homing = Essayez la position machine
 platform.plugin.setupwizard.homing.abort = Annuler
 gcode.setting.units = Unités
 gcode.setting.feed = % d'alimentation
@@ -482,8 +470,8 @@ gcode.setting.endmill-diameter = Diamètre de fraise
 gcode.setting.safety-height = Hauteur de sécurité
 gcode.setting.cut-depth = Profondeur par passage
 platform.window.states = État
-platform.window.states.tooltip = Active état GCode
-platform.plugin.gcode-tools.tiler.window = Carreaux Gcode
+platform.window.states.tooltip = Active état G-Code
+platform.plugin.gcode-tools.tiler.window = Multiplicateur g-code
 platform.plugin.gcode-tools.tiler.tooltip = Convertir un fichier gcode en plusieurs copies identiques.
 platform.plugin.gcode-tools.tiler.padding = Rembourrage entre les copies
 gcode.g20 = Pouce
@@ -510,18 +498,17 @@ gcode.plane = Plan actif
 mainWindow.status.check = Vérifie
 mainWindow.status.door = Porte
 mainWindow.status.idle = Pause
-mainWindow.status.jog = à droite
+mainWindow.status.jog = Déplacement
 mainWindow.status.offline = Hors ligne
 platform.window.diagnostics = Diagnostique UGS
 platform.window.diagnostics.tooltip = Information de diagnostique interne
-platform.visualizer.popup.showFeatures = Voir les fonctionnalités
 platform.visualizer.popup.viewPresets = Voir les réglages
-platform.visualizer.popup.presets.reset = Reset des vues
+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.feedRate = % d'alimentation
+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
@@ -530,22 +517,137 @@ 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.plugin.joystick.activate = Activer le joystick
-platform.plugin.joystick.buttonControls = Commandes des boutons\:
-platform.plugin.joystick.analogControls = Commandes analogiques\:
+platform.plugin.joystick.activate = Activer la Manette
+platform.plugin.joystick.buttonControls = Boutons de commandes\:
+platform.plugin.joystick.analogControls = Manette\:
 platform.plugin.joystick.clear = Effacer
 platform.plugin.joystick.back = Retour
 platform.plugin.joystick.padUp = Manette haut
 platform.plugin.joystick.padDown = Manette bas
 platform.plugin.joystick.padRight = Manette droit
 platform.plugin.joystick.padLeft = Manette gauche
-platform.plugin.joystick.leftX = Joystick gauche X
-platform.plugin.joystick.leftY = Joystick gauche Y
-platform.plugin.joystick.rightX = Joystick droit X
-platform.plugin.joystick.rightY = Joystick droit Y
-platform.plugin.joystick.action.continuousJogging = Jog analogique
+platform.plugin.joystick.leftX = Manette gauche X
+platform.plugin.joystick.leftY = Manette gauche Y
+platform.plugin.joystick.rightX = Manette droit X
+platform.plugin.joystick.rightY = Manette droit Y
+platform.plugin.joystick.action.continuousJogging = Déplacement analogique
 platform.plugin.joystick.reverseAxis = Inverser
 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.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
diff --git a/ugs-core/src/resources/MessagesBundle_it_IT.properties b/ugs-core/src/resources/MessagesBundle_it_IT.properties
index 2a3d981fa..913e539b9 100644
--- a/ugs-core/src/resources/MessagesBundle_it_IT.properties
+++ b/ugs-core/src/resources/MessagesBundle_it_IT.properties
@@ -1,3 +1,4 @@
+title = Universal Gcode Sender
 version = Versione
 error = Errore
 success = Successo
@@ -17,6 +18,7 @@ save.close = Salva e chiudi
 unknown = sconosciuto
 macroPanel.button = Esegui
 macroPanel.name = Nome della macro
+macroPanel.text = GCode
 macroPanel.description = Descrizione della macro
 macroPanel.try = Prova
 mainWindow.helpDialog = Aiuto per il Controllo della Macchina
@@ -95,7 +97,6 @@ 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
@@ -195,7 +196,6 @@ 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
@@ -215,8 +215,7 @@ platform.menu.actions = Azioni
 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
+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.resetX = Resetta Asse X
 mainWindow.swing.resetY = Resetta Asse Y
 mainWindow.swing.resetZ = Resetta Asse Z
@@ -266,7 +265,6 @@ 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
@@ -380,10 +378,7 @@ 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.view-data = Visualizza dati
-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
@@ -400,11 +395,7 @@ probe.find-rate = Trova rapidamente velocità
 probe.measure-rate = Velocità misura lenta
 probe.x-distance = Distanza X della sonda
 probe.y-distance = Distanza Y della sonda
-probe.z-distance = Distanza Z della sonda
-probe.retract-height = Altezza di ritorno
 probe.retract-amount = Quantità di ritorno
-probe.measure.outside-corner = Misura l'angolo esterno
-probe.measure.inside-corner = Misura l'angolo interno
 probe.visualizer.corner-preview = Anteprima della sonda angolare
 probe.visualizer.z-preview = Anteprima della sonda dell'asse Z.
 parser.gcode.multiple-axis-commands = Codici multipli che richiedono parole di assi su una riga
@@ -516,7 +507,6 @@ 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
@@ -559,3 +549,36 @@ 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 bc475fe42..4c6a26573 100644
--- a/ugs-core/src/resources/MessagesBundle_ja_JP.properties
+++ b/ugs-core/src/resources/MessagesBundle_ja_JP.properties
@@ -83,10 +83,7 @@ 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 = 設定を読み込んでいます
@@ -100,8 +97,6 @@ platform.menu.jog.size = ステップ間隔
 platform.menu.actions = アクション
 platform.menu.macros = マクロ
 platform.menu.machine = マシン
-incomplete.localization = Universal Gcode Sender is not fully localized for this language. \nPlease visit https://translate.universalgcodesender.com to see how you can help.
-mainWindow.swing.softReset = ソフトリセット
 mainWindow.swing.resetX = リセット X軸
 mainWindow.swing.resetY = リセット Y軸
 mainWindow.swing.resetZ = リセット Z軸
@@ -129,7 +124,6 @@ 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 = 円弧移動時の色
 
@@ -191,7 +185,6 @@ 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 オフセット
@@ -201,13 +194,15 @@ 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.z-distance = タッチセンサー Z軸 距離
-probe.retract-height = 退避高さ
 probe.retract-amount = 退避量
-probe.measure.outside-corner = アウトコーナーファインダー
-probe.measure.inside-corner = インコーナーファインダー
 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 18094d806..8fcf8f925 100644
--- a/ugs-core/src/resources/MessagesBundle_lt_LT.properties
+++ b/ugs-core/src/resources/MessagesBundle_lt_LT.properties
@@ -23,8 +23,6 @@ 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ė
@@ -138,7 +136,6 @@ 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
@@ -155,8 +152,6 @@ platform.menu.jog.size = Žingsnio dydis
 platform.menu.actions = Veiksmai
 platform.menu.macros = Makro komandos
 platform.menu.machine = Staklės
-incomplete.localization = Universal Gcode Sender is not fully localized for this language. \nPlease visit https://translate.universalgcodesender.com to see how you can help.
-mainWindow.swing.softReset = Perkrauti vald.
 mainWindow.swing.resetX = Atstatyti X ašį
 mainWindow.swing.resetY = Atstatyti Y ašį
 mainWindow.swing.resetZ = Atstatyti Z ašį
@@ -194,7 +189,6 @@ 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
@@ -283,9 +277,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.panel.view-data = Peržiūrėti duomenis
 autoleveler.option.z-zero = Z aukštis nulinimo plokštumos faile
 autoleveler.option.arc-segment-length = Arkos linijos segmento ilgis
 autoleveler.option.offset-x = Nulinimo X kompensacija
@@ -300,16 +292,11 @@ probe.find-rate = Radimo greitis
 probe.measure-rate = Lėtas matavimo greitis
 probe.x-distance = X atstumas
 probe.y-distance = Y atstumas
-probe.z-distance = Z atstumas
-probe.retract-height = Atsitraukimo aukštis
 probe.retract-amount = Atitraukimas
-probe.measure.outside-corner = Rasti išorės kampą
-probe.measure.inside-corner = Rasti vidinį kampą
 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
@@ -351,3 +338,21 @@ 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 e47963468..ed7329fcf 100644
--- a/ugs-core/src/resources/MessagesBundle_nb_NO.properties
+++ b/ugs-core/src/resources/MessagesBundle_nb_NO.properties
@@ -37,6 +37,7 @@ 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 f1a267fb5..93a46246a 100644
--- a/ugs-core/src/resources/MessagesBundle_nl_NL.properties
+++ b/ugs-core/src/resources/MessagesBundle_nl_NL.properties
@@ -17,7 +17,6 @@ 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.
@@ -81,9 +80,6 @@ mainWindow.swing.portLabel = Poort\:
 mainWindow.swing.remainingRowsLabel = Nog te verwerken regels\:
 mainWindow.swing.remainingTimeLabel = Verwachte resterende tijd\:
 mainWindow.swing.resetCoordinatesButton = Zet op nul
-action.resetXCoordinatesButton = action.resetXCoordinatesButton
-action.resetYCoordinatesButton = action.resetYCoordinatesButton
-action.resetZCoordinatesButton = action.resetZCoordinatesButton
 mainWindow.swing.returnToZeroButton = Ga naar nul
 mainWindow.swing.homeMachine = Machine naar Nul positie
 mainWindow.swing.rowsLabel = Regels in bestand\:
@@ -96,7 +92,6 @@ 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
@@ -111,47 +106,7 @@ 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
@@ -161,16 +116,11 @@ 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.
@@ -189,7 +139,6 @@ 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.
@@ -200,9 +149,7 @@ 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.
@@ -215,9 +162,7 @@ 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
+incomplete.localization = Universal Gcode Sender is niet volledig vertaald in deze taal.\nBezoek https\://translate.universalgcodesender.com voor uw bijdrage
 mainWindow.swing.resetX = Reset X as
 mainWindow.swing.resetY = Reset Y as
 mainWindow.swing.resetZ = Reset Z as
@@ -227,28 +172,12 @@ 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)
@@ -273,7 +202,6 @@ 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 
@@ -284,8 +212,6 @@ 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 ...
@@ -306,8 +232,6 @@ 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
@@ -319,12 +243,6 @@ 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
@@ -380,14 +298,10 @@ 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.panel.view-data = Bekijk Data
-autoleveler.panel.visible = autoleveler.panel.visible
 autoleveler.option.z-zero = Z Hoogte van sonde oppervlak in gcode
 autoleveler.option.arc-segment-length = Booglengte (mm)
 autoleveler.option.offset-x = Sonde X offset
@@ -404,18 +318,13 @@ probe.find-rate = Meetsnelheid snel
 probe.measure-rate = Meetsnelheid langzaam
 probe.x-distance = Sonde X afstand
 probe.y-distance = Sonde Y afstand
-probe.z-distance = Sonde Z afstand
-probe.retract-height = Terugtrekhoogte
 probe.retract-amount = Terugtrekgrootte
-probe.measure.outside-corner = Meet buitenhoek
-probe.measure.inside-corner = Meet binnenhoek
 probe.visualizer.corner-preview = Hoek sonde voorvertoning
 probe.visualizer.z-preview = Z sonde voorvertoning
 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
@@ -425,62 +334,6 @@ 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)
@@ -518,50 +371,43 @@ mainWindow.status.check = Kontroleer
 mainWindow.status.door = Deur
 mainWindow.status.idle = Stationair
 platform.window.diagnostics.tooltip = Interne UGS diagnostics informatie
-platform.visualizer.popup.showFeatures = platform.visualizer.popup.show Kenmerken
-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
-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
+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
diff --git a/ugs-core/src/resources/MessagesBundle_nn_NO.properties b/ugs-core/src/resources/MessagesBundle_nn_NO.properties
index fd6139fc5..13e2c397f 100644
--- a/ugs-core/src/resources/MessagesBundle_nn_NO.properties
+++ b/ugs-core/src/resources/MessagesBundle_nn_NO.properties
@@ -89,7 +89,6 @@ 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
@@ -133,7 +132,6 @@ 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
@@ -150,8 +148,7 @@ platform.menu.jog.size = Stegstorleik
 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
+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.resetX = Tilbakestill X Akse
 mainWindow.swing.resetY = Tilbakestill Y Akse
 mainWindow.swing.resetZ = Tilbakestill Z Akse
@@ -227,3 +224,26 @@ 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 0ef69cd10..b09d3e6bc 100644
--- a/ugs-core/src/resources/MessagesBundle_pl_PL.properties
+++ b/ugs-core/src/resources/MessagesBundle_pl_PL.properties
@@ -72,9 +72,6 @@ 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
@@ -147,7 +144,6 @@ 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
@@ -161,7 +157,6 @@ visualizer.title = Wizualizuj G-Code
 VisualizerCanvas.dimensions = Wymiary
 VisualizerCanvas.height = wysokość
 VisualizerCanvas.width = szerokość
-platform.menu.jog = platform.menu.jog
 platform.menu.jog.size = Rozmiar Kroku
 platform.menu.actions = Akcje
 platform.menu.macros = Makra
@@ -175,16 +170,6 @@ 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
@@ -192,9 +177,7 @@ 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
@@ -235,47 +218,12 @@ 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.feed
-gcode.setting.xy-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.window.states.tooltip
-platform.plugin.gcode-tools.tiler.window = platform.plugin.gcode-tools.tiler.window
-platform.plugin.gcode-tools.tiler.tooltip = platform.plugin.gcode-tools.tiler.tooltip
-platform.plugin.gcode-tools.tiler.padding = 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
@@ -291,3 +239,16 @@ 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 3ac1c487a..414b3cfb4 100644
--- a/ugs-core/src/resources/MessagesBundle_pt_BR.properties
+++ b/ugs-core/src/resources/MessagesBundle_pt_BR.properties
@@ -9,11 +9,11 @@ add = adicionar
 delete = apagar
 setting = Configuração
 value = Valor
-description = Descrição
-help = Ajuda
-import = Importar
-export = Exportar
-save.close = Salvar e fechar
+description = Descrição da Macro
+help = ajuda
+import = importação
+export = Exportações
+save.close = Salvar e Fechar
 unknown = desconhecido
 millimeters = Milímetros
 inches = Polegadas
@@ -41,6 +41,7 @@ mainWindow.status.hold = Manter
 mainWindow.status.queue = Fila
 mainWindow.status.run = Rodar
 platform.menu.runFrom = Correr de ...
+platform.menu.insertPosition = Inserir posição
 mainWindow.error.openingFile = Problema abrindo arquivo
 mainWindow.error.processingFile = IOException erro desconhecido enquanto processava um arquivo
 mainWindow.error.pauseResume = Erro ao tentar pausar/continuar
@@ -65,46 +66,47 @@ mainWindow.swing.arrowMovementEnabled = Ativar movimento de teclado
 mainWindow.swing.baudLabel = Taxa\:
 mainWindow.swing.browseButton = Procurar
 mainWindow.swing.cancelButton = Cancelar
+mainWindow.swing.okButton = Aceitar
 mainWindow.swing.commandLabel = Comando\:
 mainWindow.swing.connectionPanel = Conexão
 mainWindow.swing.controlContextTabbedPane.commands = Comandos
 mainWindow.swing.controlContextTabbedPane.fileMode = Modo Arquivo
 mainWindow.swing.controlContextTabbedPane.machineControl = Controle da Máquina
+mainWindow.swing.controlContextTabbedPane.macros = Macrocomandos
 mainWindow.swing.durationLabel = Duração\:
 mainWindow.swing.fileLabel = Arquivo
+mainWindow.swing.firmwareLabel = Programa Interno\:
 mainWindow.swing.firmwareSettingsMenu = Configuração de Firmware
 mainWindow.swing.grblConnectionSettingsMenuItem = Configuração do Programa
+mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
 mainWindow.swing.keyboardMovementPanel = Movimento
 mainWindow.swing.settingsMenu = Configuração
 mainWindow.swing.statusPanel = Estado da máquina
+mainWindow.swing.bottomTabbedPane.console = Console
 mainWindow.swing.bottomTabbedPane.table = Tabela de Comandos
 mainWindow.swing.latestCommentLabel = Último Comentário\:
 mainWindow.swing.machinePosition = Posição da Máquina\:
 mainWindow.swing.opencloseButton = Abrir
 mainWindow.swing.pauseButton = Pausar
 mainWindow.swing.portLabel = Porta\:
+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
 mainWindow.swing.rowsLabel = Linhas no Arquivo\:
 mainWindow.swing.scrollWindowCheckBox = Rolar a janela de saída
 mainWindow.swing.sendButton = Enviar
 mainWindow.swing.sentRowsLabel = Linhas enviadas\:
 mainWindow.swing.showVerboseOutputCheckBox = Mostrar a saída detalhada
+mainWindow.swing.clearOutput = Limpar
 mainWindow.swing.showCommandTableCheckBox = Ativar a tabela de comandos
 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
@@ -154,6 +156,12 @@ firmware.tinyg.group.description.z = Eixo Z
 firmware.tinyg.group.description.a = Eixo A
 firmware.tinyg.group.description.b = Eixo B
 firmware.tinyg.group.description.c = Eixo 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 = Configuração do Programa
 sender.speed.override = Ativar correção de velocidade
 sender.speed.percent = Percentual de correção de velocidade
@@ -170,6 +178,7 @@ sender.arcs.length = Comprimento do segmento de arcos pequenos (mm)
 sender.autoconnect = Conectar automaticamente na inicialização
 sender.autoreconnect = Reconectar automaticamente
 sender.autostartpendant = auto arranque pendente na inicialização\n
+sender.invertMouseZoom = Inverter ampliação do mouse
 sender.notification.nightlyBuild.title = Construção noturna
 sender.notification.nightlyBuild.message = \nEsta versão do Universal Gcode Sender é uma compilação \nEle contém todos os recursos e melhorias mais recentes,\nmas também pode ter bugs que ainda precisam ser corrigidos.\n\nSe você encontrar algum problema, por favor denuncie-os no github.\n\n
 sender.notification.nightlyBuild.doNotShowAgain = não apresentar de novo esta mensagem
@@ -202,7 +211,6 @@ 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
@@ -218,11 +226,20 @@ VisualizerCanvas.height = altura
 VisualizerCanvas.width = largura
 platform.menu.jog = Movimento
 platform.menu.jog.size = Tamanho do Passo
+platform.menu.jog.feed = Taxa de avanço
 platform.menu.actions = Ações
+platform.menu.macros = Macro comandos
 platform.menu.machine = Máquina
+platform.actions.program.not.saved.message = Você deve salvar o arquivo antes
+platform.actions.program.not.saved.title = Não salvo
+platform.actions.homing.enabled.tooltip = Use isto para realizar uma operação de observação para encontrar a posição zero da máquina
 platform.actions.homing.disabled.tooltip = O Homing precisa ser ativado nas configurações de firmware
-incomplete.localization = Universal Gcode Sender não está totalmente traduzido para este idioma.\nPor favor, visite https://translate.universalgcodesender.com para verificar como você pode ajudar.
-mainWindow.swing.softReset = Reiniciar por Software
+platform.actions.unlock.tooltip = Limpe o estado do alarme e desbloqueie a máquina
+platform.actions.softreset.tooltip = Reinicie o controle
+incomplete.localization.title = Não totalmente traduzido
+incomplete.localization = Universal Gcode Sender não está totalmente traduzido para este idioma.\nPor favor, visite https\://translate.universalgcodesender.com para verificar como você pode ajudar.
+incomplete.localization.doNotShowAgain = Não mostrar esta mensagem novamente
+mainWindow.swing.softReset = Reiniciar Software
 mainWindow.swing.resetX = Reiniciar Eixo X
 mainWindow.swing.resetY = Reiniciar Eixo Y
 mainWindow.swing.resetZ = Reiniciar Eixo Z
@@ -236,6 +253,12 @@ jogging.xPlus.yMinus = Andar\: X+ Y-
 jogging.xPlus.yPlus = Andar\: X+ Y+
 jogging.xMinus.yPlus = Andar\: X- Y+
 jogging.xMinus.yMinus = Andar\: X- Y-
+jogging.aPlus = Mover\: A+
+jogging.aMinus = Mover\: A-
+jogging.bPlus = Mover\: B+
+jogging.bMinus = Mover\: B-
+jogging.cPlus = Mover\: C+
+jogging.cMinus = Mover\: C-
 jogging.divide = Divide o tamanho dos passos X,Y por 10
 jogging.multiply = Multiplica o tamanho dos passos X,Y por 10
 jogging.increase = Aumenta tamanho do passo em X,Y
@@ -260,6 +283,7 @@ grbl.exception.cancelReset = Tempo limite aguardando GRBL ficar inativo, cancela
 tinyg.exception.unknownVersion = Esta é uma versão desconhecida do TinyG\:% s. Se você estiver executando o g2core, atualize suas configurações de conexão.
 platform.menu.window = Janela
 platform.menu.classic = Clássico
+platform.menu.plugins = Extensões
 platform.window.dro = Estado do Controlador (DRO)
 platform.window.dro.tooltip = Estado de tempo real
 platform.window.actions = Ações Comuns
@@ -270,18 +294,29 @@ platform.window.filebrowser = Navegador de arquivos
 platform.window.filebrowser.tooltip = Lê um arquivo para trabalhar.
 platform.window.jogcontrol = Controlador de Movimento
 platform.window.jogcontrol.tooltip = Controlar manualmente a localização da máquina.
+platform.window.macros = Macro comandos
 platform.window.macros.tooltip = Macros criadas nas preferências podem ser usadas aqui.
 platform.window.overrides = Alterações
 platform.window.overrides.tooltip = Envia e monitora as alterações.
 platform.window.sendstatus = Progresso do Envio
 platform.window.sendstatus.tooltip = O progresso atual de um envio de arquivos.
+platform.window.serialconsole = Console
 platform.window.serialconsole.tooltip = Console exibindo mensagens de e para o controlador.
 platform.window.visualizer = Visualizador
 platform.window.visualizer.tooltip = Visualização em 3D da operação atual.
+platform.window.fileBrowser = Navegador de arquivos
+platform.window.fileBrowser.tooltip = Carregar uma pasta para ver e trabalhar com arquivos.
+platform.visualizer.edit.options.title = Opções do visualizador
 platform.visualizer.color.background = Cor de Fundo
+platform.visualizer.tool = Exibir localização real
 platform.visualizer.color.tool = Cor da Ferramenta
+platform.visualizer.tool.desc = Exibir localização real
+platform.visualizer.model = Exibir modelo
+platform.visualizer.model.desc = Exibe o caminho da ferramenta para o modelo
+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
@@ -395,41 +430,66 @@ platform.visualizer.renderable.gcode-model-size = Tamanho do código G
 platform.visualizer.renderable.tool-location = Localização da ferramenta
 platform.visualizer.renderable.autolevel-preview = Pré-visualização do Auto nivelador
 platform.visualizer.renderable.machine-boundries = Limites de máquina 
+autoleveler.panel.max = Máximo
 autoleveler.panel.z-surface = Superfície "Z" no código G
 autoleveler.panel.resolution = Resolução
+autoleveler.panel.z-retract = Z Retrair
+autoleveler.panel.z-retract.tooltip = Quanto de altura total para retrair Z de um ponto provado. Deixe em 100% se não tiver certeza.
 autoleveler.panel.use-file = Use o arquivo carregado
 autoleveler.panel.scan-surface = Superfície de digitalização
 autoleveler.panel.apply = Aplique o código G
-autoleveler.panel.view-data = Exibir dados
-autoleveler.panel.visible = apresente auto nivelamento
+autoleveler.panel.overwrite = Você deseja substituir os dados da sonda existente?
+autoleveler.panel.visible = Mostrar visualização
 autoleveler.option.z-zero = Altura "Z" da superfície da sonda no código G
+autoleveler.panel.generate-test-date = Gerar dados de teste
+autoleveler.panel.open = Abrir Escaneo
+autoleveler.panel.save = Salvar Digitalizações
 autoleveler.option.arc-segment-length = Comprimento do segmento da linha do arco (mm)
 autoleveler.option.offset-x = Deslocamento da sonda no "X"
 autoleveler.option.offset-y = Deslocamento da sonda no "Y"
 autoleveler.option.offset-z = Deslocamento da sonda no "Z"
+autoleveler.probe-failed = Sonda falhou
+autoleveler.panel.clear = Limpar varredura
+autoleveler.panel.export = Exportar gcode
+autoleveler.panel.export.tooltip = Exporta o gcode auto-nível
 experimental.feature = Esta é uma característica experimental. Tenha cuidado e relate todos os erros encontrados no GitHub.
 # Window title for platform GUI
+platform-title = Enviador Universal de Código G
 mainWindow.swing.alarmLock = Desbloquear
 mainWindow.swing.checkMode = Modo de Verificação
 mainWindow.swing.getState = Obter estado
 platform.window.probe-module = Modulo Probe
 platform.window.probe-module.tooltip = Utilitário para gerenciar operações do probe
 probe.find-rate = Busca rápida
+probe.find-rate.tooltip = A taxa de busca rápida para avançar em direção à sonda
 probe.measure-rate = Medida lenta
+probe.measure-rate.tooltip = A taxa de medida lenta para se mover em direção à sonda
 probe.x-distance = Distância X do probe
-probe.y-distance = Distância Y do probe
-probe.z-distance = Distância Z do Probe
-probe.retract-height = Altura de retração
+probe.y-distance = Distância Y da Sonda
 probe.retract-amount = Medida de retração
-probe.measure.outside-corner = Medir canto externo
-probe.measure.inside-corner = Medir canto interno
-probe.visualizer.corner-preview = Visualizar probe lateral
-probe.visualizer.z-preview = Visualizar probe eixo Z
+probe.retract-amount.tooltip = Distância para retrair após o ciclo de sonda rápido antes de executar a sonda lenta
+probe.hole-diameter = Diâmetro de furo aproximado
+probe.hole-center-hint = Mover sonda para o centro aproximado
+probe.work-coordinates = Copiar coordenadas
+probe.action.settings = Configuração...
+probe.action.z = Sonda e zero Z
+probe.action.z.confirmation = Você têm certeza que deseja apagar as configurações atuais?
+probe.action.xy = Sonda e zero Z
+probe.action.xy.confirmation = Você têm certeza que deseja apagar as configurações atuais?
+probe.action.xyz = Sonda e zero Z
+probe.action.xyz.confirmation = Você têm certeza que deseja apagar as configurações atuais?
+probe.action.hole-center = Sonda e centro furo zero
+probe.action.hole-center.confirmation = Você têm certeza que deseja apagar as configurações atuais?
+probe.action.tooltip.disabled = A máquina precisa ser conectada e inativa para poder usar os sondagens
+probe.action.tooltip.enabled = Pressione para iniciar a sondagem
+probe.visualizer.corner-preview = Pré-visualização da sonda lateral
+probe.visualizer.hole-center-preview = Pré-visualização da sonda lateral
+probe.visualizer.z-preview = Pré-visualizar sonda eixo Z
 parser.gcode.multiple-axis-commands = Múltiplos códigos precisam da definição do eixo em uma linha
 parser.gcode.missing-axis-commands = Faltam comandos no eixo para se mover
 sender.nightly-warning = Mostrar popup de aviso para Builds Nightly
 sender.help.spindle-dwell = Adiciona um atraso configurável (em segundos) após ativar o spindle com um comando "M3".
-SpindleOnDweller = atraso do arranque do motor\n
+SpindleOnDweller = Atraso de partida da Fresa
 platform.window.dowel-module = Fabricante de Cavilha
 platform.window.dowel-module.tooltip = Gerar gcode para criar cavilha em várias formas e tamanhos
 platform.plugin.dowel-module.generate = Gerar gcode
@@ -452,10 +512,13 @@ platform.plugin.setupwizard.calibrate = calibração\n
 platform.plugin.setupwizard.update = Atualizar
 platform.plugin.setupwizard.update-settings = actualização parâmetros
 platform.plugin.setupwizard.connection.title = Conexão
+platform.plugin.setupwizard.connection.retry = Tente novamente
 platform.plugin.setupwizard.connection.intro = este guia ajudara você a configurar seu controlador CNC com gcode sender,vamos começar com a conexão com o seu controlador
 platform.plugin.setupwizard.connection.not-supported = o assistente de configuraç\nWe will now test that your motors are wired correctly. Test each axis using the step buttons.\no não e suportado para esta configuração
 platform.plugin.setupwizard.connection.connecting = Conectando
 platform.plugin.setupwizard.connection.connected-to = conectado a\n
+platform.plugin.setupwizard.connection.error-title = Não foi possível conectar ao controlador
+platform.plugin.setupwizard.connection.error-connecting = Certifique-se de que você está usando as configurações corretas e que o controle está corretamente instalado e suportado pelo UGS.
 platform.plugin.setupwizard.import-settings.title = Importar configuração
 platform.plugin.setupwizard.import-settings.intro = \nSe a sua máquina veio com um arquivo de configuração ou se você fez anteriormente um backup de suas configurações, você pode carregá-las aqui. Caso contrário, clique ao lado para continuar.\n
 platform.plugin.setupwizard.import-settings.firmware = Firmware
@@ -513,6 +576,7 @@ gcode.g20 = Polegada
 gcode.g21 = Milímetro
 gcode.current-motion = Movimento Atual
 gcode.g0 = Rápido
+gcode.g1 = Linear
 gcode.g2 = Arco (sentido horário)
 gcode.g3 = Arco (sentido antihorário)
 gcode.g38.2 = Move sonda sinal de erro
@@ -522,6 +586,7 @@ gcode.g38.5 = Probe Ausente(Sem erros)
 gcode.g80 = Cancelar Movimento
 gcode.distance-mode = Modo Distância
 gcode.g90 = Absoluto
+gcode.g91 = Incrementar
 gcode.feed-rate-mode = Modo Taxa de Avanço
 gcode.g93 = Tempo Inverso
 gcode.g94 = Unidades por Minuto
@@ -535,7 +600,6 @@ 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
@@ -553,13 +617,26 @@ platform.plugin.jog.stepSmaller = Menor
 platform.plugin.jog.stealKeyboardFocus = \nCertifique-se de que os controles do teclado estão ativos\n\n
 platform.window.edit.macros = Editar macros...
 platform.action.outline = Esboço
+platform.action.outline.tooltip = Mova a máquina ao redor do modelo usando a profundidade atual
+platform.action.openLogDirectory = Abrir diretório de registros
+platform.action.createShortcut = Criar atalho
 platform.plugin.joystick.activate = Ativar Joystick
 platform.plugin.joystick.buttonControls = Controles de botão\:
 platform.plugin.joystick.analogControls = Controles analógicos\:
 platform.plugin.joystick.clear = Claro
+platform.plugin.joystick.a = A
+platform.plugin.joystick.b = B
+platform.plugin.joystick.x = X
+platform.plugin.joystick.y = Y
 platform.plugin.joystick.back = De volta
 platform.plugin.joystick.select = Selecione
 platform.plugin.joystick.start = Começar
+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.padUp = Pad para cima
 platform.plugin.joystick.padDown = Pad para baixo
 platform.plugin.joystick.padRight = Pad para direita
@@ -576,3 +653,25 @@ 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 051d53850..ba81cc3d0 100644
--- a/ugs-core/src/resources/MessagesBundle_ru_RU.properties
+++ b/ugs-core/src/resources/MessagesBundle_ru_RU.properties
@@ -89,9 +89,6 @@ 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 = Всего\:
@@ -104,7 +101,6 @@ 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 = Команда
@@ -208,7 +204,6 @@ 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 = Ошибка
@@ -228,8 +223,7 @@ platform.menu.actions = Действия
 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 = Мягкий сброс
+incomplete.localization = Данная программа не полностью локализована для этого языка.\nПожалуйста, посетите https\://translate.universalgcodesender.com, чтобы посмотреть, как вы можете помочь. Перевод SadovovAlex https\://github.com/SadovovAlex
 mainWindow.swing.resetX = Обнулить ось X
 mainWindow.swing.resetY = Обнулить ось Y
 mainWindow.swing.resetZ = Обнулить ось Z
@@ -287,7 +281,6 @@ 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 = Цвет обработки фрезой
@@ -406,10 +399,7 @@ autoleveler.panel.max = Максимум
 autoleveler.panel.z-surface = УП поверхность Z
 autoleveler.panel.resolution = Разрешение
 autoleveler.panel.use-file = Использовать загруженный файл
-autoleveler.panel.scan-surface = Сканировать поверхность
 autoleveler.panel.apply = Применить к управляющей программе
-autoleveler.panel.view-data = Просмотр данных
-autoleveler.panel.visible = Видимый Автоуровень
 autoleveler.option.z-zero = Z высота поверхности зонда в УП
 autoleveler.option.arc-segment-length = Длина сегмента дуговой линии (мм)
 autoleveler.option.offset-x = Смещение зонда X
@@ -426,11 +416,7 @@ probe.find-rate = Скорость быстрого поиска
 probe.measure-rate = Медленная скорость измерения
 probe.x-distance = Расстояние Зонда X
 probe.y-distance = Расстояние Зонда Y
-probe.z-distance = Расстояние Зонда Z
-probe.retract-height = Поднять высоту
 probe.retract-amount = Уберите сумму
-probe.measure.outside-corner = Измерить внешний угол
-probe.measure.inside-corner = Измерить внутренний угол
 probe.visualizer.corner-preview = Предпросмотр углового зонда
 probe.visualizer.z-preview = Превью Z зонда
 parser.gcode.multiple-axis-commands = Несколько кодов, требующих осевых слов в одной строке
@@ -543,7 +529,6 @@ 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 = Верх
@@ -578,3 +563,34 @@ 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 7416eceb1..3adcb23c5 100644
--- a/ugs-core/src/resources/MessagesBundle_sk_SK.properties
+++ b/ugs-core/src/resources/MessagesBundle_sk_SK.properties
@@ -151,7 +151,6 @@ 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,8 +168,7 @@ platform.menu.jog.size = Veľkosť kroku
 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
+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.resetX = Resetovať X Os
 mainWindow.swing.resetY = Resetovať Y Os
 mainWindow.swing.resetZ = Resetovať Z Os
@@ -222,7 +220,6 @@ 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é
@@ -294,8 +291,6 @@ 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
-autoleveler.panel.view-data = Zobrazenie údajov
 # Window title for platform GUI
 mainWindow.swing.alarmLock = Odomknúť
 mainWindow.swing.checkMode = Režim kontroly
@@ -304,14 +299,9 @@ probe.find-rate = Rýchlosť hľadania
 probe.measure-rate = Rýchlosť merania
 probe.x-distance = Vzdialenosť sondy X 
 probe.y-distance = Vzdialenosť sondy Y
-probe.z-distance = Vzdialenosť sondy Z
-probe.retract-height = Výška retrakcie
 probe.retract-amount = Rozsah retrakcie
 probe.hole-diameter = Prubližný priemer diery
 probe.hole-center-hint = Presuňte sondu približne do stredu
-probe.measure.hole-center = Zmerať stred diery
-probe.measure.outside-corner = Zmerať vonkajší roh
-probe.measure.inside-corner = Zmerať vnútorný roh
 probe.visualizer.corner-preview = Náhľad rohového merania
 probe.visualizer.hole-center-preview = Náhľad merania stredu diery
 probe.visualizer.z-preview = Náhľad merania Z
@@ -395,7 +385,6 @@ 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
@@ -419,3 +408,48 @@ 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
new file mode 100644
index 000000000..c26b6e5eb
--- /dev/null
+++ b/ugs-core/src/resources/MessagesBundle_sr_CS.properties
@@ -0,0 +1,22 @@
+close = Zatvori
+description = Opis
+error = Greska
+help = Pomoc
+macroPanel.button = Izvrsi
+macroPanel.description = Opis
+macroPanel.name = Ime makroa
+macroPanel.text = Gcode
+mainWindow.alarmLock = Otkljucaj kontroler\: otkljucavanje kontrolera posle alarma.
+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
diff --git a/ugs-core/src/resources/MessagesBundle_sv_SE.properties b/ugs-core/src/resources/MessagesBundle_sv_SE.properties
index dcdda0bdf..89ed54d77 100644
--- a/ugs-core/src/resources/MessagesBundle_sv_SE.properties
+++ b/ugs-core/src/resources/MessagesBundle_sv_SE.properties
@@ -1,3 +1,5 @@
+title = Universal Gcode Sender
+version = Version
 error = Ett fel har uppstått
 success = Klar
 verbose = utökad loggning
@@ -21,7 +23,7 @@ macroPanel.name = Makronamn
 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.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.homing = Återgå hem\: Utför en hempositioneringscykel. Detta kräver Grbl 0.8c för fullt stöd
@@ -35,6 +37,7 @@ mainWindow.helpKeyZ = Z\: Sida upp/ned; Knappsats sida upp/ned; Nummerkontroll 9
 mainWindow.helpKeyPlusMinus = Öka / Sänk steg\: Nummerkontroll +/-
 mainWindow.helpKeyDivMul = Ändra steg\: Knappsats DIVIDERA/MULTIPLICERA
 mainWindow.helpKeyZero = Nollställ koordinater\: Knappsats Insert; Nummerkontroll\: 0
+mainWindow.status.alarm = Alarm
 mainWindow.status.hold = Håll
 mainWindow.status.queue = Kö
 mainWindow.status.run = Kör
@@ -86,12 +89,6 @@ mainWindow.swing.pauseButton = Pausa
 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.rowsLabel = Antal rader i fil\:
@@ -104,7 +101,6 @@ 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
@@ -152,6 +148,12 @@ firmware.tinyg.group.description.z = Z-axel
 firmware.tinyg.group.description.a = A-axel
 firmware.tinyg.group.description.b = B-axel
 firmware.tinyg.group.description.c = C-axel
+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 = Inställningar för skicka
 sender.speed.override = Aktivera hastighetsöver
 sender.speed.percent = Överridning av hastighet i procent
@@ -168,6 +170,7 @@ 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.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.
 sender.notification.nightlyBuild.doNotShowAgain = Visa inte detta meddelande igen.
@@ -200,7 +203,6 @@ 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
@@ -208,7 +210,7 @@ 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.
 settings.log.saving = Sparade inställningar.
-settings.log.error = Kunde inte ladda inställningar, använder förinställda väden.
+settings.log.error = Kunde inte ladda inställningar, använder förinställda värden.
 settings.log.saveerror = Kunde inte spara insställningar\:
 visualizer.title = Visualisering
 VisualizerCanvas.dimensions = Mått
@@ -219,11 +221,12 @@ platform.menu.jog.size = Steglängd
 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
 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 = 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
@@ -287,14 +290,18 @@ platform.window.serialconsole = Konsol
 platform.window.serialconsole.tooltip = Visa meddelanden som skickas och tas emot från kontrollern.
 platform.window.visualizer = Visualisering
 platform.window.visualizer.tooltip = 3D-vy av aktuellt kommando
+platform.window.fileBrowser = Filhanterare
 platform.visualizer.color.background = Bakgrundsfärg
 platform.visualizer.color.tool = Verktygsfärg
 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
 platform.visualizer.color.completed = Färg för rader som har exekverats
+platform.visualizer.grid = Visa/dölj rutnät
+platform.visualizer.grid.desc = Växlar rutnätet
+platform.visualizer.plane = Visa/dölj plan
+platform.visualizer.plane.desc = Visa eller döljer plan
 platform.visualizer.color.xy-grid = Färg (och transparens) för XY hjälplinjer
 platform.visualizer.color.xy-plane = Färg (och transparens) för XY-plan
 platform.visualizer.color.x-axis = Färg (och transparens) för X-axelns linje
@@ -352,6 +359,12 @@ sender.help.verbose.console = Visa utökad information i konsolen
 platform.menu.open = Öppna Gcodefil...
 platform.menu.edit = Redigera Gcodefil...
 mainWindow.swing.reset = Nollställ
+machineStatus.pin.x = X
+machineStatus.pin.y = Y
+machineStatus.pin.z = Z
+machineStatus.pin.a = A
+machineStatus.pin.b = B
+machineStatus.pin.c = C
 machineStatus.pin.probe = Prob
 machineStatus.pin.door = Dörr
 machineStatus.pin.hold = Håll
@@ -402,13 +415,12 @@ platform.visualizer.renderable.gcode-model-size = Gcode storlek
 platform.visualizer.renderable.tool-location = Verktygsposition
 platform.visualizer.renderable.autolevel-preview = AutoLeveler förhandsgranskning
 platform.visualizer.renderable.machine-boundries = Maskingränser
+autoleveler.panel.min = Min
+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.view-data = Visa data
-autoleveler.panel.visible = Visa AutoLeveler
 autoleveler.option.z-zero = Z höjd för probe av yta i gcode
 autoleveler.option.arc-segment-length = Längd på bågar (mm)
 autoleveler.option.offset-x = Proba X offset
@@ -416,6 +428,7 @@ autoleveler.option.offset-y = Proba Y offset
 autoleveler.option.offset-z = Proba Z offset
 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
 mainWindow.swing.alarmLock = Lås upp
 mainWindow.swing.checkMode = Testläge
 mainWindow.swing.getState = Hämta status
@@ -425,11 +438,8 @@ probe.find-rate = Snabb sökhastighet
 probe.measure-rate = Sökhastighet
 probe.x-distance = Avstånd X för prob
 probe.y-distance = Avstånd Y för prob
-probe.z-distance = Avstånd Z för prob
-probe.retract-height = Höjd för tillbakadrag
 probe.retract-amount = Avstånd för tillbakadragning
-probe.measure.outside-corner = Mät hörnets utsida
-probe.measure.inside-corner = Mät hörnets insida
+probe.hole-diameter = Ungefärlig håldiameter
 probe.visualizer.corner-preview = Förhandsgranskning av hörnprobning
 probe.visualizer.z-preview = Förhandsgranskning av Z-probning
 parser.gcode.multiple-axis-commands = Multipla kommandon kräver axis-ord på en rad
@@ -446,6 +456,7 @@ 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.length = Längd
+platform.plugin.setupwizard.port = Port\:
 platform.plugin.setupwizard.port-rate = Hastighet\:
 platform.plugin.setupwizard.connect = Anslut
 platform.plugin.setupwizard.unknown-version = Okänd version
@@ -457,10 +468,12 @@ platform.plugin.setupwizard.calibrate = Kalibrera
 platform.plugin.setupwizard.update = Uppdatera
 platform.plugin.setupwizard.update-settings = Uppdatera inställningar
 platform.plugin.setupwizard.connection.title = Anslutning
+platform.plugin.setupwizard.connection.retry = Försök igen
 platform.plugin.setupwizard.connection.intro = Denna guide låter dig ställa in din CNC-kontroller med <b>Universal Gcode Sender</b>. Låt oss börja med att ansluta till kontrollern.
 platform.plugin.setupwizard.connection.not-supported = Inställningsguiden stöder inte denna hårdvara
 platform.plugin.setupwizard.connection.connecting = Ansluter...
 platform.plugin.setupwizard.connection.connected-to = Ansluten till
+platform.plugin.setupwizard.connection.error-title = Kunde inte ansluta till styrenheten
 platform.plugin.setupwizard.import-settings.title = Importera inställningar
 platform.plugin.setupwizard.import-settings.intro = Om din maskin levererades med en konfigurationsfil eller om du gjort en säkerhetskopia av dina inställningar kan du ladda dem här. Annars kan du klicka fortsätt.
 platform.plugin.setupwizard.import-settings.created-by = Skapad av\:
@@ -514,6 +527,7 @@ platform.plugin.gcode-tools.tiler.window = Gcode multiplicerare
 platform.plugin.gcode-tools.tiler.tooltip = Konvertera en GCode-fil till flera kopior
 platform.plugin.gcode-tools.tiler.padding = Mellanrum mellan kopior
 gcode.g20 = Tum
+gcode.g21 = Millimeter
 gcode.current-motion = Aktuell förflyttning
 gcode.g0 = Snabb
 gcode.g1 = Linjär
@@ -540,7 +554,7 @@ mainWindow.status.jog = Joggar
 mainWindow.status.offline = Ej ansluten
 platform.window.diagnostics = UGS Diagnostik
 platform.window.diagnostics.tooltip = Intern information från UGS-diagnostik.
-platform.visualizer.popup.showFeatures = Visa
+platform.visualizer.popup.showFeatures = Funktioner
 platform.visualizer.popup.viewPresets = Vyer
 platform.visualizer.popup.presets.reset = Återställ vy
 platform.visualizer.popup.presets.top = Topp
@@ -558,12 +572,26 @@ platform.plugin.jog.stepSmaller = Mindre
 platform.plugin.jog.stealKeyboardFocus = Säkerställer att tangentbordskontrollen är aktiv
 platform.window.edit.macros = Redigera makron...
 platform.action.outline = Kontur
+platform.action.outline.tooltip = Flytta maskinen runt modellen med nuvarande djup
+platform.action.openLogDirectory = Öppna katalog för loggar
+platform.action.createShortcut = Skapa genväg
 platform.plugin.joystick.activate = Aktivera joystick
-platform.plugin.joystick.buttonControls = Knappar
-platform.plugin.joystick.analogControls = Analoga knappar
+platform.plugin.joystick.buttonControls = Knappar\:
+platform.plugin.joystick.analogControls = Analoga knappar\:
 platform.plugin.joystick.clear = Rensa
+platform.plugin.joystick.a = A
+platform.plugin.joystick.b = B
+platform.plugin.joystick.x = X
+platform.plugin.joystick.y = Y
 platform.plugin.joystick.back = Tillbaka
 platform.plugin.joystick.select = Välj
+platform.plugin.joystick.start = Start
+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.padUp = Upp
 platform.plugin.joystick.padDown = Ner
 platform.plugin.joystick.padRight = Höger
@@ -572,11 +600,75 @@ 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.touchpad = Pekplatta
 platform.plugin.joystick.action.continuousJogging = Analog jogg
 platform.plugin.joystick.reverseAxis = Invertera
 platform.plugin.joystick.axisThreshold = Nolltröskel (%)
+platform.plugin.joystick.customMappings = Egna mappningar
+platform.plugin.joystick.customMappings.title = Ändra anpassade kontrollmappningar
+platform.plugin.joystick.connectedTo = Ansluten till
+platform.plugin.joystick.notConnected = Elektronik
 platform.plugin.cloud.s3Id = AWS nyckel ID
 platform.plugin.cloud.s3Secret = AWS nyckel
 platform.plugin.cloud.open = Öppna fil från molnet
 platform.plugin.toolbox.title=Verktygslåda
 platform.plugin.toolbox.tooltip=Verktygslåda
+platform.plugin.toolbox.settings.title=Redigera knappar i verktygslådan...
+platform.plugin.editor.showOnOpen=Visa redigerare när du öppnar Gcode-filer
+platform.plugin.designer.clipart.all=Allt
+platform.plugin.designer.clipart.animals=Djur
+platform.plugin.designer.clipart.buildings=Byggnader
+platform.plugin.designer.clipart.computer=Dator
+platform.plugin.designer.clipart.decorations=Dekorationer
+platform.plugin.designer.clipart.electronics=Elektronik
+platform.plugin.designer.clipart.food=Mat
+platform.plugin.designer.clipart.geography=Geografi
+platform.plugin.designer.clipart.holiday=Helger
+platform.plugin.designer.clipart.logos=Logotyper
+platform.plugin.designer.clipart.mythical=Mytologisk
+platform.plugin.designer.clipart.office=Kontor
+platform.plugin.designer.clipart.people=Personer & karaktärer
+platform.plugin.designer.clipart.plants=Växter
+platform.plugin.designer.clipart.science=Vetenskap
+platform.plugin.designer.clipart.signs_and_symbols=Tecken & symboler
+platform.plugin.designer.clipart.special=Speciella
+platform.plugin.designer.clipart.tools=Verktyg
+platform.plugin.designer.clipart.transportation=Transport
+platform.plugin.designer.clipart.unsorted=Osorterad
+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 bc92eca71..bada2f520 100644
--- a/ugs-core/src/resources/MessagesBundle_tr_TR.properties
+++ b/ugs-core/src/resources/MessagesBundle_tr_TR.properties
@@ -80,9 +80,6 @@ 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\:
@@ -95,7 +92,6 @@ 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
@@ -156,7 +152,6 @@ 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.
@@ -175,8 +170,7 @@ platform.menu.actions = Hareketler
 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
+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.resetX = X Eksenini Sıfırla
 mainWindow.swing.resetY = Y Eksenini Sıfırla
 mainWindow.swing.resetZ = Z Eksenini Sıfırla
@@ -228,7 +222,6 @@ 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
@@ -327,7 +320,6 @@ 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
@@ -338,8 +330,6 @@ probe.find-rate = Hızlı Ölçüm Hızı
 probe.measure-rate = Yavaş Ölçüm Hızı
 probe.x-distance = Prob X Mesafesi
 probe.y-distance = Prob Y Mesafesi
-probe.z-distance = Prob Z Mesafesi
-probe.retract-height = Geri Çekme Yüksekliği
 probe.retract-amount = Geri Çekme Miktarı
 platform.plugin.dowel-module.generate = G Kod Oluştur
 platform.plugin.dowel-module.export = G Kodu Dışa Aktar
@@ -365,7 +355,6 @@ 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
@@ -378,3 +367,28 @@ 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 4d4d6d601..042343160 100644
--- a/ugs-core/src/resources/MessagesBundle_uk_UA.properties
+++ b/ugs-core/src/resources/MessagesBundle_uk_UA.properties
@@ -5,12 +5,18 @@ verbose = детально
 close = Закрити
 save = Зберегти
 open = Відкрити
+add = Додати
+delete = Видалити
 setting = Налаштування
 value = Значення
 description = Опис
 help = Допомога
+import = Імпорт
+export = Експорт
 save.close = Зберегти та закрити
 unknown = невідомо
+millimeters = Міліметри
+inches = Дюйми
 macroPanel.button = Виконати
 macroPanel.name = Ім'я
 macroPanel.text = G-код
@@ -19,6 +25,7 @@ mainWindow.helpDialog = Допомога по керуванню станком
 mainWindow.resetZero = Скидання нуля\: Скидання поточних координат в нульову точку, без переміщення.
 mainWindow.returnToZero = Повертутись в нульову точку.
 mainWindow.softReset = Скидання, без переміщення.
+mainWindow.helpKeyboard = Керування з клавіатури
 mainWindow.status.alarm = Увага
 mainWindow.status.hold = Утримати
 mainWindow.status.queue = Черга
@@ -27,6 +34,25 @@ mainWindow.error.openingFile = Проблема при відкритті фай
 mainWindow.error.processingFile = Невідома помилка воду-виводу при обробці файла
 mainWindow.error.pauseResume = Помилка при встановленні Паузи/Продовження
 # mainWindow.error.noFirmware = Cannot edit firmware settings until you have connected to the firmware.
-
+mainWindow.ui.pauseButton = Пауза
+mainWindow.swing.cancelButton = Відміна
+mainWindow.swing.commandLabel = Команда\:
+mainWindow.swing.connectionPanel = Підключення
+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 = Поверн в нуль
+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 34cb8c1a8..5810f9f48 100644
--- a/ugs-core/src/resources/MessagesBundle_zh_CN.properties
+++ b/ugs-core/src/resources/MessagesBundle_zh_CN.properties
@@ -16,10 +16,13 @@ import = 进口
 export = 出口
 save.close = 存储并关闭
 unknown = 未知
+millimeters = 毫米
+inches = 英寸
 macroPanel.button = 执行
 macroPanel.name = 宏名称
+macroPanel.text = GCode
 macroPanel.description = 宏描述
-macroPanel.try = macroPanel.try
+macroPanel.try = 尝试
 mainWindow.helpDialog = 机器控制帮助
 mainWindow.resetZero = 重置零点：不移动机器，改变当前坐标至零点
 mainWindow.returnToZero = 回到零点：移动机器至0,0,0位置
@@ -39,13 +42,14 @@ mainWindow.status.alarm = 警报
 mainWindow.status.hold = 暂停
 mainWindow.status.queue = 队列
 mainWindow.status.run = 运行
-platform.menu.runFrom = platform.menu.runFrom
+platform.menu.toggleUnit = 切换单位
+platform.menu.toggleUnit.tooltip = 切换应用程序中的首选单位
+platform.menu.insertPosition = 插入位置
 mainWindow.error.openingFile = 有问题的头文件
 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 = 端口未找到
@@ -75,6 +79,7 @@ mainWindow.swing.fileLabel = 文件
 mainWindow.swing.firmwareLabel = 固件：
 mainWindow.swing.firmwareSettingsMenu = 固件设置
 mainWindow.swing.grblConnectionSettingsMenuItem = 发送器设置
+mainWindow.swing.grblFirmwareSettingsMenuItem = GRBL
 mainWindow.swing.keyboardMovementPanel = 单步
 mainWindow.swing.settingsMenu = 设置
 mainWindow.swing.statusPanel = 机器状态
@@ -85,25 +90,24 @@ mainWindow.swing.machinePosition = 机器位置
 mainWindow.swing.opencloseButton = 打开
 mainWindow.swing.pauseButton = 暂停
 mainWindow.swing.portLabel = 端口：
+mainWindow.swing.hostLabel = 主机\:
 mainWindow.swing.remainingRowsLabel = 剩余行：
 mainWindow.swing.remainingTimeLabel = 预计剩余时间：
 mainWindow.swing.resetCoordinatesButton = 重置零点
-action.resetXCoordinatesButton = action.resetXCoordinatesButton
-action.resetYCoordinatesButton = action.resetYCoordinatesButton
-action.resetZCoordinatesButton = action.resetZCoordinatesButton
 mainWindow.swing.returnToZeroButton = 返回零点
 mainWindow.swing.homeMachine = 归位
+mainWindow.swing.openDoor = 打开门
 mainWindow.swing.rowsLabel = 文件行数
 mainWindow.swing.scrollWindowCheckBox = 在窗口中滚动输出
 mainWindow.swing.sendButton = 发送
 mainWindow.swing.sentRowsLabel = 已发送行数：
 mainWindow.swing.showVerboseOutputCheckBox = 显示详细输出
+mainWindow.swing.clearOutput = 清除
 mainWindow.swing.showCommandTableCheckBox = 开启命令表
 mainWindow.swing.softResetMachineControl = 软复位
 mainWindow.swing.stepSizeLabel = XY步进大小
 mainWindow.swing.visualizeButton = 可视化
 mainWindow.swing.workPositionLabel = 工作位置
-mainWindow.swing.macroInstructions = mainWindow.swing.macroInstructions
 mainWindow.swing.inchRadioButton = 英寸
 mainWindow.swing.mmRadioButton = 毫米
 gcodeTable.command = 命令
@@ -118,47 +122,6 @@ firmware.feature.removeWhitespace = 移除所有空行
 firmware.feature.linesToArc = 将弧转换为线断
 firmware.feature.statusUpdates = 状态更新
 firmware.feature.statusUpdateRate = 状态更新率
-firmware.settings.exportSettingsDefaultName = firmware.settings.exportSettingsDefaultName
-firmware.settings.importSettings = firmware.settings.importSettings
-firmware.settings.importSettingsTitle = firmware.settings.importSettingsTitle
-firmware.settings.importSettingsName = firmware.settings.importSettingsName
-firmware.settings.importSettingsDate = firmware.settings.importSettingsDate
-firmware.settings.importSettingsCreatedBy = firmware.settings.importSettingsCreatedBy
-firmware.settings.importSettingsFirmware = firmware.settings.importSettings固件
-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 = 发送器设置
 sender.speed.override = 开启速度覆写
 sender.speed.percent = 速度覆写比例
@@ -174,10 +137,7 @@ sender.arcs.threshold = 小弧临界值(mm)
 sender.arcs.length = 小弧段长度(mm)
 sender.autoconnect = 开启时自动连接
 sender.autoreconnect = 自动重连
-sender.autostartpendant = sender.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.invertMouseZoom = 反转鼠标缩放
 sender.help.speed.override = 启用速度覆盖：启用或禁用速度覆盖。
 sender.help.speed.percent = 速度覆盖比率：速度将按此比率缩放。
 sender.help.command.length = 最大命令长度：设置触发错误的命令最大长度
@@ -186,48 +146,28 @@ sender.help.singlestep = 启用单步模式：打开单步模式，这是非常
 sender.help.whitespace = 移除所有空白\: 在G代码中移除不必要的空白
 sender.help.status = 启动轮询状态\: 如果支持，则打开固件的轮询状态
 sender.help.status.rate = 轮询状态速率\: 发送状态请求速率(ms)
-sender.help.state = sender.help.state
-sender.help.arcs = sender.help.arcs
-sender.help.arcs.threshold = sender.help.arcs.threshold
-sender.help.arcs.length = sender.help.arcs.length
-sender.help.autoconnect = sender.help.autoconnect
-sender.help.autoreconnect = sender.help.autoreconnect
 sender.help.dialog.title = 发送器设置帮助
 communicator.exception.port = 端口没有驱动
 controller.exception.booting = GRBL未完成启动
-controller.exception.sendError = controller.exception.sendError
-controller.exception.unexpectedError = controller.exception.unexpectedError
 controller.exception.homing = 此版本不支持归位方式
-controller.exception.reset = controller.exception.reset
-controller.exception.gohome = controller.exception.gohome
-controller.exception.killalarm = controller.exception.killalarm
-controller.exception.checkmode = controller.exception.checkmode
-controller.exception.parserstate = controller.exception.parserstate
 controller.exception.softreset = 此版本不支持重置
-controller.exception.sendingstatus = controller.exception.sendingstatus
-controller.exception.rowStatInvalid = controller.exception.rowStatInvalid
 controller.error.response = 处理响应错误
-controller.log.version = GRBL版本
 controller.log.realtime = 实时模式
 controller.log.notconnected = 未连接
-controller.log.error.reported = controller.log.error.reported
 connection.exception.inuse = 此端口被其他进程占用
-settings.log.location = settings.log.location
 settings.log.loading = 载入设置
 settings.log.saving = 储存设置
 settings.log.error = 无法读取设置，使用默认
 settings.log.saveerror = 无法储存设置！
 visualizer.title = 可视化
-VisualizerCanvas.dimensions = VisualizerCanvas.dimensions
 VisualizerCanvas.height = 高
 VisualizerCanvas.width = 宽
-platform.menu.jog = platform.menu.jog
-platform.menu.jog.size = platform.menu.jog.size
+platform.menu.jog.feed = 进给率
 platform.menu.actions = 动作
-platform.menu.macros = platform.menu.macros
 platform.menu.machine = 机器
-platform.actions.homing.disabled.tooltip = platform.actions.homing.disabled.tooltip
-incomplete.localization = UGS未完成中文的全部本地化翻译文件，详情请访问：https://translate.universalgcodesender.com 网站。
+incomplete.localization.title = 未完全翻译
+incomplete.localization = UGS未完成中文的全部本地化翻译文件，详情请访问：https\://translate.universalgcodesender.com 网站。
+incomplete.localization.doNotShowAgain = 不要再次显示此对话框
 mainWindow.swing.softReset = 软重置
 mainWindow.swing.resetX = 重置X轴
 mainWindow.swing.resetY = 重置Y轴
@@ -238,10 +178,12 @@ jogging.yPlus = 慢跑
 jogging.yMinus = 慢跑
 jogging.zPlus = 慢跑
 jogging.zMinus = 慢跑
-jogging.xPlus.yMinus = jogging.xPlus.yMinus
-jogging.xPlus.yPlus = jogging.xPlus.yPlus
-jogging.xMinus.yPlus = jogging.xMinus.yPlus
-jogging.xMinus.yMinus = 慢跑xMinus.yMinus
+jogging.aPlus = 点动\: A+
+jogging.aMinus = 点动\: A-
+jogging.bPlus = 点动\: B+
+jogging.bMinus = 点动\: B-
+jogging.cPlus = 点动\: C+
+jogging.cMinus = 点动\: C-
 jogging.divide = 慢跑
 jogging.multiply = 慢跑
 jogging.increase = 增加
@@ -250,6 +192,10 @@ jogging.divide.z = 慢跑
 jogging.multiply.z = 慢跑乘数
 jogging.increase.z = 慢跑
 jogging.decrease.z = 慢跑减少
+jogging.divide.abc = 点动\: 将ABC轴步长除以10
+jogging.multiply.abc = 点动\: 将ABC轴步长乘以10
+jogging.increase.abc = 点动\: 增加ABC轴步长
+jogging.decrease.abc = 点动\: 减少ABC轴步长
 jogging.increase.feed = 慢跑，增加饲料
 jogging.decrease.feed = 慢跑，减少饲料
 jogging.multiply.feed = 慢跑，多次进给
@@ -258,97 +204,89 @@ jogging.units.inch = 慢跑单位
 jogging.units.mm = 慢跑单位
 jogging.units.toggle = 慢跑单位切换
 grbl.exception.Alarm = GRBL处于警报状态时文件流无法开启
-grbl.exception.cancelReset = grbl.exception.cancelReset
-tinyg.exception.unknownVersion = tinyg.exception.unknownVersion
 platform.menu.window = 窗口
 platform.menu.classic = 经典
 platform.menu.plugins = 插件
 platform.window.dro = 控制器状态（DRO）
 platform.window.dro.tooltip = 实时机器状态
 platform.window.actions = 一般动作
-platform.window.actions.tooltip = platform.window.actions.tooltip
 platform.window.workflow = 工作流助手
 platform.window.workflow.tooltip = 帮助你在多个文件中运行工作
 platform.window.filebrowser = 文件浏览器
-platform.window.filebrowser.tooltip = platform.window.filebrowser.tooltip
-platform.window.jogcontrol = platform.window.jogcontrol
-platform.window.jogcontrol.tooltip = platform.window.jogcontrol.tooltip
 platform.window.macros = 宏
-platform.window.macros.tooltip = platform.window.macros.tooltip
 platform.window.overrides = 覆写
-platform.window.overrides.tooltip = platform.window.overrides.tooltip
-platform.window.sendstatus = platform.window.sendstatus
-platform.window.sendstatus.tooltip = platform.window.sendstatus.tooltip
 platform.window.serialconsole = 控制栏
-platform.window.serialconsole.tooltip = platform.window.serialconsole.tooltip
 platform.window.visualizer = 可视化
 platform.window.visualizer.tooltip = 当前操作的3D视角
+platform.visualizer.edit.options.title = 可视化选项
 platform.visualizer.color.background = 背景颜色
+platform.visualizer.tool = 显示当前位置
 platform.visualizer.color.tool = 工具颜色
-platform.visualizer.color.highlight = platform.visualizer.color.highlight
-platform.visualizer.color.linear = platform.visualizer.color.linear
-platform.visualizer.color.rapid = platform.visualizer.color.rapid
-platform.visualizer.color.arc = platform.visualizer.color.arc
-platform.visualizer.color.plunge = platform.visualizer.color.plunge
+platform.visualizer.tool.desc = 显示刀具位置
+platform.visualizer.model = 显示模式
+platform.visualizer.model.desc = 显示模型的刀具路径
+platform.visualizer.mouseover = 显示鼠标位置
+platform.visualizer.mouseover.desc = 显示鼠标位置
+platform.visualizer.orientation.cube = 显示视图调节器(立方块)
+platform.visualizer.orientation.cube.desc = 使用 3D 立方体显示场景的方向
+platform.visualizer.selection = 显示选中的行
+platform.visualizer.selection.desc = 在编辑器中显示选中的行
+platform.visualizer.size.display = 显示大小
+platform.visualizer.size.display.desc = 以当前选定的单位显示模型尺寸
+platform.visualizer.editor.position = 显示编辑器位置
+platform.visualizer.editor.position.desc = 在编辑器中跟踪显示选中的行
+platform.visualizer.probe.preview = 显示探针预览
+platform.visualizer.probe.preview.desc = 显示探针预览
+platform.visualizer.dowel.preview = 显示销钉预览
+platform.visualizer.dowel.preview.desc = 显示销钉预览
+platform.visualizer.highlight = 显示高亮线
+platform.visualizer.highlight.desc = 在编辑器中显示选中的行
 platform.visualizer.color.completed = 已完成行颜色
-platform.visualizer.color.xy-grid = platform.visualizer.color.xy网
-platform.visualizer.color.xy-plane = platform.visualizer.color.xy面
-platform.visualizer.color.x-axis = platform.visualizer.color.x轴
-platform.visualizer.color.y-axis = platform.visualizer.color.y轴
-platform.visualizer.color.z-axis = platform.visualizer.color.z轴
-platform.visualizer.color.sizedisplay = platform.visualizer.color.sizedisplay
-platform.visualizer.color.boundry-base = platform.visualizer.color.boundry-base
-platform.visualizer.color.boundry-sides = platform.visualizer.color.boundry-sides
+platform.visualizer.boundary = 显示机床边界
+platform.visualizer.boundary.desc = 显示机器边界作为边界框。边界的大小和位置将由控制器的设置决定。
+platform.visualizer.boundary.invert.x = 反向边界 X
+platform.visualizer.boundary.invert.y = 反转边界 Y
+platform.visualizer.boundary.invert.z = 反转边界 Z
+platform.visualizer.boundary.invert.desc = 在某些控制器上，机器最大/最小值会反转使机器边界呈现在错误的地方。 使用此设置来反转轴。
+platform.visualizer.autolevel.preview = 显示自动调平预览
+platform.visualizer.autolevel.preview.desc = 显示自动调平预览
+platform.visualizer.color.surface.high = 自动调平高位颜色
+platform.visualizer.color.surface.low = 自动调平低位颜色
 
 PendantMenu.item.StartServer = 开始
 PendantMenu.item.StopServer = 停止
 restore = 恢复
 macro.substitution = 宏观替代
-parser.processor.arc.start-error = parser.processor.arc.start错误
-parser.processor.arc.multiple-commands = parser.processor.arc.multiple的命令
-sender.help.commandSplitter = sender.help.commandSplitter
-sender.help.patternRemover = sender.help.patternRemover
-controller.exception.ignoreFutureErrors = controller.exception.ignoreFutureErrors
+sender.help.empty-line-remover = 从 gcode 文件中删除空行
 settings.processors.header = GCODE处理器配置
-settings.file.outOfDate.title = settings.file.outOfDate.title
-settings.file.outOfDate.message = settings.file.outOfDate.message
-settings.file.generalError = settings.file.generalError
 settings.processors.enabled = 开启
 settings.processors.add = 增加
 settings.processors.remove = 移除选择
-settings.processors.help = settings.processors.help
 settings.processors.loadError = 无法载入处理器
-settings.language = settings.language
-settings.connectionDriver = settings.connectionDriver
-settings.workspaceDirectory = settings.workspaceDirectory
-ArcExpander = ArcExpander
+settings.help.disableAxis = 如果可能，每个禁用的轴都会从 UI 中删除。
+settings.disableAxis = 禁用轴\: %s
 CommandLengthProcessor = 命令长度处理器
-CommandSplitter = CommandSplitter
-CommentProcessor = CommentProcessor
 DecimalProcessor = 小数处理器
 FeedOverrideProcessor = 给进速度覆盖
 M30Processor = M30移除器
 PatternRemover = 模式删除
 WhitespaceProcessor = 空白空间移除
-controller.exception.smoothie.booting = controller.exception.smoothie.booting
-mainWindow.swing.pendant = mainWindow.swing.pendant
-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 = mainWindow.error.error
 mainWindow.ui.connectDisconnect = 连接或断开
-mainWindow.swing.stepSizeZLabel = mainWindow.swing.stepSizeZLabel
 mainWindow.swing.feedRateLabel = 给进速率
 toolbar.icon.small = 小图标
 toolbar.icon.large = 大图标
 sender.help.verbose.console = 显示控制台详细信息
 platform.menu.open = 打开GCODE文件
+platform.menu.open.recent = 打开最近任务
+platform.menu.save = 保存
 platform.menu.edit = 编辑GCODE文件
 mainWindow.swing.reset = 重置
+machineStatus.pin.x = X
+machineStatus.pin.y = Y
+machineStatus.pin.z = Z
+machineStatus.pin.a = A
+machineStatus.pin.b = B
+machineStatus.pin.c = C
 machineStatus.pin.probe = 探针
 machineStatus.pin.door = 门
 machineStatus.pin.hold = 保持
@@ -359,6 +297,7 @@ controller.exception.unexpectedCommand = 由控制器完成意外命令
 platform.window.probe = 探针助手
 platform.window.probe.tooltip = 通过探针反馈实现零轴
 probe.feed-rate = 探针给进率
+probe.scan-rate = 探针给进率
 probe.probe-distance = 探测距离
 probe.plane = 探测轴
 probe.plate-thickness = 接触版面厚度
@@ -379,7 +318,6 @@ overrides.mist = 雾化冷却剂
 overrides.flood = 水冷液
 overrides.toggle.short = 切换
 restart = 需要重启
-platform.window.restart.changed.settings = platform.window.restart.changed.settings
 mainWindow.ui.connect = 连接
 mainWindow.ui.disconnect = 断开
 mainWindow.swing.stopButton = 停止
@@ -387,123 +325,57 @@ mainWindow.swing.filebrowser.toolbarTitle = 文件浏览
 mainWindow.swing.firmware.toolbarTitle = 固件选择
 mainWindow.swing.serialport.toolbarTitle = 串口选择
 mainWindow.swing.baudrate.toolbarTitle = 波特率
-parser.processor.general.multiple-commands = parser.processor.general.multiple命令
 platform.window.autoleveler = 自动调平
-platform.window.autoleveler.tooltip = platform.window.autoleveler.tooltip
 platform.visualizer.renderable.gcode-model = G代码
 platform.visualizer.renderable.grid = 坐标与平面
 platform.visualizer.renderable.highlight = G代码编辑器的高亮显示
+platform.visualizer.renderable.editor-position=编辑器光标位置
 platform.visualizer.renderable.mouse-indicator = 鼠标定位
 platform.visualizer.renderable.orientation-cube = 方位立方体
 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 = platform.visualizer.renderable.machine-boundries
 autoleveler.panel.min = 最小
 autoleveler.panel.max = 最大
 autoleveler.panel.z-surface = G代码Z平面
 autoleveler.panel.resolution = 分辨率
+autoleveler.panel.z-retract = Z 轴缩回
+autoleveler.panel.z-retract.tooltip = Z 从探测点缩回总高度的多少。如果不确定，请保留 100%。
 autoleveler.panel.use-file = 用已打开文件
-autoleveler.panel.scan-surface = 扫描平面
+autoleveler.panel.scan-surface = 扫描表面
 autoleveler.panel.apply = 应用G代码
-autoleveler.panel.view-data = 查看数据
-autoleveler.panel.visible = autoleveler.panel.visible
+autoleveler.panel.overwrite = 您想替换现有的探测数据吗？
+autoleveler.panel.visible = 显示图像预览
 autoleveler.option.z-zero = 在G代码中探测平面上的Z高度
+autoleveler.panel.generate-test-date = 生成测试数据
+autoleveler.panel.open = 打开扫描
+autoleveler.panel.save = 保存扫描
 autoleveler.option.arc-segment-length = 弧长(mm)
 autoleveler.option.offset-x = X探测偏移
 autoleveler.option.offset-y = Y探测偏移
 autoleveler.option.offset-z = Z探偏移
+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 = platform.window.probe-module.tooltip
 probe.find-rate = 快速查找率
 probe.measure-rate = 慢测量率
 probe.x-distance = 探测X距离
 probe.y-distance = 探测Y距离
-probe.z-distance = 探测Z距离
-probe.retract-height = probe.retract-height
 probe.retract-amount = 探测缩回量
-probe.measure.outside-corner = 角外探量
-probe.measure.inside-corner = 角内探查措施
-probe.visualizer.corner-preview = probe.visualizer.corner预览
-probe.visualizer.z-preview = probe.visualizer.z预览
-parser.gcode.multiple-axis-commands = parser.gcode.multiple-axis-commands
-parser.gcode.missing-axis-commands = parser.gcode.missing-axis-commands
-sender.nightly-warning = sender.nightly-warning
-sender.help.spindle-dwell = sender.help.spindle-dwell
-SpindleOnDweller = SpindleOnDweller
-platform.window.dowel-module = platform.window.dowel-module
-platform.window.dowel-module.tooltip = platform.window.dowel-module.tooltip
-platform.plugin.dowel-module.generate = platform.plugin.dowel-module.generate
-platform.plugin.dowel-module.export = platform.plugin.dowel-module.export
-platform.plugin.dowel-module.preview = platform.plugin.dowel-module.preview
-platform.plugin.dowel-module.dowel = platform.plugin.dowel-module.dowel
+probe.retract-amount.tooltip = 快速探头循环后运行慢速探头之前的缩回距离
+probe.hole-diameter = 大约孔径
 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
-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-version
-platform.plugin.setupwizard.reset-to-zero = platform.plugin.setupwizard。重置为零
-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-settings
-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。
-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。创建者
-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-wiring.title
-platform.plugin.setupwizard.motor-wiring.intro = platform.plugin.setupwizard.motor-wiring.intro
-platform.plugin.setupwizard.motor-wiring.soft-limits-enabled = platform.plugin.setupwizard.motor-wiring.soft-limits-enabled
-platform.plugin.setupwizard.motor-wiring.reverse-direction = platform.plugin.setupwizard.motor-wiring.reverse-direction
-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.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.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。不可用
-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-limits.intro
-platform.plugin.setupwizard.soft-limits.instructions = platform.plugin.setupwizard.soft-limits.instructions
-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-limits。不可用
-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。不可用
-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 = 单位
 gcode.setting.feed = 给进率
 gcode.setting.xy-feed = 给进速率(XY)
@@ -545,50 +417,288 @@ 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 = 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 = platform.plugin.jog.stepSmaller
-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
+platform.plugin.designer.clipart.decorations=裝飾品
+platform.plugin.designer.clipart.electronics=电子元件
+platform.plugin.designer.clipart.food=切削液
+platform.plugin.designer.clipart.geography=地理位置
+platform.plugin.designer.clipart.holiday=假日
+platform.plugin.designer.clipart.logos=图标
+platform.plugin.designer.clipart.mythical=神话
+platform.plugin.designer.clipart.office=办公室
+platform.plugin.designer.clipart.people=人与字符
+platform.plugin.designer.clipart.plants=植物
+platform.plugin.designer.clipart.science=科学
+platform.plugin.designer.clipart.signs_and_symbols=标志和符号
+platform.plugin.designer.clipart.special=特殊
+platform.plugin.designer.clipart.tools=工具
+platform.plugin.designer.clipart.transportation=交通工具
+platform.plugin.designer.clipart.unsorted=未排序
+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