From 6a7f84b394e0469ccd15ea207d5024cd251f9df5 Mon Sep 17 00:00:00 2001
From: Terje Io <terjeio@users.noreply.github.com>
Date: Thu, 17 Nov 2022 14:00:39 +0100
Subject: [PATCH] Release 2.0.41

---
 .../CNC Controls Probing.csproj               |  10 +
 .../CenterFinderControl.xaml.cs               |  45 ++-
 .../CNC Controls Probing/ConfigControl.xaml   |   3 +-
 .../CNC Controls Probing/CsSelectControl.xaml |  11 +-
 .../EdgeFinderControl.xaml.cs                 |  53 ++--
 .../EdgeFinderIntControl.xaml.cs              |  52 ++--
 .../HeightMapControl.xaml.cs                  |   8 +-
 .../CNC Controls Probing/LibStrings.xaml      |   2 +
 .../CNC Controls Probing/ProbeVerify.xaml     |  13 +
 .../CNC Controls Probing/ProbeVerify.xaml.cs  |  93 ++++++
 .../CNC Controls Probing/ProbingView.xaml     |   9 +-
 .../CNC Controls Probing/ProbingView.xaml.cs  |  32 +-
 .../CNC Controls Probing/ProbingViewModel.cs  | 110 +++++--
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../CNC Controls Probing/Resources/App.ico    | Bin 0 -> 7406 bytes
 .../RotationControl.xaml.cs                   |   5 +-
 .../ToolLengthControl.xaml.cs                 |   5 +-
 CNC Controls/CNC Controls/About.xaml          |   6 +-
 CNC Controls/CNC Controls/AppConfig.cs        |  22 +-
 CNC Controls/CNC Controls/Converters.cs       |  77 ++++-
 CNC Controls/CNC Controls/DROBaseControl.xaml |   2 +-
 CNC Controls/CNC Controls/DROControl.xaml     |  18 +-
 CNC Controls/CNC Controls/DROControl.xaml.cs  |  12 +-
 CNC Controls/CNC Controls/GCode.cs            |  41 ++-
 CNC Controls/CNC Controls/IGCodeConverter.cs  |   5 +-
 CNC Controls/CNC Controls/JobControl.xaml.cs  |   9 +-
 CNC Controls/CNC Controls/JogBaseControl.xaml |  27 +-
 .../CNC Controls/LimitsBaseControl.xaml       |   2 +-
 CNC Controls/CNC Controls/LimitsControl.xaml  |   6 +-
 CNC Controls/CNC Controls/NumericTextBox.cs   |  18 +-
 CNC Controls/CNC Controls/OffsetView.xaml     |  83 +++++-
 CNC Controls/CNC Controls/PortDialog.xaml     |  15 +-
 CNC Controls/CNC Controls/PortDialog.xaml.cs  |  14 +-
 .../CNC Controls/Properties/AssemblyInfo.cs   |   4 +-
 CNC Controls/CNC Controls/SharedStyles.xaml   |  42 +++
 CNC Controls/CNC Controls/SignalsControl.xaml |   9 +-
 CNC Controls/CNC Controls/Widget.cs           |  16 +-
 CNC Converters/Excellon2GCode.cs              |  42 +--
 CNC Converters/HpglToGCode.cs                 |   5 +-
 CNC Converters/Properties/AssemblyInfo.cs     |   4 +-
 CNC Core/CNC Core/GCode.cs                    |  43 ++-
 CNC Core/CNC Core/GCodeJob.cs                 |  14 +-
 CNC Core/CNC Core/GCodeParser.cs              |  82 +++++-
 CNC Core/CNC Core/Grbl.cs                     | 260 +++++++++++------
 CNC Core/CNC Core/GrblViewModel.cs            |  16 +-
 CNC Core/CNC Core/Machine.cs                  |  12 +-
 CNC Core/CNC Core/Properties/AssemblyInfo.cs  |   4 +-
 CNC Core/CNC Core/SerialStream.cs             |  26 +-
 CNC Core/CNC Core/TelnetStream.cs             |  11 +-
 CNC Core/CNC Core/WebsocketStream.cs          |  14 +-
 .../Grbl Config App/MainWindow.xaml.cs        |   2 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../CNC.Controls.Probing.resources.de-DE.csv  |  36 ++-
 .../CNC.Controls.Viewer.resources.de-DE.csv   |   8 +-
 .../csv/CNC.Controls.WPF.resources.de-DE.csv  |  50 ++--
 .../csv/CNC.Converters.resources.de-DE.csv    |   2 +-
 Locale/de-DE/translation.txt                  | Bin 108934 -> 110142 bytes
 .../CNC.Controls.Probing.resources.en-US.csv  |  36 ++-
 .../CNC.Controls.Viewer.resources.en-US.csv   |   8 +-
 .../csv/CNC.Controls.WPF.resources.en-US.csv  |  50 ++--
 .../csv/CNC.Converters.resources.en-US.csv    |   2 +-
 Locale/en-US/translation.txt                  | Bin 104270 -> 105488 bytes
 .../CNC.Controls.Probing.resources.pt-BR.csv  |  36 ++-
 .../CNC.Controls.Viewer.resources.pt-BR.csv   |   8 +-
 .../csv/CNC.Controls.WPF.resources.pt-BR.csv  |  52 ++--
 .../csv/CNC.Converters.resources.pt-BR.csv    |   2 +-
 Locale/pt-BR/translation.txt                  | Bin 108706 -> 109924 bytes
 .../CNC.Controls.Probing.resources.ru-RU.csv  |  36 ++-
 .../CNC.Controls.Viewer.resources.ru-RU.csv   |   8 +-
 .../csv/CNC.Controls.WPF.resources.ru-RU.csv  |  50 ++--
 .../csv/CNC.Converters.resources.ru-RU.csv    |   2 +-
 Locale/ru-RU/translation.txt                  | Bin 106382 -> 107610 bytes
 .../CNC.Controls.Camera.resources.uk-UA.csv   |  12 +
 ...CNC.Controls.DragKnife.resources.uk-UA.csv |  18 ++
 .../CNC.Controls.Probing.resources.uk-UA.csv  | 171 +++++++++++
 .../CNC.Controls.Viewer.resources.uk-UA.csv   |  41 +++
 .../csv/CNC.Controls.WPF.resources.uk-UA.csv  | 275 ++++++++++++++++++
 .../csv/CNC.Converters.resources.uk-UA.csv    |  18 ++
 Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv |  43 +++
 Locale/uk-UA/csv/ioSender.resources.uk-UA.csv |  52 ++++
 Locale/uk-UA/translation.txt                  | Bin 0 -> 107832 bytes
 .../CNC.Controls.Probing.resources.zh-CN.csv  |  36 ++-
 .../CNC.Controls.Viewer.resources.zh-CN.csv   |   8 +-
 .../csv/CNC.Controls.WPF.resources.zh-CN.csv  |  50 ++--
 .../csv/CNC.Converters.resources.zh-CN.csv    |   2 +-
 Locale/zh-CN/translation.txt                  | Bin 95914 -> 97132 bytes
 Media/Sender8.png                             | Bin 6396 -> 11906 bytes
 changelog.md                                  |  20 +-
 ioSender XL/ioSender XL/MainWindow.xaml.cs    |   8 +-
 .../ioSender XL/Properties/AssemblyInfo.cs    |   4 +-
 ioSender/ioSender/MainWindow.xaml.cs          |   8 +-
 ioSender/ioSender/Properties/AssemblyInfo.cs  |   4 +-
 readme.md                                     |   8 +-
 93 files changed, 2005 insertions(+), 581 deletions(-)
 create mode 100644 CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml
 create mode 100644 CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml.cs
 create mode 100644 CNC Controls Probing/CNC Controls Probing/Resources/App.ico
 create mode 100644 Locale/uk-UA/csv/CNC.Controls.Camera.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/csv/CNC.Controls.DragKnife.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/csv/CNC.Controls.Viewer.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/csv/CNC.Converters.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/csv/ioSender.resources.uk-UA.csv
 create mode 100644 Locale/uk-UA/translation.txt

diff --git a/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj b/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj
index 2fceb44..244f037 100644
--- a/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj	
+++ b/CNC Controls Probing/CNC Controls Probing/CNC Controls Probing.csproj	
@@ -81,6 +81,9 @@
     </Compile>
     <Compile Include="HeightMapViewModel.cs" />
     <Compile Include="IProbeTab.cs" />
+    <Compile Include="ProbeVerify.xaml.cs">
+      <DependentUpon>ProbeVerify.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ProbingConfig.cs" />
     <Compile Include="ProbingView.xaml.cs">
       <DependentUpon>ProbingView.xaml</DependentUpon>
@@ -134,6 +137,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ProbeVerify.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ProbingView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -188,6 +195,9 @@
     <Resource Include="Resources\RotaterCB.png" />
     <Resource Include="Resources\RotaterCD.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\App.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs
index 28841e0..63b273e 100644
--- a/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/CenterFinderControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * CenterFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -80,6 +80,7 @@ public void Activate(bool activate)
 
             if (activate)
             {
+                probing.AllowMeasure = true;
                 probing.Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
                 probing.PropertyChanged += Probing_PropertyChanged;
             } else
@@ -135,7 +136,7 @@ private bool CreateProgram(bool preview)
 
             if (!probing.Program.Init())
             {
-                probing.Message = (string)FindResource("InitFailed");
+                probing.Message = (string)FindResource("InitFailed") + " " + probing.Message;
                 return false;
             }
 
@@ -295,6 +296,9 @@ public void Start(bool preview = false)
                 return;
             }
 
+            if (!probing.VerifyProbe())
+                return;
+
             pass = preview ? 1 : probing.Passes;
 
             if (CreateProgram(preview))
@@ -310,8 +314,11 @@ public void Start(bool preview = false)
                     else
                     {
                         probing.Program.Execute(true);
-                        OnCompleted();
+                        if(OnCompleted())
+                            probing.WaitForIdle(string.Empty);
                     }
+
+
                 } while (--pass != 0 && CreateProgram(preview));
             }
         }
@@ -375,19 +382,27 @@ private bool OnCompleted()
 
                 if (ok && pass == 1)
                 {
-                    if (probing.CoordinateMode == ProbingViewModel.CoordMode.G92)
-                    {
-                        center.X = probing.ProbeOffsetX;
-                        center.Y = probing.ProbeOffsetY;
-                        probing.WaitForResponse("G92" + center.ToString(axisflags));
-                        if (!probing.Grbl.IsParserStateLive)
-                            probing.Grbl.ExecuteCommand("$G");
-                    }
-                    else
+                    switch(probing.CoordinateMode)
                     {
-                        center.X += probing.ProbeOffsetX;
-                        center.Y += probing.ProbeOffsetY;
-                        probing.WaitForResponse(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, center.ToString(axisflags)));
+                        case ProbingViewModel.CoordMode.Measure:
+                            center.X += probing.ProbeOffsetX;
+                            center.Y += probing.ProbeOffsetY;
+                            probing.Measurement.Add(center, axisflags, ProbingType);
+                            break;
+
+                        case ProbingViewModel.CoordMode.G92:
+                            center.X = probing.ProbeOffsetX;
+                            center.Y = probing.ProbeOffsetY;
+                            probing.WaitForResponse("G92" + center.ToString(axisflags));
+                            if (!probing.Grbl.IsParserStateLive)
+                                probing.Grbl.ExecuteCommand("$G");
+                            break;
+
+                        case ProbingViewModel.CoordMode.G10:
+                            center.X += probing.ProbeOffsetX;
+                            center.Y += probing.ProbeOffsetY;
+                            probing.WaitForResponse(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, center.ToString(axisflags)));
+                            break;
                     }
                 }
 
diff --git a/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml b/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml
index ec68b53..13a1a13 100644
--- a/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ConfigControl.xaml	
@@ -6,9 +6,10 @@
              xmlns:local="clr-namespace:CNC.Controls.Probing"
              xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF"
              mc:Ignorable="d" 
-             d:DesignHeight="42" d:DesignWidth="310">
+             d:DesignHeight="80" d:DesignWidth="310">
     <GroupBox x:Uid="grp_probeConfig" Header="Probing" HorizontalAlignment="Left" VerticalAlignment="Top" Height="Auto" Width="310">
         <StackPanel HorizontalAlignment="Left" Height="Auto" Margin="0,3,0,0" VerticalAlignment="Top" Width="290">
+            <CheckBox x:Uid="lbl_chkProbeConnected" Content="Manually validate probe is connected" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=Probing.ValidateProbeConnected, Mode=TwoWay}" ToolTip="A dialog will be shown until the probe is asserted or the dialog is cancelled."/>
             <CheckBox x:Uid="lbl_chkProbeStatus" Content="Check probe status before start (G59.3)" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Margin="5,0,0,0" IsChecked="{Binding Path=Probing.CheckProbeStatus, Mode=TwoWay}" ToolTip="An alarm will be generated by the controller if not enabled and the probe is asserted."/>
         </StackPanel>
     </GroupBox>
diff --git a/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml b/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml
index 623cc9f..9b4ed8b 100644
--- a/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/CsSelectControl.xaml	
@@ -6,23 +6,26 @@
              xmlns:Controls="clr-namespace:CNC.Controls;assembly=CNC.Controls.WPF"
              xmlns:local="clr-namespace:CNC.Controls.Probing"
              mc:Ignorable="d" 
-             d:DesignHeight="80" d:DesignWidth="230">
+             d:DesignHeight="105" d:DesignWidth="230">
     <UserControl.Resources>
         <Controls:EnumValueToBooleanConverter x:Key="EnumToCheckedConverter" />
         <Controls:BoolToVisibleConverter x:Key="IsVisibleConverter" />
     </UserControl.Resources>
-    <GroupBox x:Uid="grp_action" Header="Action" Height="85">
-        <StackPanel Orientation="Vertical" Margin="2,5,0,0">
+    <GroupBox x:Uid="grp_action" Header="Action">
+        <StackPanel Orientation="Vertical" Margin="2,3,0,0">
             <DockPanel>
                 <RadioButton x:Uid="set_coord" Content="Set coordinate system:" IsChecked="{Binding Path=CoordinateMode, Mode=TwoWay, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=G10}" VerticalAlignment="Center"/>
                 <ComboBox x:Name="cbxOffset" Margin="3,0" DisplayMemberPath="Code" SelectedValuePath="Id" ItemsSource="{Binding Path=CoordinateSystems}" SelectedValue="{Binding Path=CoordinateSystem, Mode=TwoWay}" HorizontalAlignment="Right" VerticalAlignment="Center" Width="55" Height="22"/>
             </DockPanel>
-            <DockPanel Margin="0,5,0,0" Width="Auto" Height="30">
+            <DockPanel Margin="0,2,0,0" Width="Auto" Height="30">
                 <RadioButton x:Uid="btn_setG92" Content="Set offset (G92)" IsChecked="{Binding Path=CoordinateMode, Mode=TwoWay, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=G92}" VerticalAlignment="Center"/>
                 <Border Visibility="{Binding Path=Grbl.IsG92Active, Converter={StaticResource IsVisibleConverter}}" Background="Salmon" HorizontalAlignment="Right" VerticalAlignment="Center" CornerRadius="2" Width="61" Height="28">
                     <Button x:Uid="btn_clear" Content="Clear" HorizontalAlignment="Center" VerticalAlignment="Center" Width="55" Height="22" Click="ClearG92_Click"/>
                 </Border>
             </DockPanel>
+            <DockPanel Visibility="{Binding Path=AllowMeasure, Converter={StaticResource IsVisibleConverter}}" Margin="0,5,0,0" Width="Auto" Height="19">
+                <RadioButton x:Uid="btn_setMeasure" Content="Measure" IsChecked="{Binding Path=CoordinateMode, Mode=TwoWay, Converter={StaticResource EnumToCheckedConverter}, ConverterParameter=Measure}" VerticalAlignment="Center"/>
+            </DockPanel>
         </StackPanel>
     </GroupBox>
 </UserControl>
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs
index 86f5465..609c130 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * EdgeFinderControl.xaml.cs - part of CNC Probing library
  *
- * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -80,8 +80,11 @@ public EdgeFinderControl()
 
         public void Activate(bool activate)
         {
-            if(activate)
+            if (activate)
+            {
+                (DataContext as ProbingViewModel).AllowMeasure = true;
                 (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            }
         }
 
         public void Start(bool preview = false)
@@ -97,6 +100,9 @@ public void Start(bool preview = false)
                 return;
             }
 
+            if (!probing.VerifyProbe())
+                return;
+
             if (!probing.Program.Init())
                 return;
 
@@ -275,24 +281,33 @@ private void OnCompleted ()
 
                 if (ok)
                 {
-                    if (probing.CoordinateMode == ProbingViewModel.CoordMode.G92)
-                    {
-                        if((ok = !isCancelled && probing.GotoMachinePosition(pos, AxisFlags.Z)))
-                        {
-                            pos.X = -probing.ProbeOffsetX;
-                            pos.Y = -probing.ProbeOffsetY;
-                            pos.Z = probing.WorkpieceHeight + probing.TouchPlateHeight;
-                            probing.WaitForResponse("G92" + pos.ToString(axisflags));
-                            if (!isCancelled && axisflags.HasFlag(AxisFlags.Z))
-                                probing.GotoMachinePosition(probing.StartPosition, AxisFlags.Z);
-                        }
-                    }
-                    else
+                    switch (probing.CoordinateMode)
                     {
-                        pos.X += probing.ProbeOffsetX;
-                        pos.Y += probing.ProbeOffsetY;
-                        pos.Z -= probing.WorkpieceHeight + probing.TouchPlateHeight + probing.Grbl.ToolOffset.Z;
-                        probing.WaitForResponse(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, pos.ToString(axisflags)));
+                        case ProbingViewModel.CoordMode.Measure:
+                            pos.X += probing.ProbeOffsetX;
+                            pos.Y += probing.ProbeOffsetY;
+                            pos.Z -= probing.WorkpieceHeight + probing.TouchPlateHeight + probing.Grbl.ToolOffset.Z;
+                            probing.Measurement.Add(pos, axisflags, ProbingType);
+                            break;
+
+                        case ProbingViewModel.CoordMode.G92:
+                            if ((ok = !isCancelled && probing.GotoMachinePosition(pos, AxisFlags.Z)))
+                            {
+                                pos.X = -probing.ProbeOffsetX;
+                                pos.Y = -probing.ProbeOffsetY;
+                                pos.Z = probing.WorkpieceHeight + probing.TouchPlateHeight;
+                                probing.WaitForResponse("G92" + pos.ToString(axisflags));
+                                if (!isCancelled && axisflags.HasFlag(AxisFlags.Z))
+                                    probing.GotoMachinePosition(probing.StartPosition, AxisFlags.Z);
+                            }
+                            break;
+
+                        case ProbingViewModel.CoordMode.G10:
+                            pos.X += probing.ProbeOffsetX;
+                            pos.Y += probing.ProbeOffsetY;
+                            pos.Z -= probing.WorkpieceHeight + probing.TouchPlateHeight + probing.Grbl.ToolOffset.Z;
+                            probing.WaitForResponse(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, pos.ToString(axisflags)));
+                            break;
                     }
                 }
 
diff --git a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs
index d1edbc6..a5fe92e 100644
--- a/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/EdgeFinderIntControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * EdgeFinderIntControl.xaml.cs - part of CNC Probing library
  *
- * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -67,8 +67,10 @@ public EdgeFinderIntControl()
 
         public void Activate(bool activate)
         {
-            if (activate)
+            if (activate) {
+                (DataContext as ProbingViewModel).AllowMeasure = true;
                 (DataContext as ProbingViewModel).Instructions = ((string)FindResource("Instructions")).Replace("\\n", "\n");
+            }
         }
 
         public void Start(bool preview = false)
@@ -84,6 +86,9 @@ public void Start(bool preview = false)
                 return;
             }
 
+            if(!probing.VerifyProbe())
+                return;
+
             if (!probing.Program.Init())
                 return;
 
@@ -264,24 +269,33 @@ private void OnCompleted()
 
                 if (ok)
                 {
-                    if (probing.CoordinateMode == ProbingViewModel.CoordMode.G92)
-                    {
-                        if ((ok = !isCancelled && probing.GotoMachinePosition(pos, AxisFlags.Z)))
-                        {
-                            pos.X = -probing.ProbeOffsetX;
-                            pos.Y = -probing.ProbeOffsetY;
-                            pos.Z = probing.WorkpieceHeight + probing.TouchPlateHeight;
-                            probing.WaitForResponse("G92" + pos.ToString(axisflags));
-                            if (!isCancelled && axisflags.HasFlag(AxisFlags.Z))
-                                probing.GotoMachinePosition(probing.StartPosition, AxisFlags.Z);
-                        }
-                    }
-                    else
+                    switch (probing.CoordinateMode)
                     {
-                        pos.X += probing.ProbeOffsetX;
-                        pos.Y += probing.ProbeOffsetY;
-                        pos.Z -= probing.WorkpieceHeight + probing.TouchPlateHeight + probing.Grbl.ToolOffset.Z;
-                        probing.WaitForResponse(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, pos.ToString(axisflags)));
+                        case ProbingViewModel.CoordMode.Measure:
+                            pos.X += probing.ProbeOffsetX;
+                            pos.Y += probing.ProbeOffsetY;
+                            pos.Z -= probing.WorkpieceHeight + probing.TouchPlateHeight + probing.Grbl.ToolOffset.Z;
+                            probing.Measurement.Add(pos, axisflags, ProbingType);
+                            break;
+
+                        case ProbingViewModel.CoordMode.G92:
+                            if ((ok = !isCancelled && probing.GotoMachinePosition(pos, AxisFlags.Z)))
+                            {
+                                pos.X = -probing.ProbeOffsetX;
+                                pos.Y = -probing.ProbeOffsetY;
+                                pos.Z = probing.WorkpieceHeight + probing.TouchPlateHeight;
+                                probing.WaitForResponse("G92" + pos.ToString(axisflags));
+                                if (!isCancelled && axisflags.HasFlag(AxisFlags.Z))
+                                    probing.GotoMachinePosition(probing.StartPosition, AxisFlags.Z);
+                            }
+                            break;
+
+                        case ProbingViewModel.CoordMode.G10:
+                            pos.X += probing.ProbeOffsetX;
+                            pos.Y += probing.ProbeOffsetY;
+                            pos.Z -= probing.WorkpieceHeight + probing.TouchPlateHeight + probing.Grbl.ToolOffset.Z;
+                            probing.WaitForResponse(string.Format("G10L2P{0}{1}", probing.CoordinateSystem, pos.ToString(axisflags)));
+                            break;
                     }
                 }
 
diff --git a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs
index b30888e..4f416d6 100644
--- a/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/HeightMapControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * HeightMapControl.xaml.cs - part of CNC Probing library
  *
- * v0.37 / 2022-03-09 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -75,7 +75,11 @@ public void Start(bool preview = false)
             if (!probing.ValidateInput(true))
                 return;
 
-            probing.WaitForIdle(string.Format("G90G0X{0}Y{1}", probing.HeightMap.MinX.ToInvariantString(), probing.HeightMap.MinY.ToInvariantString()));
+            if (!probing.WaitForIdle(string.Format("G90G0X{0}Y{1}", probing.HeightMap.MinX.ToInvariantString(), probing.HeightMap.MinY.ToInvariantString())))
+                return;
+
+            if (!probing.VerifyProbe())
+                return;
 
             if (!probing.Program.Init())
                 return;
diff --git a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml
index 56f77f0..d9f1926 100644
--- a/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/LibStrings.xaml	
@@ -15,4 +15,6 @@
     <system:String x:Uid="str_probingDistanceError" x:Key="ErrorProbingDistance">Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.</system:String>
     <system:String x:Uid="str_probingLatchDistanceError" x:Key="ErrorLatchDistance">Latch distance must be less than Probing distance.</system:String>
     <system:String x:Uid="str_probingIllegalPosition" x:Key="IllegalPosition">Illegal probe position, try again.</system:String>
+    <system:String x:Uid="str_probingNoVerifyContinue" x:Key="NoVerifyContinue">Probe connection was not verified, continue anyway?</system:String>
+    <system:String x:Uid="str_probingVerifyStart" x:Key="VerifyStart">Press [Start] again to start probing.</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml b/CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml
new file mode 100644
index 0000000..6f2a4db
--- /dev/null
+++ b/CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml	
@@ -0,0 +1,13 @@
+<Window x:Class="CNC.Controls.Probing.ProbeVerify"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:CNC.Controls.Probing"
+        mc:Ignorable="d"
+        Title="Sender" Height="100" Width="300" ResizeMode="NoResize"
+        Loaded="Window_Loaded" Closing="Window_Closing" Icon="Resources/App.ico">
+    <Grid Background="Snow">
+        <Label x:Uid="str_probeVerify" x:Name="label" Content="Assert probe to verify connection." HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center" FontSize="16"/>
+    </Grid>
+</Window>
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml.cs
new file mode 100644
index 0000000..a0430e9
--- /dev/null
+++ b/CNC Controls Probing/CNC Controls Probing/ProbeVerify.xaml.cs	
@@ -0,0 +1,93 @@
+/*
+ * ProbingVerify.cs - part of CNC Probing library
+ *
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
+ *
+ */
+
+/*
+
+Copyright (c) 2022, Io Engineering (Terje Io)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+· Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+· Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+· Neither the name of the copyright holder nor the names of its contributors may
+be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Threading;
+using CNC.Core;
+
+namespace CNC.Controls.Probing
+{
+
+    public partial class ProbeVerify : Window
+    {
+        public ProbeVerify(ProbingViewModel model)
+        {
+            InitializeComponent();
+
+            DataContext = model;
+            model.Grbl.PropertyChanged += Grbl_PropertyChanged;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            var parent = Application.Current.MainWindow;
+
+            Left = parent.Left + (parent.Width - Width) / 2d;
+            Top = parent.Top + (parent.Height - Height) / 2d;
+
+            (sender as Window).Dispatcher.Invoke(new System.Action(() =>
+            {
+                (sender as Window).MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+            }), DispatcherPriority.ContextIdle);
+        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            (DataContext as ProbingViewModel).Grbl.PropertyChanged -= Grbl_PropertyChanged;
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+
+            if (!e.Handled && e.Key == Key.Escape && Keyboard.Modifiers == ModifierKeys.None)
+                Close();
+        }
+
+        private void Grbl_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(GrblViewModel.Signals) && (sender as GrblViewModel).Signals.Value.HasFlag(Signals.Probe))
+            {
+                (DataContext as ProbingViewModel).ProbeVerified = true;
+                Close();
+            }
+        }
+    }
+}
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml
index ef02f03..5f5ecd7 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml	
@@ -43,8 +43,11 @@
         </Style>
     </UserControl.Resources>
     <DockPanel Background="Transparent" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-        <DockPanel x:Name="dp" DockPanel.Dock="Left" Margin="5,10,5,0" Width="240" HorizontalAlignment="Left" VerticalAlignment="Stretch">
-            <StackPanel x:Name="t1" Height="Auto" HorizontalAlignment="Left" VerticalAlignment="Top" DockPanel.Dock="Top" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsVisibleConverter}}">
+        <DockPanel x:Name="dp" DockPanel.Dock="Left" Margin="5,5,5,0" Width="240" HorizontalAlignment="Left" VerticalAlignment="Stretch">
+            <StackPanel x:Name="droPanel" Visibility ="Collapsed" Margin="0,0,5,0" Height="Auto" HorizontalAlignment="Left" VerticalAlignment="Top" DockPanel.Dock="Left">
+                <Controls:DROControl x:Name="DRO" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+            </StackPanel>
+            <StackPanel x:Name="t1" Height="Auto" HorizontalAlignment="Left" VerticalAlignment="Stretch" DockPanel.Dock="Right" IsEnabled="{Binding Path=Grbl.IsJobRunning, Converter={StaticResource IsVisibleConverter}}">
                 <StackPanel Orientation="Horizontal" Margin="0,0,0,5" HorizontalAlignment="Stretch">
                     <Label x:Uid="lbl_profile" x:Name="lblProfile" Content="Profile:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Height="25" Width="48"/>
                     <ComboBox x:Name="cbxProfile" IsEditable="True"  HorizontalAlignment="Left" VerticalAlignment="Center" Width="155" Height="22"
@@ -95,8 +98,8 @@
                     </StackPanel>
                 </GroupBox>
                 <Button x:Uid="btn_jog" x:Name="Jog" Content="Click to activate keyboard jogging" ToolTip="Ctrl+Shift to activate" Margin="0,5,0,6" Focusable="True" FocusVisualStyle="{x:Null}" GotFocus="Jog_FocusedChanged" LostFocus="Jog_FocusedChanged"/>
+                <TextBlock Text="{Binding Path=Position, Mode=OneWay}" TextWrapping="NoWrap" Height="25" Width="235" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
             </StackPanel>
-            <TextBlock Text="{Binding Path=Position, Mode=OneWay}" TextWrapping="NoWrap" Height="25" Width="235" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
         </DockPanel>
         <StackPanel DockPanel.Dock="Right" Margin="0,10,0,0" Width="635" HorizontalAlignment="Left" VerticalAlignment="Top">
             <TabControl x:Name="tab" HorizontalAlignment="Stretch" VerticalAlignment="Top" Width="Auto" Height="Auto" SelectionChanged="tab_SelectionChanged">
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs
index 1bfed08..4bf86e9 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingView.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * ProbingView.xaml.cs - part of CNC Probing library
  *
- * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -82,9 +82,12 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
                 keyboard.AddHandler(Key.S, ModifierKeys.Alt, StopProbe, this);
                 keyboard.AddHandler(Key.C, ModifierKeys.Alt, ProbeConnectedToggle, this);
 
+                DRO.DataContext = grbl;
                 DataContext = model = new ProbingViewModel(DataContext as GrblViewModel, profiles);
 
                 grbl.OnCameraProbe += addCameraPosition;
+
+                showDRO();
             }
         }
 
@@ -134,7 +137,7 @@ private bool StopProbe(Key key)
         private bool StartProbe(Key key)
         {
             focusedControl = Keyboard.FocusedElement;
-            getView(tab.SelectedItem as TabItem)?.Start();
+            getView(tab.SelectedItem as TabItem)?.Start(model.PreviewEnable);
 
             return true;
         }
@@ -207,6 +210,7 @@ private void Grbl_PropertyChanged(object sender, System.ComponentModel.PropertyC
 
         private void ProbingView_SizeChanged(object sender, SizeChangedEventArgs e)
         {
+            showDRO();
             showProbeProperties();
         }
 
@@ -264,6 +268,7 @@ public void Activate(bool activate, ViewType chgMode)
                 else
                     GrblParserState.Get(true);
 
+                model.ProbeVerified = !AppConfig.Settings.Probing.ValidateProbeConnected;
                 model.DistanceMode = GrblParserState.DistanceMode;
                 model.Tool = model.Grbl.Tool == GrblConstants.NO_TOOL ? "0" : model.Grbl.Tool;
                 model.CanProbe = !model.Grbl.Signals.Value.HasFlag(Signals.Probe);
@@ -289,6 +294,7 @@ public void Activate(bool activate, ViewType chgMode)
                 cycleStartSignal = model.Grbl.Signals.Value.HasFlag(Signals.CycleStart);
 
                 DisplayPosition(model.Grbl);
+
             }
             else
             {
@@ -403,6 +409,9 @@ private void tab_SelectionChanged(object sender, SelectionChangedEventArgs e)
                 {
                     var view = getView(e.AddedItems[0] as TabItem);
                     model.Positions.Clear();
+                    if (!model.AllowMeasure && model.CoordinateMode == ProbingViewModel.CoordMode.Measure)
+                        model.CoordinateMode = ProbingViewModel.CoordMode.G10;
+                    model.AllowMeasure = false;
                     model.ProbingType = view.ProbingType;
                     model.Message = string.Empty;
                     model.PreviewEnable = false;
@@ -418,5 +427,24 @@ private void tab_SelectionChanged(object sender, SelectionChangedEventArgs e)
                 e.Handled = true;
             }
         }
+
+        // https://stackoverflow.com/questions/5707143/how-to-get-the-width-height-of-a-collapsed-control-in-wpf
+        private void showDRO()
+        {
+            double width;
+
+            if (droPanel.Visibility == Visibility.Collapsed)
+            {
+                droPanel.Visibility = Visibility.Hidden;
+                droPanel.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                width = droPanel.DesiredSize.Width;
+                droPanel.Visibility = Visibility.Collapsed;
+            }
+            else
+                width = droPanel.ActualWidth;
+
+            droPanel.Visibility = (tab.ActualWidth + width + t1.ActualWidth + 20) < ActualWidth ? Visibility.Visible : Visibility.Collapsed;
+            dp.Width = droPanel.Visibility == Visibility.Visible  ? 460 : 240;
+        }
     }
 }
diff --git a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs
index 5ac78a1..18c5f6a 100644
--- a/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ProbingViewModel.cs	
@@ -1,7 +1,7 @@
 /*
  * ProbingViewModel.cs - part of CNC Probing library
  *
- * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -43,6 +43,8 @@ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
 using System.Collections.ObjectModel;
 using CNC.Core;
 using CNC.GCode;
+using System.Diagnostics;
+using System.Windows;
 
 namespace CNC.Controls.Probing
 {
@@ -52,12 +54,29 @@ class Probing
         public static string Command = "G38.3";
     }
 
+    public class Measurement : ViewModelBase
+    {
+        public void Add(Position position, AxisFlags axisFlags, ProbingType probingType)
+        {
+            Position = position;
+            AxisFlags = axisFlags;
+            ProbingType = probingType;
+
+            OnPropertyChanged();
+        }
+
+        public Position Position { get; private set; } = new Position();
+        public ProbingType ProbingType { get; private set; } = ProbingType.None;
+        public AxisFlags AxisFlags { get; private set; } = AxisFlags.None;
+    }
+
     public class ProbingViewModel : ViewModelBase
     {
         public enum CoordMode
         {
             G10 = 0,
-            G92
+            G92,
+            Measure
         }
 
         private string _message = string.Empty, _tool = string.Empty, _instructions = string.Empty, _position = string.Empty, _probeProgram = string.Empty;
@@ -73,7 +92,7 @@ public enum CoordMode
         private bool _canProbe = false, _isComplete = false, _isSuccess = false, _probeZ = false, _useFixture = false;
         private bool _hasToolTable = false, _hasCs9 = false, _addAction = false, _isPaused = false, _isCorner = false;
         private bool isCancelled = false, wasZselected = false, _referenceToolOffset = true, _workpieceLockXY = true;
-        private bool _enablePreview = false, _canApplyTransform = false;
+        private bool _enablePreview = false, _canApplyTransform = false, _allowMeasure = false;
         private OriginControl.Origin _origin = OriginControl.Origin.None;
         private GrblViewModel _grblmodel = null;
         private List<string> _program = new List<string>();
@@ -101,6 +120,13 @@ public ProbingViewModel (GrblViewModel grblmodel, ProbingProfiles profile)
             Profile = profile.Profiles[0];
 
             HeightMap.PropertyChanged += HeightMap_PropertyChanged;
+            Measurement.PropertyChanged += Measurement_PropertyChanged;
+        }
+
+        private void Measurement_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            var m = sender as Measurement;
+            Grbl.ResponseLog.Add("Measured: " + (m.Position - Grbl.WorkPositionOffset).ToString(m.AxisFlags) + " " + m.ProbingType.ToString());
         }
 
         private void HeightMap_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -124,6 +150,23 @@ public void Cancel ()
         {
         }
 
+        public bool VerifyProbe ()
+        {
+            bool probeOk = ProbeVerified || Grbl.Signals.Value.HasFlag(Signals.Probe);
+
+            if (!probeOk)
+            {
+                new ProbeVerify(this).ShowDialog();
+                if (!ProbeVerified)
+                    ProbeVerified = MessageBox.Show(LibStrings.FindResource("NoVerifyContinue"), "ioSender", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) == MessageBoxResult.Yes;
+
+                if (ProbeVerified)
+                    Grbl.Message = LibStrings.FindResource("VerifyStart");
+            }
+
+            return probeOk;
+        }
+
         public bool WaitForResponse(string command)
         {
             bool? res = null;
@@ -151,42 +194,56 @@ public bool WaitForIdle(string command)
         {
             bool? res = null;
 
-            if (Grbl.ResponseLogVerbose)
-                Grbl.ResponseLog.Add(command);
-
-            new Thread(() =>
+            if (command != string.Empty)
             {
-                res = WaitFor.AckResponse<string>(
-                cancellationToken,
-                null,
-                a => Grbl.OnResponseReceived += a,
-                a => Grbl.OnResponseReceived -= a,
-                1000, () => Grbl.ExecuteCommand(command));
-            }).Start();
-
-            while (res == null)
-                EventUtils.DoEvents();
+                if (Grbl.ResponseLogVerbose)
+                    Grbl.ResponseLog.Add(command);
 
-            if (res == true)
-                res = null;
-
-            while (res == null)
-            {
                 new Thread(() =>
                 {
-                    res = WaitFor.SingleEvent<string>(
+                    res = WaitFor.AckResponse<string>(
                     cancellationToken,
                     null,
                     a => Grbl.OnResponseReceived += a,
                     a => Grbl.OnResponseReceived -= a,
-                    5000);
+                    1000, () => Grbl.ExecuteCommand(command));
                 }).Start();
 
                 while (res == null)
                     EventUtils.DoEvents();
+            }
+
+            if (Grbl.GrblState.State != GrblStates.Idle && Grbl.GrblState.State != GrblStates.Alarm)
+            {
+                Stopwatch timer = new Stopwatch();
+                timer.Start();
 
-                if (Grbl.GrblState.State != GrblStates.Idle)
+                if (res == true)
                     res = null;
+
+                while (res == null)
+                {
+                    new Thread(() =>
+                    {
+                        res = WaitFor.SingleEvent<string>(
+                        cancellationToken,
+                        null,
+                        a => Grbl.OnResponseReceived += a,
+                        a => Grbl.OnResponseReceived -= a,
+                        5000);
+                    }).Start();
+
+                    while (res == null)
+                        EventUtils.DoEvents();
+
+                    if (timer.Elapsed.Seconds > 120)
+                        break;
+
+                    if (Grbl.GrblState.State != GrblStates.Idle)
+                        res = null;
+                }
+
+                timer.Stop();
             }
 
             return res == true;
@@ -354,6 +411,7 @@ public ProbingType ProbingType
                 OnPropertyChanged(nameof(TouchPlateHeightEnable));
             }
         }
+        public bool ProbeVerified { get; set; } = false;
         public string FastProbe { get { return string.Format(Probing.Command + "F{0}", ProbeFeedRate.ToInvariantString()); } }
         public string SlowProbe { get { return string.Format(Probing.Command + "F{0}", LatchFeedRate.ToInvariantString()); } }
         public string Instructions { get { return _instructions; } set { _instructions = value; OnPropertyChanged(); } }
@@ -431,6 +489,8 @@ public bool HeightMapApplied
         public bool FixtureHeightEnable { get { return _probingType == ProbingType.ToolLength && _useFixture /*&& !ReferenceToolOffset && !Grbl.IsTloReferenceSet*/; } }
         public bool TouchPlateHeightEnable { get { return _probingType == ProbingType.ToolLength ? !_useFixture : (_probingType == ProbingType.EdgeFinderExternal || _probingType == ProbingType.EdgeFinderInternal ? _probeZ : _probingType == ProbingType.HeightMap); } }
         public bool CanApplyTransform { get { return _canApplyTransform; } set { _canApplyTransform = value; OnPropertyChanged(); } }
+        public bool AllowMeasure { get { return _allowMeasure; } set { _allowMeasure = value; OnPropertyChanged(); } }
+        public Measurement Measurement { get; private set; } = new Measurement();
 
         public string Message
         {
diff --git a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs
index b7bfb99..ab7fd47 100644
--- a/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/Properties/AssemblyInfo.cs	
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.38.0")]
-[assembly: AssemblyFileVersion("2.0.38.0")]
+[assembly: AssemblyVersion("2.0.41.0")]
+[assembly: AssemblyFileVersion("2.0.41.0")]
diff --git a/CNC Controls Probing/CNC Controls Probing/Resources/App.ico b/CNC Controls Probing/CNC Controls Probing/Resources/App.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5285f06f14af15fe1c146a7fdfc051d85fc8e4c5
GIT binary patch
literal 7406
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

literal 0
HcmV?d00001

diff --git a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs
index b56929a..496e87d 100644
--- a/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/RotationControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * RotationControl.xaml.cs - part of CNC Probing library
  *
- * v0.38 / 2022-05-01 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -100,6 +100,9 @@ public void Start(bool preview = false)
                 return;
             }
 
+            if (!probing.VerifyProbe())
+                return;
+
             if (!probing.Program.Init())
                 return;
 
diff --git a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs
index 69d0206..3fbbdff 100644
--- a/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
+++ b/CNC Controls Probing/CNC Controls Probing/ToolLengthControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * ToolLengthControl.cs - part of CNC Probing library
  *
- * v0.37 / 2022-02-21 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-13 / Io Engineering (Terje Io)
  *
  */
 
@@ -81,6 +81,9 @@ public void Start(bool preview = false)
                 return;
             }
 
+            if (!probing.VerifyProbe())
+                return;
+
             if (!probing.Program.Init(AppConfig.Settings.Probing.CheckProbeStatus || !probing.ProbeFixture))
                 return;
 
diff --git a/CNC Controls/CNC Controls/About.xaml b/CNC Controls/CNC Controls/About.xaml
index ac09085..e9d6830 100644
--- a/CNC Controls/CNC Controls/About.xaml	
+++ b/CNC Controls/CNC Controls/About.xaml	
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CNC.Controls"
         mc:Ignorable="d"
-        x:Uid="dlg_about" Title="About" Height="350" Width="350" ResizeMode="NoResize" ShowInTaskbar="False"
+        x:Uid="dlg_about" Title="About" Height="350" Width="450" ResizeMode="NoResize" ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner"
         Loaded="About_Load" Icon="App.ico">
     <Window.Resources>
@@ -17,14 +17,14 @@
             <RowDefinition Height="250"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <Label x:Name="copyright" Content="©2015-2021 Io Engineering (Terje Io)" HorizontalAlignment="Left" Margin="10,0" VerticalAlignment="Top"/>
+        <Label x:Name="copyright" Content="©2015-2022 Io Engineering (Terje Io)" HorizontalAlignment="Left" Margin="10,0" VerticalAlignment="Top"/>
         <GroupBox x:Name="grpGrbl" Header="grbl" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Top">
             <StackPanel Orientation="Vertical">
                 <Label x:Name="txtGrblVersion" Content="-" HorizontalAlignment="Left" Margin="10,0,5,0" VerticalAlignment="Bottom" Height="20" Padding="0"/>
                 <Label x:Name="txtGrblOptions" Content="-" HorizontalAlignment="Left" Margin="10,0" VerticalAlignment="Bottom" Height="20" Padding="0"/>
                 <Label x:Name="txtGrblNewOpts" Content="-" HorizontalAlignment="Left" Margin="10,0" VerticalAlignment="Bottom" Height="20" Padding="0"/>
                 <Label x:Name="txtGrblConnection" Content="-" HorizontalAlignment="Left" Margin="10,0" VerticalAlignment="Bottom" Height="20" Padding="0"/>
-                <TextBox IsReadOnly="True" HorizontalAlignment="Center" Height="145" Width="310" TextWrapping="Wrap" VerticalAlignment="Top"
+                <TextBox IsReadOnly="True" HorizontalAlignment="Center" Height="145" Width="410" TextWrapping="Wrap" VerticalAlignment="Top"
                      local:TextBoxUtilities.AlwaysScrollToEnd="True" FontSize="10" FontFamily="Verdana"
                      ScrollViewer.VerticalScrollBarVisibility="Auto">
                     <TextBox.Text>
diff --git a/CNC Controls/CNC Controls/AppConfig.cs b/CNC Controls/CNC Controls/AppConfig.cs
index 19dd085..13b2b2b 100644
--- a/CNC Controls/CNC Controls/AppConfig.cs	
+++ b/CNC Controls/CNC Controls/AppConfig.cs	
@@ -1,7 +1,7 @@
 /*
  * AppConfig.cs - part of CNC Controls library
  *
- * v0.38 / 2022-04-20 / Io Engineering (Terje Io)
+ * v0.41 / 2022-11-09 / Io Engineering (Terje Io)
  *
  */
 
@@ -97,8 +97,10 @@ public class LatheConfig : ViewModelBase
     public class ProbeConfig : ViewModelBase
     {
         private bool _CheckProbeStatus = true;
+        private bool _ValidateProbeConnected = false;
 
         public bool CheckProbeStatus { get { return _CheckProbeStatus; } set { _CheckProbeStatus = value; OnPropertyChanged(); } }
+        public bool ValidateProbeConnected { get { return _ValidateProbeConnected; } set { _ValidateProbeConnected = value; OnPropertyChanged(); } }
     }
 
     [Serializable]
@@ -363,17 +365,17 @@ private bool isComPort(string port)
             return !(port.ToLower().StartsWith("ws://") || char.IsDigit(port[0]));
         }
 
-        private void setPort(string port)
+        private void setPort(string port, string baud)
         {
-            if (!(port.ToLower().StartsWith("ws://") || char.IsDigit(port[0])) && port.IndexOf(':') == -1)
+            if (isComPort(port) && port.IndexOf(':') == -1)
             {
-                string prop = ":115200,N,8,1";
+                string prop = string.Format(":{0},N,8,1", string.IsNullOrEmpty(baud) ? "115200" : baud);
                 string[] values = port.Split('!');
                 if (isComPort(Base.PortParams))
                 {
                     var props = Base.PortParams.Substring(Base.PortParams.IndexOf(':')).Split(',');
                     if(props.Length >= 4)
-                        prop = string.Format("{0},{1},{2},{3}", props[0], props[1], props[2], props[3]);
+                        prop = string.Format(":{0},{1},{2},{3}", (string.IsNullOrEmpty(baud) ? props[0] : baud), props[1], props[2], props[3]);
                 }
                 port = values[0] + prop + (values.Length > 1 ? ",," + values[1] : "");
             }
@@ -385,7 +387,7 @@ public int SetupAndOpen(string appname, GrblViewModel model, System.Windows.Thre
             int status = 0;
             bool selectPort = false;
             int jogMode = -1;
-            string port = string.Empty;
+            string port = string.Empty, baud = string.Empty;
 
             CNC.Core.Resources.Path = AppDomain.CurrentDomain.BaseDirectory;
 
@@ -415,6 +417,10 @@ public int SetupAndOpen(string appname, GrblViewModel model, System.Windows.Thre
                         port = GetArg(args, p++);
                         break;
 
+                    case "-baud":
+                        baud = GetArg(args, p++);
+                        break;
+
                     case "-selectport":
                         selectPort = true;
                         break;
@@ -457,7 +463,7 @@ public int SetupAndOpen(string appname, GrblViewModel model, System.Windows.Thre
             if (!selectPort)
             {
                 if (!string.IsNullOrEmpty(port))
-                    setPort(port);
+                    setPort(port, baud);
 #if USEWEBSOCKET
                 if (Base.PortParams.ToLower().StartsWith("ws://"))
                     new WebsocketStream(Base.PortParams, dispatcher);
@@ -483,7 +489,7 @@ public int SetupAndOpen(string appname, GrblViewModel model, System.Windows.Thre
 
                 else
                 {
-                    setPort(port);
+                    setPort(port, string.Empty);
 #if USEWEBSOCKET
                     if (port.ToLower().StartsWith("ws://"))
                         new WebsocketStream(Base.PortParams, dispatcher);
diff --git a/CNC Controls/CNC Controls/Converters.cs b/CNC Controls/CNC Controls/Converters.cs
index e0f868b..5239352 100644
--- a/CNC Controls/CNC Controls/Converters.cs	
+++ b/CNC Controls/CNC Controls/Converters.cs	
@@ -1,13 +1,13 @@
 /*
  * Converters.cs - part of CNC Controls library for Grbl
  *
- * v0.39 / 2022-06-24 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-24 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -75,6 +75,8 @@ public static class Converters
         public static MultiLineConverter MultiLineConverter = new MultiLineConverter();
         public static PositionToStringConverter PositionToStringConverter = new PositionToStringConverter();
         public static FeedSpeedToStringConverter FeedSpeedToStringConverter = new FeedSpeedToStringConverter();
+        public static AxisLetterToJogPlusConverter AxisLetterToJogPlusConverter = new AxisLetterToJogPlusConverter();
+        public static AxisLetterToJogMinusConverter AxisLetterToJogMinusConverter = new AxisLetterToJogMinusConverter();
 
         internal static string numBlocks = LibStrings.FindResource("NumBlocks");
         internal static string blockOfBlocks = LibStrings.FindResource("BlockOfBlocks");
@@ -140,6 +142,41 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         }
     }
 
+    public class AxisLetterToJogPlusConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            string result = string.Empty;
+
+            if (value is string)
+                result = (string)value + "+";
+
+            return result;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+    public class AxisLetterToJogMinusConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            string result = string.Empty;
+
+            if (value is string)
+                result = (string)value + "-";
+
+            return result;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
     public class BlocksToStringConverter : IMultiValueConverter
     {
         public object Convert(object[] value, Type targetType, object parameter, CultureInfo culture)
@@ -189,6 +226,42 @@ public object Convert(object[] value, Type targetType, object parameter, Culture
                                              (value[0] as Position).C.ToInvariantString(format));
                     break;
 
+                case 7:
+                    res = string.Format(GrblInfo.PositionFormatString,
+                                        (value[0] as Position).X.ToInvariantString(format),
+                                         (value[0] as Position).Y.ToInvariantString(format),
+                                          (value[0] as Position).Z.ToInvariantString(format),
+                                           (value[0] as Position).A.ToInvariantString(format),
+                                            (value[0] as Position).B.ToInvariantString(format),
+                                             (value[0] as Position).C.ToInvariantString(format),
+                                              (value[0] as Position).U.ToInvariantString(format));
+                    break;
+
+                case 8:
+                    res = string.Format(GrblInfo.PositionFormatString,
+                                        (value[0] as Position).X.ToInvariantString(format),
+                                         (value[0] as Position).Y.ToInvariantString(format),
+                                          (value[0] as Position).Z.ToInvariantString(format),
+                                           (value[0] as Position).A.ToInvariantString(format),
+                                            (value[0] as Position).B.ToInvariantString(format),
+                                             (value[0] as Position).C.ToInvariantString(format),
+                                              (value[0] as Position).U.ToInvariantString(format),
+                                               (value[0] as Position).V.ToInvariantString(format));
+                    break;
+
+                case 9:
+                    res = string.Format(GrblInfo.PositionFormatString,
+                                        (value[0] as Position).X.ToInvariantString(format),
+                                         (value[0] as Position).Y.ToInvariantString(format),
+                                          (value[0] as Position).Z.ToInvariantString(format),
+                                           (value[0] as Position).A.ToInvariantString(format),
+                                            (value[0] as Position).B.ToInvariantString(format),
+                                             (value[0] as Position).C.ToInvariantString(format),
+                                              (value[0] as Position).U.ToInvariantString(format),
+                                               (value[0] as Position).V.ToInvariantString(format),
+                                                (value[0] as Position).W.ToInvariantString(format));
+                    break;
+
                 default:
                     res = string.Format(GrblInfo.PositionFormatString,
                                         (value[0] as Position).X.ToInvariantString(format),
diff --git a/CNC Controls/CNC Controls/DROBaseControl.xaml b/CNC Controls/CNC Controls/DROBaseControl.xaml
index 6e81cdc..d2709a7 100644
--- a/CNC Controls/CNC Controls/DROBaseControl.xaml	
+++ b/CNC Controls/CNC Controls/DROBaseControl.xaml	
@@ -10,7 +10,7 @@
         <local:LogicalNotConverter x:Key="BooleanConverter" />
     </UserControl.Resources>
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Height="33" VerticalAlignment="Top" Width="193" RenderTransformOrigin="0.425,0">
-        <Label x:Name="lblAxis" Content="{Binding Label, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Margin="3,0,3,0" Width="26" FontSize="20"/>
+        <Label x:Name="lblAxis" Content="{Binding Label, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" Margin="3,0,3,0" Width="30" FontSize="20"/>
         <local:NumericTextBox x:Name="txtReadout" Format="{Binding Path=FormatSigned}" Value="{Binding Path=Value, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}" IsReadOnly="True" Background="#FFF8F8F8" Height="29" Width="103" TextWrapping="NoWrap" TextAlignment="Right" FontSize="20"/>
         <Button x:Name="btnZero" Content="0" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" Focusable="False" Margin="3,0,3,0" Height="29" Width="29" Click="btnZero_Click"/>
         <Button x:Name="btnScaled" Height="29" Focusable="False" Width="10" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"/>
diff --git a/CNC Controls/CNC Controls/DROControl.xaml b/CNC Controls/CNC Controls/DROControl.xaml
index 3523467..840cb84 100644
--- a/CNC Controls/CNC Controls/DROControl.xaml	
+++ b/CNC Controls/CNC Controls/DROControl.xaml	
@@ -35,18 +35,30 @@
                 Value="{Binding Path=Position.Z, Mode=TwoWay}"
                 IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)Z], Mode=OneWay}"
             />
-            <local:DROBaseControl x:Name="axisA" Label="A" Style="{StaticResource AAxisVisibleStyle}"
+            <local:DROBaseControl x:Name="axisA" Label="{Binding Path=AxisLetter.A, Mode=OneWay}" Style="{StaticResource AAxisVisibleStyle}"
                 Value="{Binding Path=Position.A, Mode=TwoWay}"
                 IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)A], Mode=OneWay}"
             />
-            <local:DROBaseControl x:Name="axisB" Label="B" Style="{StaticResource BAxisVisibleStyle}"
+            <local:DROBaseControl x:Name="axisB" Label="{Binding Path=AxisLetter.B, Mode=OneWay}" Style="{StaticResource BAxisVisibleStyle}"
                 Value="{Binding Path=Position.B, Mode=TwoWay}"
                 IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)B], Mode=OneWay}"
             />
-            <local:DROBaseControl x:Name="axisC" Label="C" Style="{StaticResource CAxisVisibleStyle}"
+            <local:DROBaseControl x:Name="axisC" Label="{Binding Path=AxisLetter.C, Mode=OneWay}" Style="{StaticResource CAxisVisibleStyle}"
                 Value="{Binding Path=Position.C, Mode=TwoWay}"
                 IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)C], Mode=OneWay}"
             />
+            <local:DROBaseControl x:Name="axisU" Label="U" Style="{StaticResource UAxisVisibleStyle}"
+                Value="{Binding Path=Position.U, Mode=TwoWay}"
+                IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)U], Mode=OneWay}"
+            />
+            <local:DROBaseControl x:Name="axisV" Label="V" Style="{StaticResource VAxisVisibleStyle}"
+                Value="{Binding Path=Position.V, Mode=TwoWay}"
+                IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)V], Mode=OneWay}"
+            />
+            <local:DROBaseControl x:Name="axisW" Label="W" Style="{StaticResource WAxisVisibleStyle}"
+                Value="{Binding Path=Position.W, Mode=TwoWay}"
+                IsScaled="{Binding Path=AxisScaled[(gcode:AxisFlags)W], Mode=OneWay}"
+            />
             <Button x:Uid="btn_zeroAll" x:Name="btnZeroAll" Content="Zero all" IsEnabled="{Binding Path=IsJobRunning, Converter={StaticResource BooleanConverter}}" Focusable="False" Height="28" Width="180" HorizontalAlignment="Center" Margin="2,3" Click="btnZeroAll_Click"/>
         </StackPanel>
     </GroupBox>
diff --git a/CNC Controls/CNC Controls/DROControl.xaml.cs b/CNC Controls/CNC Controls/DROControl.xaml.cs
index da8acec..e4631d6 100644
--- a/CNC Controls/CNC Controls/DROControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/DROControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * DROControl.xaml.cs - part of CNC Controls library
  *
- * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-25 / Io Engineering (Terje Io)
  *
  */
 
@@ -65,7 +65,6 @@ public DROControl()
 
             foreach (DROBaseControl axis in UIUtils.FindLogicalChildren<DROBaseControl>(this))
             {
-                axis.Tag = GrblInfo.AxisLetterToIndex(axis.Label);
                 axis.txtReadout.GotFocus += TxtReadout_GotFocus;
                 axis.txtReadout.LostFocus += txtPos_LostFocus;
                 axis.txtReadout.PreviewKeyUp += txtPos_KeyPress;
@@ -99,6 +98,9 @@ private void DRO_Loaded(object sender, RoutedEventArgs e)
                 if (GrblInfo.AxisFlags.HasFlag(AxisFlags.C))
                     keyboard.AddHandler(Key.C, ModifierKeys.Control | ModifierKeys.Shift, ZeroC);
                 keyboard.AddHandler(Key.D0, ModifierKeys.Control | ModifierKeys.Shift, ZeroAxes);
+
+                foreach (DROBaseControl axis in UIUtils.FindLogicalChildren<DROBaseControl>(this))
+                    axis.Tag = GrblInfo.AxisLetterToIndex(axis.Label);
             }
         }
 
@@ -190,19 +192,19 @@ private bool ZeroZ(Key key)
         }
         private bool ZeroA(Key key)
         {
-            AxisPositionChanged("A", 0d);
+            AxisPositionChanged(GrblInfo.AxisIndexToLetter(3), 0d);
 
             return true;
         }
         private bool ZeroB(Key key)
         {
-            AxisPositionChanged("B", 0d);
+            AxisPositionChanged(GrblInfo.AxisIndexToLetter(4), 0d);
 
             return true;
         }
         private bool ZeroC(Key key)
         {
-            AxisPositionChanged("C", 0d);
+            AxisPositionChanged(GrblInfo.AxisIndexToLetter(5), 0d);
 
             return true;
         }
diff --git a/CNC Controls/CNC Controls/GCode.cs b/CNC Controls/CNC Controls/GCode.cs
index a3d380e..b6c2f1e 100644
--- a/CNC Controls/CNC Controls/GCode.cs	
+++ b/CNC Controls/CNC Controls/GCode.cs	
@@ -1,7 +1,7 @@
 /*
  * GCode.cs - part of CNC Controls library for Grbl
  *
- * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
+ * v0.41 / 2022-07-19 / Io Engineering (Terje Io)
  *
  */
 
@@ -57,6 +57,7 @@ private struct GCodeConverter
         {
             public Type Type;
             public string FileType;
+            public string FileExtensions;
         }
         private struct GCodeTransformer
         {
@@ -65,7 +66,6 @@ private struct GCodeTransformer
         }
 
         public const string FileTypes = "cnc,nc,ncc,ngc,gcode,tap";
-        private string conversionTypes = string.Empty;
 
         private GCodeJob Program { get; set; } = new GCodeJob();
         private List<GCodeConverter> Converters = new List<GCodeConverter>();
@@ -118,18 +118,24 @@ private void Program_FileChanged(string filename)
 
         public GrblViewModel Model { get; set; }
 
-        public bool AddConverter(Type converter, string filetype)
+        public bool AddConverter(Type converter, string filetype, string fileextensions)
         {
             bool ok = converter.GetInterface("CNC.Controls.IGCodeConverter") != null;
             if (ok)
-            {
-                Converters.Add(new GCodeConverter { Type = converter, FileType = "." + filetype });
-                conversionTypes += (conversionTypes == string.Empty ? "" : ",") + filetype;
-            }
+                Converters.Add(new GCodeConverter { Type = converter, FileType = filetype, FileExtensions = fileextensions });
 
             return ok;
         }
 
+        private string getConversionTypes ()
+        {
+            string types = string.Empty;
+            foreach (var converter in Converters)
+                types += (types == string.Empty ? "" : ",") + converter.FileExtensions;
+
+            return types;
+        }
+
         public bool AddTransformer(Type converter, string name, ObservableCollection<MenuItem> menu)
         {
             bool ok = converter.GetInterface("CNC.Controls.IGCodeTransformer") != null;
@@ -197,7 +203,7 @@ public void Drag(object sender, DragEventArgs e)
             if (allow && e.Data.GetDataPresent(DataFormats.FileDrop))
             {
                 string[] files = (string[])e.Data.GetData(DataFormats.FileDrop, false);
-                allow = files.Count() == 1 && FileUtils.IsAllowedFile(files[0].ToLower(), FileTypes + (conversionTypes == string.Empty ? "" : "," + conversionTypes) + ",txt");
+                allow = files.Count() == 1 && FileUtils.IsAllowedFile(files[0].ToLower(), FileTypes + (getConversionTypes() == string.Empty ? "" : "," + getConversionTypes()) + ",txt");
             }
 
             e.Handled = true;
@@ -225,7 +231,10 @@ public void Open()
             string filename = string.Empty;
             OpenFileDialog file = new OpenFileDialog();
 
-            string conversionFilter = conversionTypes == string.Empty ? string.Empty : string.Format("Other files ({0})|{0}|", FileUtils.ExtensionsToFilter(conversionTypes));
+            string conversionFilter = string.Empty; //conversionTypes == string.Empty ? string.Empty : string.Format("Other files ({0})|{0}|", FileUtils.ExtensionsToFilter(conversionTypes));
+
+            foreach (var converter in Converters)
+                conversionFilter += string.Format("{0} ({1})|{1}|", converter.FileType, FileUtils.ExtensionsToFilter(converter.FileExtensions));
 
             file.Filter = string.Format("GCode files ({0})|{0}|{1}Text files (*.txt)|*.txt|All files (*.*)|*.*", FileUtils.ExtensionsToFilter(FileTypes), conversionFilter);
 
@@ -244,11 +253,15 @@ public void Load(string filename)
         {
             foreach (var converter in Converters)
             {
-                if (filename.EndsWith(converter.FileType))
-                {
-                    var loader = (IGCodeConverter)Activator.CreateInstance(converter.Type);
-                    loader.LoadFile(File, filename);
-                    return;
+                var filetypes = converter.FileExtensions.Split(',');
+
+                foreach (var filetype in filetypes) {
+                    if (filename.EndsWith(filetype))
+                    {
+                        var loader = (IGCodeConverter)Activator.CreateInstance(converter.Type);
+                        loader.LoadFile(File, filename);
+                        return;
+                    }
                 }
             }
 
diff --git a/CNC Controls/CNC Controls/IGCodeConverter.cs b/CNC Controls/CNC Controls/IGCodeConverter.cs
index 156e25e..06e8998 100644
--- a/CNC Controls/CNC Controls/IGCodeConverter.cs	
+++ b/CNC Controls/CNC Controls/IGCodeConverter.cs	
@@ -1,13 +1,13 @@
 /*
  * IGCodeConverter.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.15 / 2020-04-08 / Io Engineering (Terje Io)
+ * v0.41 / 2022-07-19 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2020, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -42,6 +42,7 @@ namespace CNC.Controls
     public interface IGCodeConverter
     {
         string FileType { get; }
+        string FileExtensions { get; }
         bool LoadFile(CNC.Controls.GCode job, string filename);
     }
 }
diff --git a/CNC Controls/CNC Controls/JobControl.xaml.cs b/CNC Controls/CNC Controls/JobControl.xaml.cs
index dfc97e4..a338d05 100644
--- a/CNC Controls/CNC Controls/JobControl.xaml.cs	
+++ b/CNC Controls/CNC Controls/JobControl.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * JobControl.xaml.cs - part of CNC Controls library for Grbl
  *
- * v0.37 / 2022-02-27 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-06 / Io Engineering (Terje Io)
  *
  */
 
@@ -247,8 +247,8 @@ private void OnDataContextPropertyChanged(object sender, PropertyChangedEventArg
                         streamingHandler.Call(model.IsSDCardJob ? StreamingState.JobFinished : StreamingState.NoFile, model.IsSDCardJob);
                     else if(JobTimer.IsRunning && !job.Complete)
                         streamingHandler.Call(StreamingState.JobFinished, true);
-                        if (!model.IsParserStateLive)
-                            SendCommand(GrblConstants.CMD_GETPARSERSTATE);
+                    if (!model.IsParserStateLive)
+                        SendCommand(GrblConstants.CMD_GETPARSERSTATE);
                     break;
 
                 case nameof(GrblViewModel.FileName):
@@ -297,6 +297,9 @@ public bool Activate(bool activate)
                 initOK = true;
                 serialSize = Math.Min(AppConfig.Settings.Base.MaxBufferSize, (int)(GrblInfo.SerialBufferSize * 0.9f)); // size should be less than hardware handshake HWM
                 GCode.File.Parser.Dialect = GrblInfo.IsGrblHAL ? Dialect.GrblHAL : Dialect.Grbl;
+
+                if(GrblInfo.HasRTC)
+                    SendCommand("$RTC=" + DateTime.Now.ToLocalTime().ToString("s"));
             }
 
             EnablePolling(activate);
diff --git a/CNC Controls/CNC Controls/JogBaseControl.xaml b/CNC Controls/CNC Controls/JogBaseControl.xaml
index 3a4b5ed..20a5390 100644
--- a/CNC Controls/CNC Controls/JogBaseControl.xaml	
+++ b/CNC Controls/CNC Controls/JogBaseControl.xaml	
@@ -20,6 +20,7 @@
                         <Setter Property="Width" Value="60"/>
                         <Setter Property="Height" Value="60"/>
                         <Setter Property="Focusable" Value="False"/>
+                        <Setter Property="Content" Value="xx"/>
                     </Style>
                 </ResourceDictionary>
                 <ResourceDictionary>
@@ -33,6 +34,8 @@
                     <local:LogicalNotConverter x:Key="LogicalNotConverter" />
                     <local:LogicalOrConverter x:Key="LogicalOrConverter"/>
                     <local:GrblStateToIsJoggingConverter x:Key ="IsJoggingConverter"/>
+                    <local:AxisLetterToJogPlusConverter x:Key="JogPlusConverter"/>
+                    <local:AxisLetterToJogMinusConverter x:Key="JogMinusConverter"/>
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -108,16 +111,28 @@
                 </StackPanel>
             </StackPanel>
             <StackPanel Style="{StaticResource AAxisVisibleStyle}" VerticalAlignment="Center" Margin="5,0,0,0">
-                <Button Content="A+" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
-                <Button Content="A-" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
+                <Button Content="{Binding Path=AxisLetter.A, Converter={StaticResource JogPlusConverter}, Mode=OneWay}" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
+                <Button Content="{Binding Path=AxisLetter.A, Converter={StaticResource JogMinusConverter}, Mode=OneWay}" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
             </StackPanel>
             <StackPanel Style="{StaticResource BAxisVisibleStyle}" VerticalAlignment="Center" Margin="5,0,0,0">
-                <Button Content="B+" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
-                <Button Content="B-" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
+                <Button Content="{Binding Path=AxisLetter.B, Converter={StaticResource JogPlusConverter}, Mode=OneWay}" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
+                <Button Content="{Binding Path=AxisLetter.B, Converter={StaticResource JogMinusConverter}, Mode=OneWay}" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
             </StackPanel>
             <StackPanel Style="{StaticResource CAxisVisibleStyle}" VerticalAlignment="Center" Margin="5,0,0,0">
-                <Button Content="C+" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
-                <Button Content="C-" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
+                <Button Content="{Binding Path=AxisLetter.C, Converter={StaticResource JogPlusConverter}, Mode=OneWay}" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
+                <Button Content="{Binding Path=AxisLetter.C, Converter={StaticResource JogMinusConverter}, Mode=OneWay}" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
+            </StackPanel>
+            <StackPanel Style="{StaticResource UAxisVisibleStyle}" VerticalAlignment="Center" Margin="5,0,0,0">
+                <Button Content="U+" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
+                <Button Content="U-" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
+            </StackPanel>
+            <StackPanel Style="{StaticResource VAxisVisibleStyle}" VerticalAlignment="Center" Margin="5,0,0,0">
+                <Button Content="V+" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
+                <Button Content="V-" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
+            </StackPanel>
+            <StackPanel Style="{StaticResource WAxisVisibleStyle}" VerticalAlignment="Center" Margin="5,0,0,0">
+                <Button Content="W+" Style="{StaticResource JogButtonStyle}" Click="Button_Click"/>
+                <Button Content="W-" Style="{StaticResource JogButtonStyle}" Margin="0,70,0,0" Click="Button_Click"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/CNC Controls/CNC Controls/LimitsBaseControl.xaml b/CNC Controls/CNC Controls/LimitsBaseControl.xaml
index 701c390..26f1797 100644
--- a/CNC Controls/CNC Controls/LimitsBaseControl.xaml	
+++ b/CNC Controls/CNC Controls/LimitsBaseControl.xaml	
@@ -7,7 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="26" d:DesignWidth="200">
     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Height="26" VerticalAlignment="Top" Width="200">
-        <Label x:Name="axis" Width="20" HorizontalContentAlignment="Right" Content="{Binding Label, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWay}"/>
+        <Label x:Name="axis" Width="24" HorizontalContentAlignment="Right" Content="{Binding Label, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWay}"/>
         <local:NumericTextBox x:Name="cvMin" Format="{Binding Path=Format, Mode=OneWay}" Value="{Binding Path=MinValue, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWay}" IsReadOnly="True" Focusable="False" Background="#FFF8F8F8"/>
         <Label Content="-"/>
         <local:NumericTextBox x:Name="cVMax" Format="{Binding Path=Format, Mode=OneWay}" Value="{Binding Path=MaxValue, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWay}" IsReadOnly="True" Focusable="False" Background="#FFF8F8F8"/>
diff --git a/CNC Controls/CNC Controls/LimitsControl.xaml b/CNC Controls/CNC Controls/LimitsControl.xaml
index 85a4504..b4b4230 100644
--- a/CNC Controls/CNC Controls/LimitsControl.xaml	
+++ b/CNC Controls/CNC Controls/LimitsControl.xaml	
@@ -23,15 +23,15 @@
                 MinValue="{Binding Path=ProgramLimits.MinZ, Mode=OneWay}"
                 MaxValue="{Binding Path=ProgramLimits.MaxZ, Mode=OneWay}"
             />
-            <local:LimitsBaseControl x:Name="axisA" Label="A" Style="{StaticResource AAxisVisibleStyle}"
+            <local:LimitsBaseControl x:Name="axisA" Label="{Binding Path=AxisLetter.A, Mode=OneWay}" Style="{StaticResource AAxisVisibleStyle}"
                 MinValue="{Binding Path=ProgramLimits.MinA, Mode=OneWay}"
                 MaxValue="{Binding Path=ProgramLimits.MaxA, Mode=OneWay}"
             />
-            <local:LimitsBaseControl x:Name="axisB" Label="B" Style="{StaticResource BAxisVisibleStyle}"
+            <local:LimitsBaseControl x:Name="axisB" Label="{Binding Path=AxisLetter.B, Mode=OneWay}" Style="{StaticResource BAxisVisibleStyle}"
                 MinValue="{Binding Path=ProgramLimits.MinB, Mode=OneWay}"
                 MaxValue="{Binding Path=ProgramLimits.MaxB, Mode=OneWay}"
             />
-            <local:LimitsBaseControl x:Name="axisC" Label="C" Style="{StaticResource CAxisVisibleStyle}"
+            <local:LimitsBaseControl x:Name="axisC" Label="{Binding Path=AxisLetter.C, Mode=OneWay}" Style="{StaticResource CAxisVisibleStyle}"
                 MinValue="{Binding Path=ProgramLimits.MinC, Mode=OneWay}"
                 MaxValue="{Binding Path=ProgramLimits.MaxC, Mode=OneWay}"
             />
diff --git a/CNC Controls/CNC Controls/NumericTextBox.cs b/CNC Controls/CNC Controls/NumericTextBox.cs
index 1448b20..f765904 100644
--- a/CNC Controls/CNC Controls/NumericTextBox.cs	
+++ b/CNC Controls/CNC Controls/NumericTextBox.cs	
@@ -1,7 +1,7 @@
 /*
  * NumericTextBox.cs - part of CNC Controls library
  *
- * v0.38 / 2022-06-13 / Io Engineering (Terje Io)
+ * v0.41 / 2022-08-11 / Io Engineering (Terje Io)
  *
  */
 
@@ -112,7 +112,7 @@ protected override void OnPreviewKeyUp(KeyEventArgs e)
                 string text = SelectionLength > 0 ? Text.Remove(SelectionStart, SelectionLength) : Text;
 
                 updateText = false;
-                Value = double.Parse(text == string.Empty || text == "." || text == "-" || text == "-." ? "0" : text, np.Styles, CultureInfo.InvariantCulture);
+                Value = double.Parse(text == string.Empty || text == "." ? "0" : (text == "-" || text == "-." ? "-0" : text), np.Styles, CultureInfo.InvariantCulture);
                 updateText = true;
             }
         }
@@ -125,7 +125,7 @@ protected override void OnPreviewTextInput(TextCompositionEventArgs e)
             if (!(e.Handled = !NumericProperties.IsStringNumeric(text, np)))
             {
                 updateText = false;
-                Value = double.Parse(text == "" || text == "." || text == "-" || text == "-." ? "0" : text, np.Styles, CultureInfo.InvariantCulture);
+                Value = double.Parse(text == "" || text == "." ? "0" : (text == "-" || text == "-." ? "-0" : text), np.Styles, CultureInfo.InvariantCulture);
                 updateText = true;
             }
 
@@ -146,6 +146,18 @@ protected override void OnTextChanged(TextChangedEventArgs e)
 
                 base.OnTextChanged(e);
             }
+            else if(Text == "" || Text == ".")
+            {
+                updateText = false;
+                Value = 0d;
+                updateText = true;
+            }
+            else if (Text == "-" || Text == "-.")
+            {
+                updateText = false;
+                Value = -0d;
+                updateText = true;
+            }
             else
                 Text = Math.Round(Value, (np.Precision)).ToString(np.DisplayFormat, CultureInfo.InvariantCulture);
         }
diff --git a/CNC Controls/CNC Controls/OffsetView.xaml b/CNC Controls/CNC Controls/OffsetView.xaml
index d793d12..c67304f 100644
--- a/CNC Controls/CNC Controls/OffsetView.xaml	
+++ b/CNC Controls/CNC Controls/OffsetView.xaml	
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:local="clr-namespace:CNC.Controls"
              xmlns:gcode="clr-namespace:CNC.GCode;assembly=CNC.Core"
              mc:Ignorable="d" 
@@ -15,6 +16,7 @@
                     <FrameworkElement x:Key="ProxyElement" DataContext="{Binding}"/>
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
+            <system:String x:Uid="lbl_axis" x:Key="AxisLabel">{0} axis:</system:String>
             <local:LogicalNotConverter x:Key="IsNotPredefined" />
         </ResourceDictionary>
     </UserControl.Resources>
@@ -53,7 +55,12 @@
                         </MultiBinding>
                     </DataGridTextColumn.Visibility>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="A" Binding="{Binding A}" Width="70">
+                <DataGridTextColumn Binding="{Binding A}" Width="70">
+                    <DataGridTextColumn.HeaderTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding DataContext.AxisLetter.A, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                        </DataTemplate>
+                    </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.Visibility>
                         <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
                             <Binding Source="{StaticResource ProxyElement}" Path="DataContext.AxisEnabledFlags" />
@@ -65,7 +72,12 @@
                         </MultiBinding>
                     </DataGridTextColumn.Visibility>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="B" Binding="{Binding B}" Width="70">
+                <DataGridTextColumn Binding="{Binding B}" Width="70">
+                    <DataGridTextColumn.HeaderTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding DataContext.AxisLetter.B, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                        </DataTemplate>
+                    </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.Visibility>
                         <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
                             <Binding Source="{StaticResource ProxyElement}" Path="DataContext.AxisEnabledFlags" />
@@ -77,7 +89,12 @@
                         </MultiBinding>
                     </DataGridTextColumn.Visibility>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="C" Binding="{Binding C}" Width="70">
+                <DataGridTextColumn Binding="{Binding C}" Width="70">
+                    <DataGridTextColumn.HeaderTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding DataContext.AxisLetter.C, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
+                        </DataTemplate>
+                    </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.Visibility>
                         <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
                             <Binding Source="{StaticResource ProxyElement}" Path="DataContext.AxisEnabledFlags" />
@@ -89,6 +106,42 @@
                         </MultiBinding>
                     </DataGridTextColumn.Visibility>
                 </DataGridTextColumn>
+                <DataGridTextColumn Header="U" Binding="{Binding U}" Width="70">
+                    <DataGridTextColumn.Visibility>
+                        <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
+                            <Binding Source="{StaticResource ProxyElement}" Path="DataContext.AxisEnabledFlags" />
+                            <Binding>
+                                <Binding.Source>
+                                    <gcode:AxisFlags>U</gcode:AxisFlags>
+                                </Binding.Source>
+                            </Binding>
+                        </MultiBinding>
+                    </DataGridTextColumn.Visibility>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="V" Binding="{Binding V}" Width="70">
+                    <DataGridTextColumn.Visibility>
+                        <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
+                            <Binding Source="{StaticResource ProxyElement}" Path="DataContext.AxisEnabledFlags" />
+                            <Binding>
+                                <Binding.Source>
+                                    <gcode:AxisFlags>V</gcode:AxisFlags>
+                                </Binding.Source>
+                            </Binding>
+                        </MultiBinding>
+                    </DataGridTextColumn.Visibility>
+                </DataGridTextColumn>
+                <DataGridTextColumn Header="W" Binding="{Binding W}" Width="70">
+                    <DataGridTextColumn.Visibility>
+                        <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
+                            <Binding Source="{StaticResource ProxyElement}" Path="DataContext.AxisEnabledFlags" />
+                            <Binding>
+                                <Binding.Source>
+                                    <gcode:AxisFlags>W</gcode:AxisFlags>
+                                </Binding.Source>
+                            </Binding>
+                        </MultiBinding>
+                    </DataGridTextColumn.Visibility>
+                </DataGridTextColumn>
             </DataGrid.Columns>
         </DataGrid>
         <StackPanel Grid.Column="1" HorizontalAlignment="Left" Margin="20,15,0,0" VerticalAlignment="Top">
@@ -96,30 +149,42 @@
                 <Label x:Uid="lbl_offset" Content="Offset:" HorizontalContentAlignment="Right" HorizontalAlignment="Right" Margin="29,0,0,0" VerticalAlignment="Top"/>
                 <TextBox Text="{Binding Path=Offset.Code, RelativeSource={RelativeSource AncestorType=UserControl}}" HorizontalAlignment="Left" Height="23" TextWrapping="NoWrap" VerticalAlignment="Top" Width="40" IsReadOnly="True"/>
             </StackPanel>
-            <local:CoordValueSetControl x:Uid="lbl_xAxis" x:Name="cvXOffset" Label="X axis:" Tag="X" Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Name="cvXOffset" Label="{Binding Path=AxisLetter.X, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="X" Click="cvOffset_Click"
                 Value="{Binding Path=Offset.X, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Uid="lbl_yAxis" x:Name="cvYOffset" Label="Y axis:" Tag="Y" Style="{StaticResource YAxisVisibleStyle}" Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Name="cvYOffset" Label="{Binding Path=AxisLetter.Y, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="Y" Style="{StaticResource YAxisVisibleStyle}" Click="cvOffset_Click"
                 Value="{Binding Path=Offset.Y, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Uid="lbl_zAxis" x:Name="cvZOffset" Label="Z axis:" Tag="Z"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Name="cvZOffset" Label="{Binding Path=AxisLetter.Z, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="Z"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.Z, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Uid="lbl_aAxis" x:Name="cvAOffset" Label="A axis:" Tag="A" Style="{StaticResource AAxisVisibleStyle}"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Name="cvAOffset" Label="{Binding Path=AxisLetter.A, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="{Binding Path=AxisLetter.A, Mode=OneWay}" Style="{StaticResource AAxisVisibleStyle}"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.A, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Uid="lbl_bAxis" x:Name="cvBOffset" Label="B axis:" Tag="B" Style="{StaticResource BAxisVisibleStyle}"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Name="cvBOffset" Label="{Binding Path=AxisLetter.B, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="{Binding Path=AxisLetter.B, Mode=OneWay}" Style="{StaticResource BAxisVisibleStyle}"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.B, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
-            <local:CoordValueSetControl x:Uid="lbl_cAxis" x:Name="cvCOffset" Label="C axis:" Tag="C" Style="{StaticResource CAxisVisibleStyle}"  Click="cvOffset_Click"
+            <local:CoordValueSetControl x:Name="cvCOffset" Label="{Binding Path=AxisLetter.C, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="{Binding Path=AxisLetter.C, Mode=OneWay}" Style="{StaticResource CAxisVisibleStyle}"  Click="cvOffset_Click"
                 Value="{Binding Path=Offset.C, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
                 IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
             />
+            <local:CoordValueSetControl x:Name="cvUOffset" Label="{Binding Path=AxisLetter.U, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="{Binding Path=AxisLetter.U, Mode=OneWay}" Style="{StaticResource UAxisVisibleStyle}"  Click="cvOffset_Click"
+                Value="{Binding Path=Offset.U, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
+                IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
+            />
+            <local:CoordValueSetControl x:Name="cvVOffset" Label="{Binding Path=AxisLetter.V, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="{Binding Path=AxisLetter.V, Mode=OneWay}" Style="{StaticResource VAxisVisibleStyle}"  Click="cvOffset_Click"
+                Value="{Binding Path=Offset.U, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
+                IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
+            />
+            <local:CoordValueSetControl x:Name="cvWOffset" Label="{Binding Path=AxisLetter.V, StringFormat={StaticResource AxisLabel}, Mode=OneWay}" Tag="{Binding Path=AxisLetter.W, Mode=OneWay}" Style="{StaticResource WAxisVisibleStyle}"  Click="cvOffset_Click"
+                Value="{Binding Path=Offset.W, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=TwoWay}"
+                IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}"
+            />
             <StackPanel Orientation="Horizontal" Height="28" Margin="0,5">
                 <Button x:Uid="btn_currPos" x:Name="btnCurrPos" Content="Get current position" Padding="5,0" IsEnabled="{Binding Path=IsPredefined, RelativeSource={RelativeSource AncestorType=UserControl}, Converter={StaticResource IsNotPredefined}}" Margin="3,0" Click="btnCurrPos_Click"/>
                 <Button x:Uid="btn_clear" x:Name="btnClear" Content="Clear all" Padding="5,0" IsEnabled="{Binding Path=CanEdit, RelativeSource={RelativeSource AncestorType=UserControl}}" Click="btnClearAll_Click"/>
diff --git a/CNC Controls/CNC Controls/PortDialog.xaml b/CNC Controls/CNC Controls/PortDialog.xaml
index d2db734..7682482 100644
--- a/CNC Controls/CNC Controls/PortDialog.xaml	
+++ b/CNC Controls/CNC Controls/PortDialog.xaml	
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:CNC.Controls"
         mc:Ignorable="d"
         x:Uid="dlg_connection"
-        Title="Sender connection" Height="195" Width="400" Icon="App.ico" ResizeMode="NoResize">
+        Title="Sender connection" Height="198" Width="400" Icon="App.ico" ResizeMode="NoResize">
     <Window.Resources>
         <Style x:Key="PortErrorStyle" TargetType="local:NumericTextBox">
             <Style.Triggers>
@@ -30,10 +30,10 @@
         </Style>
     </Window.Resources>
     <Grid Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}">
-        <TabControl x:Name="tab" Width="Auto" Height="120" Margin="5,0" VerticalAlignment="Top">
+        <TabControl x:Name="tab" Width="Auto" Height="125" Margin="5,0" VerticalAlignment="Top">
             <TabItem x:Uid="tab_serial" Header="Serial">
                 <StackPanel>
-                    <StackPanel Orientation="Horizontal" Margin="0,5">
+                    <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
                         <Label  x:Uid="lbl_serialPort" Content="Port:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80" VerticalAlignment="Center"/>
                         <ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="285"
                             DropDownOpened="CbxPorts_DropDownOpened"
@@ -43,7 +43,14 @@
                             SelectedValuePath="Name" 
                          />
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+                    <StackPanel Orientation="Horizontal" Margin="0,4,0,0">
+                        <Label  x:Uid="lbl_serialBaud" Content="Baud rate:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80" VerticalAlignment="Center"/>
+                        <ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="90"
+                            ItemsSource="{Binding Path=Com.Baud}"
+                            SelectedValue="{Binding Path=Com.SelectedBaud, Mode=TwoWay}"
+                         />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="0,4,0,0">
                         <Label x:Uid="lbl_onConnect" Content="On connect:" HorizontalAlignment="Left" HorizontalContentAlignment="Right" Width="80" VerticalAlignment="Center"/>
                         <ComboBox HorizontalAlignment="Left" VerticalAlignment="Center" Width="90"
                             ItemsSource="{Binding Path=Com.ConnectModes}"
diff --git a/CNC Controls/CNC Controls/PortDialog.xaml.cs b/CNC Controls/CNC Controls/PortDialog.xaml.cs
index 11cb2d6..8fe1d42 100644
--- a/CNC Controls/CNC Controls/PortDialog.xaml.cs	
+++ b/CNC Controls/CNC Controls/PortDialog.xaml.cs	
@@ -1,13 +1,13 @@
 /*
  * PortDialog.xaml.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-13 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-25 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2019-2021, Io Engineering (Terje Io)
+Copyright (c) 2019-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -99,6 +99,12 @@ public string ShowDialog(string orgport)
                     {
                         prop.Com.SelectedPort = portname;
                         string[] values = orgport.Split(':')[1].Split(',');
+
+                        if (!prop.Com.Baud.Contains(values[0]))
+                            prop.Com.Baud.Add(values[0]);
+
+                        prop.Com.SelectedBaud = values[0];
+
                         if (values.Length > 5)
                         {
                             Comms.ResetMode mode = Comms.ResetMode.None;
@@ -127,9 +133,9 @@ private void btnOk_Click(object sender, RoutedEventArgs e)
             }
             else if(prop.Com.Ports.Count > 0)
             {
-                port = prop.Com.SelectedPort;
+                port = prop.Com.SelectedPort + ":" + prop.Com.SelectedBaud + ",N,8,1";
                 if (prop.Com.SelectedMode.Mode != Comms.ResetMode.None)
-                    port += "!" + prop.Com.SelectedMode.Mode.ToString();
+                    port += ",," + prop.Com.SelectedMode.Mode.ToString();
             }
 
             Close();
diff --git a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs
index be094e3..4fba8b0 100644
--- a/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
+++ b/CNC Controls/CNC Controls/Properties/AssemblyInfo.cs	
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.40.0")]
-[assembly: AssemblyFileVersion("2.0.40.0")]
+[assembly: AssemblyVersion("2.0.41.0")]
+[assembly: AssemblyFileVersion("2.0.41.0")]
diff --git a/CNC Controls/CNC Controls/SharedStyles.xaml b/CNC Controls/CNC Controls/SharedStyles.xaml
index 9550c8e..3292637 100644
--- a/CNC Controls/CNC Controls/SharedStyles.xaml	
+++ b/CNC Controls/CNC Controls/SharedStyles.xaml	
@@ -85,4 +85,46 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <Style x:Key="UAxisVisibleStyle">
+        <Setter Property="Control.Visibility">
+            <Setter.Value>
+                <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
+                    <Binding Path="AxisEnabledFlags" />
+                    <Binding>
+                        <Binding.Source>
+                            <gcode:AxisFlags>U</gcode:AxisFlags>
+                        </Binding.Source>
+                    </Binding>
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="VAxisVisibleStyle">
+        <Setter Property="Control.Visibility">
+            <Setter.Value>
+                <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
+                    <Binding Path="AxisEnabledFlags" />
+                    <Binding>
+                        <Binding.Source>
+                            <gcode:AxisFlags>V</gcode:AxisFlags>
+                        </Binding.Source>
+                    </Binding>
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WAxisVisibleStyle">
+        <Setter Property="Control.Visibility">
+            <Setter.Value>
+                <MultiBinding Converter="{StaticResource IsAxisVisibleConverter}">
+                    <Binding Path="AxisEnabledFlags" />
+                    <Binding>
+                        <Binding.Source>
+                            <gcode:AxisFlags>W</gcode:AxisFlags>
+                        </Binding.Source>
+                    </Binding>
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/CNC Controls/CNC Controls/SignalsControl.xaml b/CNC Controls/CNC Controls/SignalsControl.xaml
index f4d3334..8d41755 100644
--- a/CNC Controls/CNC Controls/SignalsControl.xaml	
+++ b/CNC Controls/CNC Controls/SignalsControl.xaml	
@@ -99,9 +99,12 @@
                 <local:SignalControl Label="X" IsSet="{Binding Path=Signals[(core:Signals)LimitX], Mode=OneWay}"/>
                 <local:SignalControl Label="Y" IsSet="{Binding Path=Signals[(core:Signals)LimitY], Mode=OneWay}" Style="{StaticResource YAxisVisibleStyle}"/>
                 <local:SignalControl Label="Z" IsSet="{Binding Path=Signals[(core:Signals)LimitZ], Mode=OneWay}" Style="{StaticResource ZAxisVisibleStyle}"/>
-                <local:SignalControl Label="A" IsSet="{Binding Path=Signals[(core:Signals)LimitA], Mode=OneWay}" Style="{StaticResource AAxisVisibleStyle}"/>
-                <local:SignalControl Label="B" IsSet="{Binding Path=Signals[(core:Signals)LimitB], Mode=OneWay}" Style="{StaticResource BAxisVisibleStyle}"/>
-                <local:SignalControl Label="C" IsSet="{Binding Path=Signals[(core:Signals)LimitC], Mode=OneWay}" Style="{StaticResource CAxisVisibleStyle}"/>
+                <local:SignalControl Label="{Binding Path=AxisLetter.A, Mode=OneWay}" IsSet="{Binding Path=Signals[(core:Signals)LimitA], Mode=OneWay}" Style="{StaticResource AAxisVisibleStyle}"/>
+                <local:SignalControl Label="{Binding Path=AxisLetter.B, Mode=OneWay}" IsSet="{Binding Path=Signals[(core:Signals)LimitB], Mode=OneWay}" Style="{StaticResource BAxisVisibleStyle}"/>
+                <local:SignalControl Label="{Binding Path=AxisLetter.C, Mode=OneWay}" IsSet="{Binding Path=Signals[(core:Signals)LimitC], Mode=OneWay}" Style="{StaticResource CAxisVisibleStyle}"/>
+                <local:SignalControl Label="U" IsSet="{Binding Path=Signals[(core:Signals)LimitU], Mode=OneWay}" Style="{StaticResource UAxisVisibleStyle}"/>
+                <local:SignalControl Label="V" IsSet="{Binding Path=Signals[(core:Signals)LimitV], Mode=OneWay}" Style="{StaticResource VAxisVisibleStyle}"/>
+                <local:SignalControl Label="W" IsSet="{Binding Path=Signals[(core:Signals)LimitW], Mode=OneWay}" Style="{StaticResource WAxisVisibleStyle}"/>
             </StackPanel>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,3,0" VerticalAlignment="Center" DockPanel.Dock="Right">
                 <local:SignalControl x:Uid="lbl_signalMotorWarning" Label="W" ToolTip="Motor warning" IsSet="{Binding Path=Signals[(core:Signals)MotorWarning], Mode=OneWay}" Style="{StaticResource MotorWarningVisibleStyle}"/>
diff --git a/CNC Controls/CNC Controls/Widget.cs b/CNC Controls/CNC Controls/Widget.cs
index 90571fd..2ec235f 100644
--- a/CNC Controls/CNC Controls/Widget.cs	
+++ b/CNC Controls/CNC Controls/Widget.cs	
@@ -1,7 +1,7 @@
 /*
  * Widget.cs - part of CNC Controls library for Grbl
  *
- * v0.38 / 2022-03-21 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-23 / Io Engineering (Terje Io)
  *
  */
 
@@ -117,6 +117,18 @@ public class Widget : IDisposable
         public RadioButton wRadiobutton = null;
         private StackPanel Canvas;
 
+        private string AxisLabels ()
+        {
+            string labels = string.Empty;
+
+            for(int i = 0; i < GrblInfo.NumAxes; i++)
+            {
+                labels += (labels == string.Empty ? "" : ",") + GrblInfo.AxisIndexToLetter(i) + " axis";
+            }
+
+            return labels;
+        }
+
         public string BaseValue { get { return widget.Value; } }
 
         public Widget(GrblConfigView View, WidgetProperties widget, StackPanel Canvas)
@@ -152,7 +164,7 @@ public Widget(GrblConfigView View, WidgetProperties widget, StackPanel Canvas)
                 case GrblSettingDetails.DataTypes.AXISMASK:
                     has_unit = false;
                     bool axes = widget.DataType == GrblSettingDetails.DataTypes.AXISMASK || widget.Format == "axes";
-                    string[] format = (axes ? "X-Axis,Y-Axis,Z-Axis,A-Axis,B-Axis,C-Axis" : widget.Format).Split(',');
+                    string[] format = (axes ? AxisLabels() : widget.Format).Split(',');
                     for (int i = 0; i < (axes ? 6 : format.Length); i++)
                     {
                         if (axes && !GrblInfo.AxisFlags.HasFlag(GCodeParser.AxisFlag[i]))
diff --git a/CNC Converters/Excellon2GCode.cs b/CNC Converters/Excellon2GCode.cs
index b92b7e3..8c93f45 100644
--- a/CNC Converters/Excellon2GCode.cs	
+++ b/CNC Converters/Excellon2GCode.cs	
@@ -1,13 +1,13 @@
 /*
  * Excellon2GCode.cs - part of CNC Converters library
  *
- * v0.16 / 2020-04-11 / Io Engineering (Terje Io)
+ * v0.41 / 2022-07-19 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -68,7 +68,7 @@ internal enum Command
             G05
         }
 
-        private bool isDrillMode = false, isMetric = true;
+        private bool isDrillMode = true, isMetric = true;
         private bool? isHeader = null;
         private List<JobParametersViewModel.Tool> tools = new List<JobParametersViewModel.Tool>();
         private List<ExcellonCommand> commands = new List<ExcellonCommand>();
@@ -76,7 +76,8 @@ internal enum Command
         private Point3D lastPos = new Point3D();
         private JobParametersViewModel settings = new JobParametersViewModel();
 
-        public string FileType { get { return "drl"; } }
+        public string FileType { get { return "Excellon files"; } }
+        public string FileExtensions { get { return "drl,xln"; } }
 
         // M48 Start header
         // M71 metric
@@ -89,6 +90,7 @@ internal enum Command
         public bool LoadFile(CNC.Controls.GCode job, string filename)
         {
             bool ok = true, leadingZeros = false;
+            double scaleFactor = 0d;
             JobParametersViewModel.Tool tool = new JobParametersViewModel.Tool { Id = 0, Diameter = 0d };
 
             this.job = job;
@@ -117,26 +119,30 @@ public bool LoadFile(CNC.Controls.GCode job, string filename)
 
                         else if (isHeader == true)
                         {
-                            switch (s)
+                            var hdr = s.Split(',');
+
+                            switch (hdr[0])
                             {
                                 case "METRIC":
                                     isMetric = true;
-                                    leadingZeros = false;
-                                    break;
-
-                                case "METRIC,TZ":
-                                    isMetric = true;
-                                    leadingZeros = true;
+                                    leadingZeros = hdr.Length > 1 && hdr[1] == "TZ";
+                                    if (hdr.Length > 2)
+                                    {
+                                        var scale = hdr[2].Split('.');
+                                        if(scale.Length == 2)
+                                            scaleFactor = dbl.Parse("1" + scale[1]);
+                                    }
                                     break;
 
                                 case "INCH":
                                     isMetric = false;
-                                    leadingZeros = false;
-                                    break;
-
-                                case "INCH,TZ":
-                                    isMetric = false;
-                                    leadingZeros = true;
+                                    leadingZeros = hdr.Length > 1 && hdr[1] == "TZ";
+                                    if (hdr.Length > 2)
+                                    {
+                                        var scale = hdr[2].Split('.');
+                                        if (scale.Length == 2)
+                                            scaleFactor = dbl.Parse("1" + scale[1]);
+                                    }
                                     break;
 
                                 case "%":
@@ -177,7 +183,7 @@ public bool LoadFile(CNC.Controls.GCode job, string filename)
                                         int g85pos = s.IndexOf("G85");
                                         string args = g85pos >= 0 ? s.Substring(0, g85pos) : s;
                                         int ypos = args.IndexOf('Y');
-                                        double factor = leadingZeros ? (ypos == 8 ? 1000d : 10000d) : 1.0;
+                                        double factor = scaleFactor == 0d ? (leadingZeros ? (ypos == 8 ? 1000d : 10000d) : 1.0) : scaleFactor;
                                         var cmd = new ExcellonCommand();
                                         cmd.Command = g85pos >= 0 ? "Slot" : "Drill";
                                         cmd.tool = tool.Id;
diff --git a/CNC Converters/HpglToGCode.cs b/CNC Converters/HpglToGCode.cs
index 5f43454..17e2ec9 100644
--- a/CNC Converters/HpglToGCode.cs	
+++ b/CNC Converters/HpglToGCode.cs	
@@ -1,7 +1,7 @@
 /*
  * Hpgl2GCode.cs - part of CNC Converters library
  *
- * v0.16 / 2022-12-01 / Io Engineering (Terje Io)
+ * v0.41 / 2022-07-19 / Io Engineering (Terje Io)
  *
  */
 
@@ -97,7 +97,8 @@ public Vector(Vector v)
         bool isDown = false;
         Point3D offset = new Point3D(100000d, 100000d, 0d), pos = new Point3D();
 
-        public string FileType { get { return "plt"; } }
+        public string FileType { get { return "HPGL files"; } }
+        public string FileExtensions { get { return "plt"; } }
 
         private void toVectors (List<HPGLCommand> commands)
         {
diff --git a/CNC Converters/Properties/AssemblyInfo.cs b/CNC Converters/Properties/AssemblyInfo.cs
index 9b8b53d..64cf4ea 100644
--- a/CNC Converters/Properties/AssemblyInfo.cs	
+++ b/CNC Converters/Properties/AssemblyInfo.cs	
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.36.0")]
-[assembly: AssemblyFileVersion("2.0.36.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.0.41.0")]
+[assembly: AssemblyFileVersion("2.0.41.0")]
\ No newline at end of file
diff --git a/CNC Core/CNC Core/GCode.cs b/CNC Core/CNC Core/GCode.cs
index d6878fc..d9eb0e5 100644
--- a/CNC Core/CNC Core/GCode.cs	
+++ b/CNC Core/CNC Core/GCode.cs	
@@ -1,7 +1,7 @@
 /*
  * GCode.cs - part of CNC Controls library
  *
- * v0.40 / 2022-07-12 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-18 / Io Engineering (Terje Io)
  *
  */
 
@@ -63,6 +63,9 @@ public enum AxisFlags : int
         A = 1 << 3,
         B = 1 << 4,
         C = 1 << 5,
+        U = 1 << 6,
+        V = 1 << 7,
+        W = 1 << 8,
         XY = 0x03,
         XZ = 0x05,
         XYZ = 0x07,
@@ -411,6 +414,9 @@ public struct Point6D
         public double A;
         public double B;
         public double C;
+        public double U;
+        public double V;
+        public double W;
 
         public double this [int i]
         {
@@ -430,6 +436,12 @@ public double this [int i]
                         return B;
                     case 5:
                         return C;
+                    case 6:
+                        return U;
+                    case 7:
+                        return V;
+                    case 8:
+                        return W;
                     default:
                         throw new ArgumentException("zyz!", "index");
                 }
@@ -456,11 +468,20 @@ public double this [int i]
                     case 5:
                         C = value;
                         break;
+                    case 6:
+                        U = value;
+                        break;
+                    case 7:
+                        U = value;
+                        break;
+                    case 8:
+                        W = value;
+                        break;
                 }
             }
         }
 
-        public double[] Array  { get { return new[] { X, Y, Z, A, B, C }; } }
+        public double[] Array  { get { return new[] { X, Y, Z, A, B, C, U, V, W }; } }
 
         public Point3D Point3D { get { return new Point3D(X, Y, Z); } }
 
@@ -490,6 +511,15 @@ public void Set (double[] values, AxisFlags axisFlags, bool relative = false)
                     case 5:
                         C = values[5];
                         break;
+                    case 6:
+                        U = values[6];
+                        break;
+                    case 7:
+                        V = values[7];
+                        break;
+                    case 8:
+                        W = values[8];
+                        break;
                 }
             }
         }
@@ -518,6 +548,15 @@ public void Add(double[] values, AxisFlags axisFlags)
                     case 5:
                         C += values[5];
                         break;
+                    case 6:
+                        U += values[6];
+                        break;
+                    case 7:
+                        V += values[7];
+                        break;
+                    case 8:
+                        W += values[8];
+                        break;
                 }
             }
         }
diff --git a/CNC Core/CNC Core/GCodeJob.cs b/CNC Core/CNC Core/GCodeJob.cs
index 59f5898..2dce5c5 100644
--- a/CNC Core/CNC Core/GCodeJob.cs	
+++ b/CNC Core/CNC Core/GCodeJob.cs	
@@ -1,7 +1,7 @@
 /*
  * GCodeJob.cs - part of CNC Controls library
  *
- * v0.40 / 2022-07-12 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-23 / Io Engineering (Terje Io)
  *
  */
 
@@ -206,8 +206,8 @@ public void AddBlock(string block, Action action)
                         BoundingBox.AddBoundingBox((cmd.Token as GCCubicSpline).GetBoundingBox(emu.Plane, new double[] { cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
                     else if (cmd.Token is GCQuadraticSpline)
                         BoundingBox.AddBoundingBox((cmd.Token as GCQuadraticSpline).GetBoundingBox(emu.Plane, new double[] { cmd.Start.X, cmd.Start.Y, cmd.Start.Z }, emu.DistanceMode == DistanceMode.Incremental));
-                    else if (cmd.Token is GCAxisCommand6)
-                        BoundingBox.AddPoint(cmd.End, (cmd.Token as GCAxisCommand6).AxisFlags);
+                    else if (cmd.Token is GCAxisCommand9)
+                        BoundingBox.AddPoint(cmd.End, (cmd.Token as GCAxisCommand9).AxisFlags);
                 }
 
                 BoundingBox.Conclude();
@@ -299,6 +299,10 @@ private void MaxValues_PropertyChanged(object sender, PropertyChangedEventArgs e
         public double MinA { get { return MinValues[3]; } set { MinValues[3] = value; } }
         public double MinB { get { return MinValues[4]; } set { MinValues[4] = value; } }
         public double MinC { get { return MinValues[5]; } set { MinValues[5] = value; } }
+        public double MinU { get { return MinValues[6]; } set { MinValues[6] = value; } }
+        public double MinV { get { return MinValues[7]; } set { MinValues[7] = value; } }
+        public double MinW { get { return MinValues[8]; } set { MinValues[8] = value; } }
+
         public CoordinateValues<double> MaxValues { get; private set; } = new CoordinateValues<double>();
         public double MaxX { get { return MaxValues[0]; } set { MaxValues[0] = value; } }
         public double MaxY { get { return MaxValues[1]; } set { MaxValues[1] = value; } }
@@ -306,6 +310,9 @@ private void MaxValues_PropertyChanged(object sender, PropertyChangedEventArgs e
         public double MaxA { get { return MaxValues[3]; } set { MaxValues[3] = value; } }
         public double MaxB { get { return MaxValues[4]; } set { MaxValues[4] = value; } }
         public double MaxC { get { return MaxValues[5]; } set { MaxValues[5] = value; } }
+        public double MaxU { get { return MaxValues[6]; } set { MaxValues[6] = value; } }
+        public double MaxV { get { return MaxValues[7]; } set { MaxValues[7] = value; } }
+        public double MaxW { get { return MaxValues[8]; } set { MaxValues[8] = value; } }
 
         public double SizeX { get { return MaxX - MinX; } }
         public double SizeY { get { return MaxY - MinY; } }
@@ -417,4 +424,3 @@ public void AddBoundingBox(GcodeBoundingBox bbox)
         }
     }
 }
-
diff --git a/CNC Core/CNC Core/GCodeParser.cs b/CNC Core/CNC Core/GCodeParser.cs
index 162849f..5633b9a 100644
--- a/CNC Core/CNC Core/GCodeParser.cs	
+++ b/CNC Core/CNC Core/GCodeParser.cs	
@@ -1,7 +1,7 @@
 /*
  * GCodeParser.cs - part of CNC Controls library
  *
- * v0.40 / 2022-07-14 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-29 / Io Engineering (Terje Io)
  *
  */
 
@@ -74,7 +74,7 @@ internal class GCValues
             public double Q;
             public double R;
             public double S;
-            public double[] XYZ = new double[6];
+            public double[] XYZ = new double[9];
             public uint N;
             public int H;
             public int T;
@@ -86,6 +86,9 @@ internal class GCValues
             public double A { get { return XYZ[3]; } set { XYZ[3] = value; } }
             public double B { get { return XYZ[4]; } set { XYZ[4] = value; } }
             public double C { get { return XYZ[5]; } set { XYZ[5] = value; } }
+            public double U { get { return XYZ[6]; } set { XYZ[6] = value; } }
+            public double V { get { return XYZ[7]; } set { XYZ[7] = value; } }
+            public double W { get { return XYZ[8]; } set { XYZ[8] = value; } }
 
             public double I { get { return IJK[0]; } set { IJK[0] = value; } }
             public double J { get { return IJK[1]; } set { IJK[1] = value; } }
@@ -152,7 +155,10 @@ private enum WordFlags : int
             X = 1 << 18,
             Y = 1 << 19,
             Z = 1 << 20,
-            Q = 1 << 21
+            Q = 1 << 21,
+            U = 1 << 22,
+            V = 1 << 23,
+            W = 1 << 24
         }
 
         private enum AxisCommand
@@ -187,6 +193,7 @@ public StrReplace (int start, int end, string val)
         public event ToolChangedHandler ToolChanged = null;
 
         private bool motionModeChanged = false;
+        private bool remapU2A = false, remapV2B = false, remapW2C = false;
         private GCValues gcValues = new GCValues();
         private GCodeToken last_token = new GCodeToken();
         private NGCExpr ngcexpr;
@@ -238,6 +245,9 @@ public GCodeParser()
             IsScaled = motionModeChanged = false;
             Decimals = 3;
             zorg = feedRate = 0d;
+            remapU2A = !GrblInfo.AxisLetters.Contains('A');
+            remapV2B = !GrblInfo.AxisLetters.Contains('B');
+            remapW2C = !GrblInfo.AxisLetters.Contains('C');
         }
 
         private bool VerifyIgnore(string code, CommandIgnoreState state)
@@ -812,6 +822,8 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 break;
 
                             case 'S':
+                                if (GrblInfo.LightBurnCluster && block.Contains(':'))
+                                    pos = block.Length; // Skip rest of the block assuming there are no other commands present
                                 gcValues.S = value;
                                 wordFlag = WordFlags.S;
                                 break;
@@ -862,6 +874,51 @@ public bool ParseBlock(ref string line, bool quiet, out bool isComment)
                                 gcValues.C = Math.Round(value, Decimals);
                                 break;
 
+                            case 'U':
+                                if (remapU2A)
+                                {
+                                    wordFlag = WordFlags.A;
+                                    axisWords |= GCode.AxisFlags.A;
+                                    gcValues.A = Math.Round(value, Decimals);
+                                }
+                                else
+                                {
+                                    wordFlag = WordFlags.U;
+                                    axisWords |= GCode.AxisFlags.U;
+                                    gcValues.U = Math.Round(value, Decimals);
+                                }
+                                break;
+
+                            case 'V':
+                                if (remapV2B)
+                                {
+                                    wordFlag = WordFlags.B;
+                                    axisWords |= GCode.AxisFlags.B;
+                                    gcValues.B = Math.Round(value, Decimals);
+                                }
+                                else
+                                {
+                                    wordFlag = WordFlags.V;
+                                    axisWords |= GCode.AxisFlags.V;
+                                    gcValues.W = Math.Round(value, Decimals);
+                                }
+                                break;
+
+                            case 'W':
+                                if (remapW2C)
+                                {
+                                    wordFlag = WordFlags.C;
+                                    axisWords |= GCode.AxisFlags.C;
+                                    gcValues.C = Math.Round(value, Decimals);
+                                }
+                                else
+                                {
+                                    wordFlag = WordFlags.W;
+                                    axisWords |= GCode.AxisFlags.W;
+                                    gcValues.W = Math.Round(value, Decimals);
+                                }
+                                break;
+
                             default:
                                 throw new GCodeException(LibStrings.FindResource("ParserCmdUnknown"));
                         }
@@ -1986,19 +2043,19 @@ public GCAxisCommand3(Commands command, uint lnr, double[] values, AxisFlags axi
         }
     }
 
-    public class GCAxisCommand6 : GCodeToken
+    public class GCAxisCommand9 : GCodeToken
     {
-        public GCAxisCommand6()
+        public GCAxisCommand9()
         { }
 
-        public GCAxisCommand6(Commands command, uint lnr, double[] values, AxisFlags axisFlags) : base(command, lnr)
+        public GCAxisCommand9(Commands command, uint lnr, double[] values, AxisFlags axisFlags) : base(command, lnr)
         {
             Array.Copy(values, Values, values.Length); // Only copy for num axes?
             AxisFlags = axisFlags;
         }
 
         [XmlIgnore]
-        public double[] Values { get; set; } = new double[6];
+        public double[] Values { get; set; } = new double[9];
         public AxisFlags AxisFlags { get; set; }
         public double X { get { return Values[0]; } set { Values[0] = value; } }
         public double Y { get { return Values[1]; } set { Values[1] = value; } }
@@ -2006,6 +2063,9 @@ public GCAxisCommand6(Commands command, uint lnr, double[] values, AxisFlags axi
         public double A { get { return Values[3]; } set { Values[3] = value; } }
         public double B { get { return Values[4]; } set { Values[4] = value; } }
         public double C { get { return Values[5]; } set { Values[5] = value; } }
+        public double U { get { return Values[6]; } set { Values[6] = value; } }
+        public double V { get { return Values[7]; } set { Values[7] = value; } }
+        public double W { get { return Values[8]; } set { Values[8] = value; } }
 
         public new string ToString()
         {
@@ -2048,7 +2108,7 @@ public AxisCommand3IJK(Commands command, uint lnr, double[] values, AxisFlags ax
         }
     }
 
-    public class GCLinearMotion : GCAxisCommand6
+    public class GCLinearMotion : GCAxisCommand9
     {
         public GCLinearMotion()
         { }
@@ -2062,7 +2122,7 @@ public GCLinearMotion(Commands command, uint lnr, double[] values, AxisFlags axi
         }
     }
 
-    public class GCAbsLinearMotion : GCAxisCommand6
+    public class GCAbsLinearMotion : GCAxisCommand9
     {
         public GCAbsLinearMotion()
         { }
@@ -2854,7 +2914,7 @@ public double CalculateDOC(uint pass)
         }
     }
 
-    public class GCCoordinateSystem : GCAxisCommand6
+    public class GCCoordinateSystem : GCAxisCommand9
     {
         public GCCoordinateSystem()
         { }
@@ -2939,7 +2999,7 @@ public GCToolTable(Commands cmd, uint lnr, uint l, uint p, double r, double[] va
         }
     }
 
-    public class GCScaling : GCAxisCommand6
+    public class GCScaling : GCAxisCommand9
     {
         public GCScaling()
         { }
diff --git a/CNC Core/CNC Core/Grbl.cs b/CNC Core/CNC Core/Grbl.cs
index aed8365..adc5d7b 100644
--- a/CNC Core/CNC Core/Grbl.cs	
+++ b/CNC Core/CNC Core/Grbl.cs	
@@ -1,7 +1,7 @@
 /*
  * Grbl.cs - part of CNC Controls library
  *
- * v0.40 / 2022-07-16 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-29 / Io Engineering (Terje Io)
  *
  */
 
@@ -124,7 +124,6 @@ public const string
             FORMAT_METRIC = "###0.000",
             FORMAT_IMPERIAL = "##0.0000",
             NO_TOOL = "None",
-            SIGNALS = "XYZABCEPRDHSBTOW", // Keep in sync with Signals enum below!!
             THCSIGNALS = "AERTOVHDU"; // Keep in sync with THCSignals enum below!!
 
         public const int
@@ -303,7 +302,7 @@ public enum HomedState
     }
 
     [Flags]
-    public enum Signals : int // Keep in sync with SIGNALS constant above
+    public enum Signals : int // Keep in sync with GrblInfo.SignalLetters constant below
     {
         Off = 0,
         LimitX = 1 << 0,
@@ -312,16 +311,20 @@ public enum Signals : int // Keep in sync with SIGNALS constant above
         LimitA = 1 << 3,
         LimitB = 1 << 4,
         LimitC = 1 << 5,
-        EStop  = 1 << 6,
-        Probe  = 1 << 7,
-        Reset = 1 << 8,
-        SafetyDoor = 1 << 9,
-        Hold = 1 << 10,
-        CycleStart = 1 << 11,
-        BlockDelete = 1 << 12,
-        OptionalStop = 1 << 13,
-        ProbeDisconnected = 1 << 14,
-        MotorWarning = 1 << 15
+        LimitU = 1 << 6,
+        LimitV = 1 << 7,
+        LimitW = 1 << 8,
+        EStop = 1 << 9,
+        Probe  = 1 << 10,
+        Reset = 1 << 11,
+        SafetyDoor = 1 << 12,
+        Hold = 1 << 13,
+        CycleStart = 1 << 14,
+        BlockDelete = 1 << 15,
+        OptionalStop = 1 << 16,
+        ProbeDisconnected = 1 << 17,
+        MotorWarning = 1 << 18,
+        MotorFault = 1 << 19
     }
 
     [Flags]
@@ -489,9 +492,9 @@ public static bool WaitForWcoUpdate()
     public class CoordinateValues<T> : ViewModelBase
     {
         private bool _suspend = false;
-        private T[] arr = new T[6];
+        private T[] arr = new T[9];
 
-        public int Length { get { return 6; } }
+        public int Length { get { return 9; } }
         public bool SuspendNotifications
         {
             get { return _suspend; }
@@ -517,12 +520,60 @@ public T this[int i]
                 {
                     arr[i] = value;
                     if(!_suspend)
-                        OnPropertyChanged(GrblInfo.AxisIndexToLetter(i));
+                        OnPropertyChanged("XYZABCUVW".Substring(i, 1));
                 }
             }
         }
     }
 
+    public class AxisLetter : ViewModelBase
+    {
+        public AxisLetter()
+        {
+            Values.PropertyChanged += Values_PropertyChanged;
+
+            Remap(GrblInfo.AxisLetters);
+        }
+
+        private void Values_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(e.PropertyName);
+        }
+
+        public void Remap(string map)
+        {
+            int i;
+            for (i = 0; i < map.Length; i++)
+                Values[i] = map.Substring(i, 1);
+
+            for(; i < Values.Length; i++)
+                Values[i] = "-";
+        }
+
+        public string All
+        {
+            get
+            {
+                string all = string.Empty;
+                for (int i = 0; i < Values.Length; i++)
+                    all += Values[i];
+
+                return all;
+            }
+        }
+
+        public CoordinateValues<string> Values { get; private set; } = new CoordinateValues<string>();
+        public string X { get { return Values[0]; } set { Values[0] = value; } }
+        public string Y { get { return Values[1]; } set { Values[1] = value; } }
+        public string Z { get { return Values[2]; } set { Values[2] = value; } }
+        public string A { get { return Values[3]; } set { Values[3] = value; } }
+        public string B { get { return Values[4]; } set { Values[4] = value; } }
+        public string C { get { return Values[5]; } set { Values[5] = value; } }
+        public string U { get { return Values[6]; } set { Values[6] = value; } }
+        public string V { get { return Values[7]; } set { Values[7] = value; } }
+        public string W { get { return Values[8]; } set { Values[8] = value; } }
+    }
+
     public class Position : ViewModelBase
     {
         public Position()
@@ -732,6 +783,9 @@ public string ToString(AxisFlags axisflags, AxisFlags toNegative, int precision
         public double A { get { return Values[3]; } set { Values[3] = value; } }
         public double B { get { return Values[4]; } set { Values[4] = value; } }
         public double C { get { return Values[5]; } set { Values[5] = value; } }
+        public double U { get { return Values[6]; } set { Values[6] = value; } }
+        public double V { get { return Values[7]; } set { Values[7] = value; } }
+        public double W { get { return Values[8]; } set { Values[8] = value; } }
     }
 
     public class CoordinateSystem : Position
@@ -823,7 +877,8 @@ static GrblInfo()
             NumAxes = 3;
         }
 
-        public static string AxisLetters { get; private set; } = "XYZABC";
+        public static string AxisLetters { get; private set; } = "XYZABCUVW";
+        public static string SignalLetters { get; private set; } = "XYZABCUVWEPRDHSBTOMF"; // Keep in sync with Signals enum above!!
         public static string PositionFormatString { get; private set; } = string.Empty;
         public static string Version { get; private set; } = string.Empty;
         public static int Build { get; private set; } = 0;
@@ -878,11 +933,13 @@ private set
         public static string IpAddress { get; private set; } = string.Empty;
         public static bool HasPIDLog { get; private set; }
         public static bool HasProbe { get; private set; } = true;
+        public static bool HasRTC { get; private set; } = false;
         public static bool HomingEnabled { get; internal set; } = true;
         public static AxisFlags HomingDirection { get; internal set; } = AxisFlags.None;
         public static bool UseLegacyRTCommands { get; internal set; } = true;
         public static bool MPGMode { get; set; }
         public static bool HasFirmwareJog { get; internal set; } = false;
+        public static bool LightBurnCluster { get; internal set; } = false;
         public static bool LatheModeEnabled
         {
             get { return GrblParserState.LatheMode != LatheMode.Disabled; }
@@ -1147,6 +1204,18 @@ private static void Process(string data)
                             NumTools = int.Parse(s[4], CultureInfo.InvariantCulture);
                         break;
 
+                    case "AXS":
+                        NumAxes = int.Parse(valuepair[1], CultureInfo.InvariantCulture);
+                        AxisLetters = valuepair[2];
+                        if (Grbl.GrblViewModel != null) {
+                            Grbl.GrblViewModel.AxisLetter.Remap(AxisLetters);
+                            AxisLetters = Grbl.GrblViewModel.AxisLetter.All;
+                            SignalLetters = AxisLetters + SignalLetters.Substring(9);
+                            Grbl.GrblViewModel.ClearSignals();
+                            NumAxes = Grbl.GrblViewModel.NumAxes;
+                        }
+                        break;
+
                     case "NEWOPT":
                         NewOptions = valuepair[1];
                         string[] s2 = valuepair[1].Split(',');
@@ -1155,80 +1224,84 @@ private static void Process(string data)
                             if (value.StartsWith("TMC="))
                                 TrinamicDrivers = value.Substring(4);
                             else switch (value)
-                                {
-                                    case "ENUMS":
-                                        HasEnums = true;
-                                        break;
-
-                                    case "EXPR":
-                                        ExpressionsSupported = true;
-                                        break;
-
-                                    case "TC":
-                                        ManualToolChange = true;
-                                        break;
-
-                                    case "ATC":
-                                        HasATC = true;
-                                        break;
-
-                                    case "ETH":
-                                        break;
-
-                                    case "HOME":
-                                        HomingEnabled = true;
-                                        break;
-
-                                    case "SD":
-                                        HasSDCard = true;
-                                        break;
-
-                                    case "SED":
-                                        HasSettingDescriptions = true;
-                                        break;
-
-                                    case "YM":
-                                        if(UploadProtocol == string.Empty)
-                                            UploadProtocol = "YModem";
-                                        break;
-
-                                    case "FTP":
-                                        UploadProtocol = "FTP";
-                                        break;
-
-                                    case "PID":
-                                        HasPIDLog = true;
-                                        break;
-
-                                    case "NOPROBE":
-                                        HasProbe = false;
-                                        break;
-
-                                    case "LATHE":
-                                        LatheModeEnabled = true;
-                                        break;
-
-                                    case "BD":
-                                        OptionalSignals |= Signals.BlockDelete;
-                                        break;
-
-                                    case "ES":
-                                        OptionalSignals |= Signals.EStop;
-                                        break;
-
-                                    case "MW":
-                                        OptionalSignals |= Signals.MotorWarning;
-                                        break;
-
-                                    case "OS":
-                                        OptionalSignals |= Signals.OptionalStop;
-                                        break;
-
-                                    case "RT+":
-                                    case "RT-":
-                                        UseLegacyRTCommands = false;
-                                        break;
-                                }
+                            {
+                                case "ENUMS":
+                                    HasEnums = true;
+                                    break;
+
+                                case "EXPR":
+                                    ExpressionsSupported = true;
+                                    break;
+
+                                case "TC":
+                                    ManualToolChange = true;
+                                    break;
+
+                                case "ATC":
+                                    HasATC = true;
+                                    break;
+
+                                case "RTC":
+                                    HasRTC = true;
+                                    break;
+
+                                case "ETH":
+                                    break;
+
+                                case "HOME":
+                                    HomingEnabled = true;
+                                    break;
+
+                                case "SD":
+                                    HasSDCard = true;
+                                    break;
+
+                                case "SED":
+                                    HasSettingDescriptions = true;
+                                    break;
+
+                                case "YM":
+                                    if(UploadProtocol == string.Empty)
+                                        UploadProtocol = "YModem";
+                                    break;
+
+                                case "FTP":
+                                    UploadProtocol = "FTP";
+                                    break;
+
+                                case "PID":
+                                    HasPIDLog = true;
+                                    break;
+
+                                case "NOPROBE":
+                                    HasProbe = false;
+                                    break;
+
+                                case "LATHE":
+                                    LatheModeEnabled = true;
+                                    break;
+
+                                case "BD":
+                                    OptionalSignals |= Signals.BlockDelete;
+                                    break;
+
+                                case "ES":
+                                    OptionalSignals |= Signals.EStop;
+                                    break;
+
+                                case "MW":
+                                    OptionalSignals |= Signals.MotorWarning;
+                                    break;
+
+                                case "OS":
+                                    OptionalSignals |= Signals.OptionalStop;
+                                    break;
+
+                                case "RT+":
+                                case "RT-":
+                                    UseLegacyRTCommands = false;
+                                    break;
+                            }
                         }
                         break;
 
@@ -1237,6 +1310,11 @@ private static void Process(string data)
                         SystemInfo.Add(data);
                         break;
 
+                    case "CLUSTER":
+                        LightBurnCluster = true;
+                        SystemInfo.Add(data);
+                        break;
+
                     default:
                         SystemInfo.Add(data);
                         if (data.StartsWith("[AUX IO:"))
diff --git a/CNC Core/CNC Core/GrblViewModel.cs b/CNC Core/CNC Core/GrblViewModel.cs
index a5965d7..ca9eb20 100644
--- a/CNC Core/CNC Core/GrblViewModel.cs	
+++ b/CNC Core/CNC Core/GrblViewModel.cs	
@@ -1,7 +1,7 @@
 /*
  * GrblViewModel.cs - part of CNC Controls library
  *
- * v0.39 / 2022-06-24 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-23 / Io Engineering (Terje Io)
  *
  */
 
@@ -97,6 +97,7 @@ public GrblViewModel()
 
             _grblState.LastAlarm = 0;
 
+            AxisLetter.PropertyChanged += Axisletter_PropertyChanged;
             Signals.PropertyChanged += Signals_PropertyChanged;
             THCSignals.PropertyChanged += THCSignals_PropertyChanged;
             OptionalSignals.PropertyChanged += OptionalSignals_PropertyChanged;
@@ -109,6 +110,11 @@ public GrblViewModel()
             ToolOffset.PropertyChanged += ToolOffset_PropertyChanged;
         }
 
+        private void Axisletter_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(nameof(AxisLetter));
+        }
+
         private void WorkPositionOffset_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(Core.Position))
@@ -221,6 +227,11 @@ public void ClearPosition()
             ProgramLimits.Clear();
         }
 
+        public void ClearSignals()
+        {
+            Set("Pn", string.Empty);
+        }
+
         public PollGrbl Poller { get; } = new PollGrbl();
 
         public ICommand MDICommand { get; private set; }
@@ -381,6 +392,7 @@ public bool SuspendPositionNotifications
             set { Position.SuspendNotifications = value; }
         }
 
+        public AxisLetter AxisLetter { get; private set; } = new AxisLetter();
         public EnumFlags<AxisFlags> AxisHomed { get; private set; } = new EnumFlags<AxisFlags>(AxisFlags.None);
         public Position HomePosition { get; private set; } = new Position();
 
@@ -941,7 +953,7 @@ private bool Set(string parameter, string value)
                         int s = 0;
                         foreach (char c in _pn)
                         {
-                            int i = GrblConstants.SIGNALS.IndexOf(c);
+                            int i = GrblInfo.SignalLetters.IndexOf(c);
                             if (i >= 0)
                                 s |= (1 << i);
                         }
diff --git a/CNC Core/CNC Core/Machine.cs b/CNC Core/CNC Core/Machine.cs
index f98bddd..6475fd8 100644
--- a/CNC Core/CNC Core/Machine.cs	
+++ b/CNC Core/CNC Core/Machine.cs	
@@ -1,13 +1,13 @@
 /*
  * Machine.cs - part of CNC Core library
  *
- * v0.36 / 2021-11-30 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-23 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2020-2021, Io Engineering (Terje Io)
+Copyright (c) 2020-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -51,10 +51,10 @@ public class Machine
         protected bool isRelative = false;
 
         protected int _tool = 0;
-        protected double[] offsets = new double[6];
-        protected double[] origin = new double[6];
-        protected double[] scaleFactors = new double[6];
-        protected double[] toolOffsets = new double[6];
+        protected double[] offsets = new double[9];
+        protected double[] origin = new double[9];
+        protected double[] scaleFactors = new double[9];
+        protected double[] toolOffsets = new double[9];
         protected List<CoordinateSystem> coordinateSystems = new List<CoordinateSystem>();
         protected CoordinateSystem coordinateSystem, g28, g30, g92;
         protected List<Tool> toolTable = new List<Tool>();
diff --git a/CNC Core/CNC Core/Properties/AssemblyInfo.cs b/CNC Core/CNC Core/Properties/AssemblyInfo.cs
index 6632db9..9f4872f 100644
--- a/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
+++ b/CNC Core/CNC Core/Properties/AssemblyInfo.cs	
@@ -35,5 +35,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.40.0")]
-[assembly: AssemblyFileVersion("2.0.40.0")]
+[assembly: AssemblyVersion("2.0.41.0")]
+[assembly: AssemblyFileVersion("2.0.41.0")]
diff --git a/CNC Core/CNC Core/SerialStream.cs b/CNC Core/CNC Core/SerialStream.cs
index 8e85a33..a091e8f 100644
--- a/CNC Core/CNC Core/SerialStream.cs	
+++ b/CNC Core/CNC Core/SerialStream.cs	
@@ -1,13 +1,13 @@
 /*
  * SerialStream.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-17 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-25 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -434,6 +434,7 @@ public ComPort(string name)
     public class SerialPorts : ViewModelBase
     {
         string _selected = string.Empty;
+        string _baud = "115200";
         private ConnectMode _mode = null;
 
         public SerialPorts()
@@ -443,6 +444,11 @@ public SerialPorts()
             if (Ports.Count > 0)
                 _selected = Ports[0].Name;
 
+            Baud.Add(_baud);
+            Baud.Add("230400");
+            Baud.Add("460800");
+            Baud.Add("921600");
+
             ConnectModes.Add(new ConnectMode(Comms.ResetMode.None, "No action"));
             ConnectModes.Add(new ConnectMode(Comms.ResetMode.DTR, "Toggle DTR"));
             ConnectModes.Add(new ConnectMode(Comms.ResetMode.RTS, "Toggle RTS"));
@@ -472,7 +478,7 @@ public void Refresh ()
                     var portList = _portnames.Select(n => ports.FirstOrDefault(s => s.Contains('(' + n + ')'))).ToList();
                     foreach (var fullname in portList)
                     {
-                        var name = fullname.Substring(fullname.IndexOf("(COM") + 1).TrimEnd(')');
+                        var name = fullname.Substring(fullname.IndexOf("(COM") + 1).Trim().TrimEnd(')');
                         var port = new ComPort(name);
 
                         port.FullName = name + " - " + fullname.Replace('(' + name + ')', string.Empty).Trim();
@@ -500,6 +506,7 @@ public void Refresh ()
 
         public ObservableCollection<ComPort> Ports { get; private set; } = new ObservableCollection<ComPort>();
         public ObservableCollection<ConnectMode> ConnectModes { get; private set; } = new ObservableCollection<ConnectMode>();
+        public ObservableCollection<string> Baud { get; private set; } = new ObservableCollection<string>();
 
         public string SelectedPort
         {
@@ -514,6 +521,19 @@ public string SelectedPort
             }
         }
 
+        public string SelectedBaud
+        {
+            get { return _baud; }
+            set
+            {
+                if (_baud != value)
+                {
+                    _baud = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public ConnectMode SelectedMode
         {
             get { return _mode; }
diff --git a/CNC Core/CNC Core/TelnetStream.cs b/CNC Core/CNC Core/TelnetStream.cs
index 89a9490..8916692 100644
--- a/CNC Core/CNC Core/TelnetStream.cs	
+++ b/CNC Core/CNC Core/TelnetStream.cs	
@@ -1,7 +1,7 @@
 /*
  * TelnetStream.cs - part of CNC Controls library
  *
- * v0.36 / 2021-12-30 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-03 / Io Engineering (Terje Io)
  *
  */
 
@@ -143,10 +143,13 @@ public void WriteCommand(string command)
         {
             state = Comms.State.AwaitAck;
 
-            if (command.Length > 1 || command == GrblConstants.CMD_PROGRAM_DEMARCATION)
+            if (command.Length == 1 && command != GrblConstants.CMD_PROGRAM_DEMARCATION)
+                WriteByte((byte)command.ToCharArray()[0]);
+            else
+            {
                 command += "\r";
-
-            WriteString(command);
+                WriteString(command);
+            }
         }
 
         public void AwaitAck()
diff --git a/CNC Core/CNC Core/WebsocketStream.cs b/CNC Core/CNC Core/WebsocketStream.cs
index 2e6dd67..10d88d9 100644
--- a/CNC Core/CNC Core/WebsocketStream.cs	
+++ b/CNC Core/CNC Core/WebsocketStream.cs	
@@ -1,13 +1,13 @@
 /*
  * WebsocketStream.cs - part of CNC Controls library
  *
- * v0.31 / 2021-04-23 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-03 / Io Engineering (Terje Io)
  *
  */
 
 /*
 
-Copyright (c) 2018-2021, Io Engineering (Terje Io)
+Copyright (c) 2018-2022, Io Engineering (Terje Io)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -135,10 +135,13 @@ public void WriteCommand(string command)
         {
             state = Comms.State.AwaitAck;
 
-            if (command.Length > 1 || command == GrblConstants.CMD_PROGRAM_DEMARCATION)
+            if (command.Length == 1 && command != GrblConstants.CMD_PROGRAM_DEMARCATION)
+                WriteByte((byte)command.ToCharArray()[0]);
+            else
+            {
                 command += "\r";
-
-            WriteString(command);
+                WriteString(command);
+            }
         }
 
         public void AwaitAck()
@@ -189,6 +192,7 @@ private void OnClose(object sender, CloseEventArgs e)
             websocket.OnClose -= OnClose;
             websocket = null;
         }
+
         private int gp()
         {
             int pos = 0; bool found = false;
diff --git a/Grbl Config App/Grbl Config App/MainWindow.xaml.cs b/Grbl Config App/Grbl Config App/MainWindow.xaml.cs
index f42fb50..1bd568e 100644
--- a/Grbl Config App/Grbl Config App/MainWindow.xaml.cs	
+++ b/Grbl Config App/Grbl Config App/MainWindow.xaml.cs	
@@ -52,7 +52,7 @@ namespace Grbl_Config_App
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.38";
+        private const string version = "2.0.41";
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
 
         public MainWindow()
diff --git a/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs b/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs
index 37d6d4c..4173ee8 100644
--- a/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs	
+++ b/Grbl Config App/Grbl Config App/Properties/AssemblyInfo.cs	
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.39.0")]
-[assembly: AssemblyFileVersion("2.0.39.0")]
+[assembly: AssemblyVersion("2.0.41.0")]
+[assembly: AssemblyFileVersion("2.0.41.0")]
diff --git a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
index 0185b38..4f98353 100644
--- a/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.Probing.resources.de-DE.csv
@@ -10,18 +10,19 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Win
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Antasten
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Speichern
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Offset einstellen (G92)
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Measure
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Nutze X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Antast Tiefe:
@@ -42,10 +43,10 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Co
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,XY Abstand:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Fahrbewegung der Tastspitze vom Startpunkt in XY-Richtung
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Y Größe:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Kante, Ecke oder Mitte zum Antasten auswählen"
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Kante zum Antasten auswählen
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Antast Aktion auswählen
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Kante, Ecke oder Mitte zum Antasten auswählen"
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Kante, Ecke oder Mitte zum Antasten auswählen"
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Antast Aktion auswählen
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Aktion
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Kamera
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Antast Abstände
@@ -64,30 +65,32 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:S
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Höhe der Tastplatte/Halterung
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Werkstück
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Werkstück
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Werkstück
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Werkstück
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Werkstück
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Werkstück Offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Vorschau
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Offset hinzu
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Ein Alarm wird erzeugt, wenn nicht aktiviert und ein Sensor angeschlossen ist"
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Prüfe Sensor Status vor dem Start (G59.3)
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Ein Alarm wird erzeugt, wenn nicht aktiviert und ein Sensor angeschlossen ist"
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Werkzeug Längenversatz löschen
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,T:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Höhe
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Rückzugsweg:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,"Rückzugsweg für die zweite langsame Antastbewegung, zum Überspringen auf 0 setzen"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Geschwindigkeit für zweite langsame Antastbewegung
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,Antast Vorschub:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Geschwindigkeit für zweite langsame Antastbewegung
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Sperren
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Sperren
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Deaktivieren und X- oder Y-Größe auf 0 setzen, um nur in eine Richtung zu messen."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Sperren
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pause vor dem Antasten
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Vorschau
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Taster Position @ G59.3
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Z-Höhe Antasten
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Z-Höhe Antasten
@@ -97,9 +100,9 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Geschwindigkeit für Positionierbewegungen, 0 um Steuerungseinstellungen zu übernehmen"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,Schnell Vorschub:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Such Vorschub:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Geschwindigkeit für erste Antastbewegung
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Such Vorschub:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Setze Koordinatensystem oder Offset
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Referenzoffset ermitteln
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Z = 0 bei X0 Y0 einstellen:
@@ -134,6 +137,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Tastatur-Jogging aktiv
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Tastatur-Jogging deaktiviert
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
+CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Antasten…
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Antast Weg muss größer sein als XY Abstand + ½ Taster/Werkzeug Durchmesser.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen mit Alarm, löschen in GRBL Tab."
@@ -145,8 +149,10 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceE
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, konnte die aktuelle Maschinenposition nicht ermitteln."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, Tastspitze nicht angeschlossen."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, Grbl ist nicht im Leerlauf- oder Werkzeugwechselzustand."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Antasten fehlgeschlagen, Tastsignal vorhanden."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,Im GCode enthaltene Kreise in XZ- oder YZ-Ebene (G18/19) können nicht umgewandelt werden. Verwenden Sie &apos;Kreisbogen zu Linien&apos; wenn Sie dies wirklich brauchen.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Antasten abgeschlossen.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,Antasten fehlgeschlagen
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInitFailed:System.String.$Content,None,True,True,,Winkel: {0} Grad
diff --git a/Locale/de-DE/csv/CNC.Controls.Viewer.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.Viewer.resources.de-DE.csv
index 8132be6..b458b9f 100644
--- a/Locale/de-DE/csv/CNC.Controls.Viewer.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.Viewer.resources.de-DE.csv
@@ -2,9 +2,9 @@
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Label,None,False,True,,Winkel Auflösung:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,Segmente
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,kürzeste Distanz:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Tool diameter:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Default tool diameter.
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Tool diameter:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolScalePct:CNC.Controls.NumericField.Unit,None,False,True,,%
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,GCode Anzeige
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Schwarzer Hintergrund
@@ -24,14 +24,14 @@ CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_toolAutoScale:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Auto scale tool
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ansicht zurücksetzen (Ctrl+V)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/ResetView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/RestoreView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save view
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle grid visibility (Ctrl+G)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/GridOn.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle job bounds visibility (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/JobBoxOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle job bounds visibility (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle machine work envelope visibility (Ctrl+W)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/WorkBoxOn.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle axes visibility
diff --git a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
index da4c3d9..de2d92e 100644
--- a/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Controls.WPF.resources.de-DE.csv
@@ -22,31 +22,31 @@ CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG28:System.Windo
 CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,Gehe zu Position 2 (G30)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Strg+H
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,Homen
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Neu Laden
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Einstellungen von Steuerung neu laden
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Neu Laden
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Strg+Shift+R
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Wiederherstellen
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zurücksetzen
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Speichern Sie die geänderten Einstellungen in der Steuerung.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Speichern
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Speichern Sie die geänderten Einstellungen in der Steuerung.
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Einstellungen speichern
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Senden
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Einstellen
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles einstellen
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles einstellen
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles einstellen
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
-CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zwischenablage
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Kopieren von grbl Versionsinformationen und Einstellungen in die Zwischenablage
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Entriegeln
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zwischenablage
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Strg+U
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Entriegeln
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Hochladen
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Alles Nullen
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm before executing
@@ -60,23 +60,23 @@ CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Winkel:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Distanz Schnellvorschub:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Vorschub Schnell:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Max Puffer:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Vorschub Schnell:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,bytes
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Max Puffer:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Maximal genutzte serielle Puffergröße (begrenzt auf 90 % des angegebenen Wertes).
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Zeit zwischen den an den Controller gesendeten Statusanfragen.
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Abfrageintervall:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Unit,None,False,True,,ms
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Reset Verzögerung:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Abfrageintervall:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Unit,None,False,True,,ms
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Reset Verzögerung:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Verzögerung, damit der Controller das Booten beenden kann, bevor die Kommunikation beginnt."
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,Distanz Langsamvorschub:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Vorschub Langsam:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,Distanz Einzelschritt:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Vorschub Einzelschritt:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Hauptmenü
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Kühlung
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Anzeige
@@ -113,44 +113,42 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Contr
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Werkzeug
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Echtzeit-Antworten ausfiltern
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Alle Echtzeit-Antworten zeigen
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_aAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,A Achse:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Puffert mehr als einen GCode-Block in der Steuerung für eine reibungslosere Ausführung. Nur für grblHAL!
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Aggressives Puffern
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Entfernt überflüssige GCode-Befehlselemente.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Gcode bei Transformationen automatisch komprimieren
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_bAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,B Achse:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_cAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,C Achse:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Entfernt überflüssige GCode-Befehlselemente.
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,{0} Achse:
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,CCW
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,Prüfen
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,Konfiguration
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,CW
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,Distanz 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,Distanz 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,Distanz 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Distanz 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Unit,None,False,True,,mm
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Distanz 3:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Aktivieren
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lüfter
 CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Vorschub:
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Feed rate:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Vorschub 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Vorschub 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Vorschub 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Vorschub 1:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,Vorschub 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Vorschub 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Vorschub 3:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Aktivieren, wenn ok-Antworten die Konsolenprotokollierung überfordern, was typischerweise beim Senden vieler kurzer Befehle der Fall ist."
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,&quot;OK&quot; Antworten ausfiltern
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Echtzeit-Antworten ausfiltern
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Flut-Kühlung
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP Addresse:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,MDI im Vordergrund behalten
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Puffert mehr als einen GCode-Block in der Steuerung für eine reibungslosere Ausführung. Nur für grblHAL!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,MDI im Vordergrund behalten
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Link step distance to UI jogging
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,Maschinen Position
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Nebel-Kühlung
@@ -167,6 +165,7 @@ CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Co
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Fenstergröße beim nächsten Start wiederherstellen.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Letzte Fenstergröße beim Starten wiederherstellen
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,UPM
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,Baud rate:
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Port:
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Laden (SG_Ergebnis)
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Alle Echtzeit-Antworten zeigen
@@ -182,18 +181,15 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:Syst
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter aktivieren (SFILT)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,Status:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Radius der Tastspitze:
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Werkzeug:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Werkzeug:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Werkzeug:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Ausführliche Informationen
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X Achse:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X Achse:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y Achse:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y Achse:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z Achse:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z Achse:
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Löschen
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,D_ownload and run
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Zurückspringen aktivieren
diff --git a/Locale/de-DE/csv/CNC.Converters.resources.de-DE.csv b/Locale/de-DE/csv/CNC.Converters.resources.de-DE.csv
index 3dd790e..739264d 100644
--- a/Locale/de-DE/csv/CNC.Converters.resources.de-DE.csv
+++ b/Locale/de-DE/csv/CNC.Converters.resources.de-DE.csv
@@ -4,8 +4,8 @@ CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Contr
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,Schnitttiefe:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,Vorschub:
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,Eintauch Vorschub:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,Schnellvorschub:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Label,None,False,True,,UPM:
diff --git a/Locale/de-DE/translation.txt b/Locale/de-DE/translation.txt
index 25248d5e33894df32367a987de014180c3ffa5d8..24878fedf8ab1081f450e414c5bda80d999badf9 100644
GIT binary patch
delta 2012
zcmbVN4NOy46uze|T`Ab|BLhUS0uC@vTd7i=@rN0VL=n5m%=}pkZ7roKKb8))3KEBt
z7_x8}7mQ07Gj1`4Y+l`43?WL4GiG6iC5AcT05^s%ae#}-lx#b%&Ix8&qIr4uoqO)N
z=l473)qkh%9#DT?q*Z1yGvA_zR2<V<ut@91+6XshL~IkI5gQeFQfEW6u3V_}Zbg`h
zEoIsG?a@p$SfXaU&dQjN9w#eiejNWWUcZ(Zn1hutJM+@nZnVe5#_eHlqTeMs1FNFd
zPv>5=C%?MEK>SML`bok${U+^7*dAJoNtcgSCu#K3>R^jlID0NT*)M2Ed>#E-R8lsx
zkil|tw2T#z0|9y~$vGF>i*_kC-N_1{a!7I`IV{V0LvHS&AY^$z{+1ILG4-zLe&P%{
zkpGjIdp6~SN@-$7e#ruvn33KWM)_xEv`-{*Ukhk>qXr^3<dDfK%FJ}*Pq+p$Z>JnP
z*$R^QFYXMcWhQ#e{8ABQidQn46ry9{0|+xRBeUSgDJC(t;4FxiMaw`eG~QHTr@0*S
z%x*lGWkXF?B@SfyMDo%Lkz#CJq*C;+O;C!-^#QdgC>RFe&mRC`w0@w&9{VUZ7C%Iz
zRV6OkRDfrSZi)9DO<{P_Q;P|n223k`8`a)QtSzk<0dI>6O!${^E*`7M!N>}m=&i^P
z$DX=0w7sXsHTyl-6f9JlnGwI(Igj?;Vl=oe90%(!P@c>zE5t6SZxqLmd<A&zs2{CI
z_lY$Pr@}G6xeiCsC3>6RRN=|C0H(CniCM?{W5SkGCbF?2IuX5{4LEV8OB8lCtI>Mi
zgCpnMqU(Hf3U>ATaAUt$EciZ6p`?=VL&a1d>Iwa{o?uQ~oe^KNDTLuFT4fCHB~%AO
zbP3h$ab*ls0QMC5Q@V?)C)f9dG{sQ+Jflji|6zj?vhmlK=kx0x&_+86Ae+dDo$y#i
zfN}E8+aW1w8Y^V~UlIJ{)&Xq1<rje;)qvNByD@jjh2_IV*m!#v>gap#_7yx$yum>S
z1_z1%vmYJ51aRhE7xvRPFj9?*5kFe)c(7o!67SKz<4z@>`{^e3jQYjCySvnwGj7Aa
zF&{n{cVNf3RqU9sYVg#fJk&mF$GpiEIQFOzJ0I>6^^>`gR0<0Y)u-~>xuAP%YG1xV
z@!91*q#*J`*>Dn7AV(VNKm*&(p33Z`64}{qdP_oM%TG59Bp1?wL#tw!%R}geZ^I&<
z9sx)A87&-!CESz)^U;{8;gcH3<4d#<<hkK+mv=@$kZ^3F_BTbr;yJS4Q)7AzHF=!+
zSQVd_4)Neb)BX5)2AZ~VAq{j;Mo!Ckdor|2WF&Fe32{ksj6Q;+EWDSk{wJc)lzR>}
z`e)QgsgaPV;Ma6e&sXT+82?fa0iLf1x3n+{0wDQfpc;5bG<+kC#KLSf@0$&0`Ndh#
z$rZDpn<vbM3;ggL;`x%`w6rW4{!~hiR9Fd;IR%U$wWmREB=0prCHI-YA+1{i$CIQh
zn_&RJ#D_{@F)xUPC@DD~J_D&^3mjIW?<F<w+6t{aV=FXD)<S3x=ND~om5;pxy*#Q2
zRMIg!<Z5_zDR}rw58U8=B}5IEf{#a)f=ep!!a3k6WnkkYW#Ho1e6WqXeBj^*%fQW5
zL`l|isEgn^K`7)m_Jdby2|}NOU#<Z^ch$fS$x;ie5_qr;s`*4KH1I$x1f}2G;HpAO
z{s<D3QfoUjDMB-TDL)i|Ia22*FjE;~WYI`U<-;c+hU-2BO|+d=hklXrP~T5;`T(zK
Mhd8O{6kJyP4TRcap8x;=

delta 1090
zcmZ9Le@N7K7{|Zw@12Lgy38NVQkK8woO5!gcK$#jHKc_M=bQ^Qxz6*r*=gr_${{Z5
zsCHYixt_XbSi4G+hJ`CXv2TP(8zV%V2pdC0#GIL#i42SVG0uIp|N7_ie4gj?dB1pm
z@Qlpp&i<jhV+p5+;dZiwH&9Q+VakZGi=~JPnJ(&`l&3cf?RL8yQYaNj1@y~*$vDa%
z_aSaaiIgNAl|0htQoB?ng-Ip+Z9n3KJ|-^;1~xY1J#jG2snrxpxmz;JmTXVy8?sHm
zL~4}mDyB&)5_dB~AhI(@WHFb$46%~+3S!)l2Q`60DQ}C^_&R~IH%Mi#6OePJWQsDm
zX>hNV&YB!_Xs?|nof%@#6pR%2%i}fTc3GrGOn%s@6X{j65apHg5W4Db^rFkE1^F$D
z)ZH{kp2nc4w_OM!r^81p$Gr5fqn3Vc@ljQaOH{O8)KY1?ndV#;(bxV_7)^gMPix)F
zV)(>?FdFs^QSi%Q(fZYWQ17`e$~fl|(dT~*Q`?b4-~FDz<`(QGm)}4SE_uZbf0dRT
zm%a3=w^OWMo{FZ{pN45{@P<gg^SzF;6ssmjGV<LR?BbIF?4<o^p`u<HO(FlZosy<q
zA~>BUi^SPd4OP#(X!fyNJet>m`kq>-_^FM23wD}bw9?QMGp#LHXyWf-s(R8uQH!G*
zlRDRA_xsf2)N|zl6+W@zBkhu#N|)U<_RK>Uo_nZE^=qEF>FwvLec`5i%MJ=(anb6M
zO^m&0&_QL)8tLJ>iPG0CYLx|i-G>BjIEGL<`7(>v*KK0pWp!wXQ8G#<P7cQh6x_(B
zir^KJgXNU6Q9}#Ced5oJgOMDiM;Gh1V|nwY<@1|v&o+2DY8y`Q+IDm+*LEOU=Au}9
z&4V%OQ5**w{}zi*r7sSh;GTGlEAel^1Eqc!5_LS4gb~h6!XV437+`-g9<XN*hPW~X
zL(1(`1U1TH1`JRJ-bFE#otc=3<eGd~dC7!U<>!0^5){LySb|dh31*<ge}>Z<6!O(t
zyu%H3Xyz-m2q<H92!wHt4dZNU!k7}Y;ZP|1oa+0~as0)WHWgWZ91i}+sd68+;U3u9
zp$2>1u<(924s%yK%>K>Lbh}!XxdS?7v;*D<4xB>k)-L9=@d)DBdJ4sg-it|@tIwd8
zXHKgf7(9c0@w^&9H(LX0Z&rSQM`^x_Q5jpi$d!GnD!UJf8uAwJX2UInvb|r8mG{Fh
ohZv+>b$*X;q7J!y{fIio%^yneCSo<3Jar4(vQm|6w-Av32NQs;fdBvi

diff --git a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
index 63fe0da..4e6174a 100644
--- a/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.Probing.resources.en-US.csv
@@ -10,18 +10,19 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Win
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Probe
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Save
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set offset (G92)
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Measure
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Depth:
@@ -42,10 +43,10 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Co
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,XY Clearance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Initial distance away from face to probe
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Y size:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click edge, corner or center to select probing action."
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click edge to select probing action.
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click to select probing action.
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click edge, corner or center to select probing action."
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Click edge, corner or center to select probing action."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Click to select probing action.
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Action
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Camera
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing clearances
@@ -64,30 +65,32 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:S
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Touch plate/fixture height
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Workpiece offset
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Add offset
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,An alarm will be generated by the controller if not enabled and the probe is asserted.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Check probe status before start (G59.3)
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,An alarm will be generated by the controller if not enabled and the probe is asserted.
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Clear tool length offset
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Height
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Latch distance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,"Distance to retract for second slow probing move, set to 0 to skip"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate for second slow probing move
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,Latch feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate for second slow probing move
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Unlock and set X or Y size to 0 to probe in one direction only.
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Lock
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pause before probing
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe fixture @ G59.3
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
@@ -97,9 +100,9 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Feed rate for rapid moves, set to 0 to use controller setting"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,Rapids feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Search feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate for initial probing move
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Search feed rate:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set coordinate system or offset
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Establish reference offset
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set Z = 0 at X0Y0:
@@ -134,6 +137,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Keyboard jogging active
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Keyboard jogging disabled
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
+CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Probing failed with alarm, clear in Grbl tab."
@@ -145,8 +149,10 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceE
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Probing failed, could not establish current machine position."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Probing failed, probe is not connected."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Probing failed, Grbl is not in idle or tool changing state."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Probing failed, probe signal is asserted."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,"GCode contains arcs in XZ or YZ plane (G18/19), can&apos;t apply transform. Use &apos;Arcs to Lines&apos; if you really need this."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Probing completed.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,Probing failed
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInitFailed:System.String.$Content,None,True,True,,Angle: {0} deg
diff --git a/Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv
index 2725a6d..064209e 100644
--- a/Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.Viewer.resources.en-US.csv
@@ -2,9 +2,9 @@
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Label,None,False,True,,Arc resolution:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,segments
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,Min distance:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Tool diameter:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Default tool diameter.
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Tool diameter:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolScalePct:CNC.Controls.NumericField.Unit,None,False,True,,%
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,GCode Viewer
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Black background
@@ -24,14 +24,14 @@ CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_toolAutoScale:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Auto scale tool
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reset view (Ctrl+V)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/ResetView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/RestoreView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save view
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle grid visibility (Ctrl+G)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/GridOn.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle job bounds visibility (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/JobBoxOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle job bounds visibility (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle machine work envelope visibility (Ctrl+W)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/WorkBoxOn.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Toggle axes visibility
diff --git a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
index 0d287f4..1cc881f 100644
--- a/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Controls.WPF.resources.en-US.csv
@@ -22,31 +22,31 @@ CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG28:System.Windo
 CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,Goto position 2 (G30)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,Home
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reset
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Restore
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
-CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Copy grbl version information and settings to clipboard
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Unlock
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Unlock
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Upload
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zero all
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirm before executing
@@ -60,23 +60,23 @@ CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Angle:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diameter:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Fast distance:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Fast feedrate:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Max buffer:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Fast feedrate:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,bytes
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Max buffer:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Maximum serial buffer size utilized (limited to 90% of reported value).
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Time between status request sent to controller.
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Poll interval:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Unit,None,False,True,,ms
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Reset delay:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Poll interval:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Unit,None,False,True,,ms
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Reset delay:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Delay to allow controller to finish booting before communication starts.
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,Slow distance:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Slow feedrate:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,Step distance:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Step feedrate:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Main
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Coolant
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,DRO
@@ -113,44 +113,42 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Contr
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Tool
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter out realtime responses
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_aAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,A axis:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Agressive buffering
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Removes superfluous gcode command elements.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Auto-compress gcode on transforms
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_bAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,B axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_cAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,C axis:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Removes superfluous gcode command elements.
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,{0} axis:
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,CCW
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,Check
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,Configure
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,CW
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,Distance 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,Distance 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,Distance 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Distance 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Unit,None,False,True,,mm
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Distance 3:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Enable
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Fan
 CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Feed rate:
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Feed rate:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 1:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 3:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Enable if ok responses overwhelm console logging, typically happens when sending lots of short commands."
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter &quot;ok&quot; response
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter out realtime responses
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Flood
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP address:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Keep MDI focus
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Keep MDI focus
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Link step distance to UI jogging
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,Machine Position
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mist
@@ -167,6 +165,7 @@ CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Co
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore window size on next startup.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Restore last window size on startup
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,RPM
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,Baud rate:
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Port:
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Load (SG_RESULT)
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
@@ -182,18 +181,15 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:Syst
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Enable filter (SFILT)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,State:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Tip radius:
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Tool:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Delete
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,D_ownload and run
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Enable rewind
diff --git a/Locale/en-US/csv/CNC.Converters.resources.en-US.csv b/Locale/en-US/csv/CNC.Converters.resources.en-US.csv
index 79eb835..00bbd57 100644
--- a/Locale/en-US/csv/CNC.Converters.resources.en-US.csv
+++ b/Locale/en-US/csv/CNC.Converters.resources.en-US.csv
@@ -4,8 +4,8 @@ CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Contr
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,Cut depth:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,Feed rate:
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,Plunge rate:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,Rapids:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Label,None,False,True,,RPM:
diff --git a/Locale/en-US/translation.txt b/Locale/en-US/translation.txt
index 515dfe89d8a62178043599452b29813a7bc07c80..c7ffdd6ff7759a7d16a874f14e6258ff028e6428 100644
GIT binary patch
delta 2040
zcmbVNeN0nV6u+l^)Kb1dK1PSOil1RXu?!>&S|Lms8vF=Dfyzf)K)ZsqV0CJQFf`6|
z$U*P2s6n$ivxvhz<KqvrFlUTe42%U8*{0Pj+AWI#^^avSxbvRV;mnrJG`;WL^Ks9)
z=lss^4V=<+^l5rkI`sl(#+C>@?-oFd9lC5(>FRJ=hyyR_O2oF1#VVX1UV<0G9OAC<
zI#rN~WwI<h+BPq#hSjl+teCl31FL3smPbz){p_rUd2nTCe1wG=n2pu5D&{0zEm~q?
zVmFgl1KUD&2G&HYhxASy%8Ta{382Bmq{w9kGH{dHL#FoUkDy&W+e~W>9qOXhPDeXw
zwXswd%w8^F)=LHyEm3br=(AWhMQ(gnhGxpfO<6kFR{m8q#LTg?lD|Y`T12VK^>Qi+
zZ>H<W4jwdGVnZf5<Kdt6Ar{j9v;GwvDAb4t4cUU)#M1fD448+dvn~fwhp4GX?;CO2
zM5t*A#cQGhJs<h0)IhPTsML0rLl%k@H+98|$+N#uiO1%TfH*Su8xXxIxgbtW9aUka
zNx;sG4aze;qZ(}{D~_c%V!z2LKFatdMEuOsrxNevUQl)B3Zf(5sS!Oz$3Yw}>;^Gm
zg)bbtDgs!!{tk9j2zb1F40l>@hy|7AAe^voL$AFJy^eM0sNIRfj!yA*txdp>ot0SN
zw2HzziNSbmM=~xh(_p_>i-pZ+!OUBdAQmUK#K~JRu*DDz8MyMuO!T*Op{C`G=xOZ(
zJk;jIls31hdruXN+kJb<#`v`!{TeN1_zFeg13|!j=tV8Ii9*-8DD^^S;)|BSOzb%B
z!TwK9iP}#~HF&wlh2=d?G3Qji5q}!2L;s)vX0-hN8lD_9i$&kYsg(M^&Nmrgj{aYU
z1V2BmpT1ndaTBdFj<*uBo0a!^Y8bTzPbbAMsF^%i)F`=?|G_Wn1wXOuyEHXq@yBn$
zg0SUuQWb%#i2z_nqgk(iPNKwkW`Pf`?7%%&JlJ^kSM0t1CC(mkVDa^8bd6f^-bghL
zj9$dOB<sIs!}4n+|G|U#H=6OG-+_JfEcwxkw@H@Z-+<{i-8ew|R=*p&z8}S7H$CFI
zTRII6+^t0GT^F_nY?vBYB?ba}rUWfyGDDd%s1M^a@bXwUhThLX!?=KF$5&zFm{nYQ
ze`=^YlV!_2=Qm;?JZ$p7t;W++V>4x%vMa-6U}bDI0lrEeI#xjyuVS_IuU9C^L$x-L
zoubF1c`*xRUU_M6NIlR4?;S8hD_SR-@!aEWI6QHOX8^e6jQMyIC@DwlC#U>`No8hq
zQG4usQzXQKod_Y`Xdvp8yJjF&17#`W<tg9P%h=#iD<D=cU&=*rl8v{rMSosF;pzWz
zOvK-gkq!eq0783JPa4k^pn&_-u$>14@bFdv98!4@I6!Kf0yg01HE>=EXyLaYUKa)3
zd|w0{;{I?r$@?SW1lLBBY;GicD4mFgkJMn|L+c@pM@GO5-Wv~Br6qCjDoE`KU=HPp
zv%swYAq$7h)8(1vIkQ2>$C4pc>X-%jiBg9JdO;dq1m{3noChgt{;&WJa#sPgOMBh~
zZ7?rg3Fo=57%oYPtKi}k-d+Y9c;Py@%KdBUZLADjd|DaZ!dea;pw1>nHI`9Ijg^qX
z2i8L!KVyYbUTg&$uamd;D!?YaQ3-J&lv_5-;<uI(4;2Npd~_qZtl3Cv!3k$oJiGy%
zyw3$|q-_nLiRbOR!OI`D!(P6t9kxpoyP;1d#k~&+YRTsV-xCJO<i`E5RvO(8y($7r
s77ixQger`Rib;EyrL!Fha=ps;P^Rt|WnoOmOw7#83e2S5E;yq41Le|kLjV8(

delta 1104
zcmZ9Me@I(b6vyv*NuEjkv9{Cbtc=*TtF6UFlZuLT>1<v9$efkpq;xTfF^xe)vqzVS
z8^MW)b6w`K9@n|f$*BGjTDM#J!jR&MNGT$9Y+|iTV<s{*f5>Kwj8gWxF=74d-tXbu
z&-ZXR=Y}HU+%<7R(4#}|ML}=Jg5+AfqxbNxWUGMLX&#(Tt>wWqub?SqC9DL$9(xIA
z`?cVt(;>*%eViGYlLc54dykbd9Xn3BgYcrp%nDgCo)!;Ka2I6rxjiW_@SFRJ)v8iv
z-a)wjK^%PJImG{UD$}!4g=V79Ux!1Ob#PWy$Sm|-9US64dEEkEJu(YCEq@XC_XXvk
zR9VU_I~EQ9R$1|!Ma8o!Gx#5`EeN=6_T!M*h0PWp7MnddTjb*lmi1&FsF)V`lr<vo
z^2%0`S67V!58JK+-+H?*4Qm{m*lAxwt22gG4iSCztK8_aXz<?oPOLfKfi>Q<nAbFb
zVed!$R+CGO!4^9jTO2&vlC8s7AdcJb|ITlJVAQEBN>hG(Hy5WqzKF5TA9z()1km5@
zM{T!{$Gg=!YzejE+Go8y782B&B4%NQl-maR{a!8FS8~uaXu|kFfJZM)?ncY_HM}x5
z$fM)uL=0c|V)1o9PoFrEi_`NioSIi--Mp8-`jbK6#lPgK@XUQbMi(WVxu3wEs0;T+
zJ!p)o(f`1WQ@^@#XxV`a4_tU-X%b78?f7{44!V9@!u6<xc`Fi5!~z(I2hj0Q!t$7e
z>bP>QN_cst88_p8{Q04WPps-iG;Vk?vhKpfMh$jvczAiDHwmqe?6_y^3f}#*64$qC
zF}!t*4?i-b(5MOmG@ynx%2GoI?N>pNt_sSnT?2mEm;?!+E*-Q}PzP#C(ZL0h^x&qa
zI*{Z=J$QgdQ{lFJECt*kyVGD>Lqi!5rYGqzOnsR!L?;X|PUq5Lgc1fAk@si8WtF^^
z134hy+6#Fg3onBug~ksn*s{aWB5U*ERQAm`VG`u(lQ04D<S96!q7EDMC{tNTAKKsm
z?XoGE;#(l<=w2<%XiTh#9mQ|Hd<94Pv}COVk*u|FQ678;W|C;w0X~|khXuOeRBX=H
zLo<m^g|Os=5YU-MCD`i*7n$5pN4^Gd(5737-E9C5RX2htM;gJ9OxbOUo@<3Fxw8#!
z2=uK4HDr+#&|?Y2OnTa<v`*@SUV8Eg1myNlAtJ!eE>d*}%H)C&<f!22f7?S|RDzWV
m{esG*jOfaECOHta^w%XQSKfX#w)fdrAS*H<$hI$FTKF5X)3B-l

diff --git a/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
index 448f594..dff801a 100644
--- a/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Controls.Probing.resources.pt-BR.csv
@@ -10,18 +10,19 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Win
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Sonda
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Salvar
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Definir offset (G92)
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Measure
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Iniciar
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Usar posições da camera
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Usar X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Profundidade:
@@ -42,10 +43,10 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Co
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,XY Clearance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Initial distance away from face to probe
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Y tamanho:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Selecione borda, canto ou centro desejado."
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Selecione a borda desejada para iniciar a sondagem.
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Clique para selecionar o tipo de sondagem.
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Selecione borda, canto ou centro desejado."
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Selecione borda, canto ou centro desejado."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Clique para selecionar o tipo de sondagem.
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Ação
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Camera
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing clearances
@@ -64,30 +65,32 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:S
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Altura da placa de toque/acessório
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Peça de trabalho
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Peça de trabalho
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Peça de trabalho
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Peça de trabalho
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Peça de trabalho
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Offset da peça de trabalho
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Adicionar deslocamento (offset)
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Um alarme será ativado pelo controle se não estiver ligado e a sonda verificada.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verifique o status da sonda antes de iniciar (G59.3)
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Um alarme será ativado pelo controle se não estiver ligado e a sonda verificada.
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Limpar o deslocamento do tamanho da ferramenta
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Altura
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Latch distance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,"Distancia para retrair para a segunda movimentação devagar da sonda, colocar como 0 para pular"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate para o segundo movimento devagar da sonda
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,Latch feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate para o segundo movimento devagar da sonda
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Travar
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Travar
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Destravar e definir o tamanho X ou Y como 0 para realizar a sondagem em apenas uma direção.
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Travar
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Pausar antes de fazer a sondagem
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe fixture @ G59.3
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
@@ -97,9 +100,9 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Feed rate para movimentos rapidos, colocar como 0 para utilizar a opção do controlador"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,Feedrate do movimento rápido:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Search feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Feed rate para movimento inicial da sonda
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Search feed rate:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Definir o sistema de coordenadas ou offset
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Estabelecer deslocamento de referencia
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Definir Z = 0 em X0Y0:
@@ -134,6 +137,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Jogging com teclado está ativo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Jogging com teclado desativado
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} posições da sonda são necessárias.
+CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Sondando...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Distancia de sondagem deve ser maior que XY Clearance + ½ do diametro da Sonda/ferramenta.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Sondagem falhou com alarme, limpar na aba Grbl."
@@ -145,8 +149,10 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceE
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Sondagem falhou, não foi possível estabelecer a posição de máquina atual."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Sondagem falhou, sonda não está conectada."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Sondagem falhou, Grbl não está em estado inativo ou de mudança de ferramenta."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Sondagem falhou, sinal de sonda está determinada."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,"GCode contem arcos nos planos XZ ou YZ (G18/19), não é possível aplicar tranformação. Use &apos;Arcos para Linhas&apos; se isto é realmente necessário."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Sondagem completa.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,Sondagem falhou
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInitFailed:System.String.$Content,None,True,True,,Angulo: {0} graus
diff --git a/Locale/pt-BR/csv/CNC.Controls.Viewer.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Controls.Viewer.resources.pt-BR.csv
index 616ecf8..5cf2a4a 100644
--- a/Locale/pt-BR/csv/CNC.Controls.Viewer.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Controls.Viewer.resources.pt-BR.csv
@@ -2,9 +2,9 @@
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Label,None,False,True,,Resolução do arco:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,segmentos
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,Distancia mínima:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Diametro da ferramenta:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Diametro padrão do equipamento.
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Diametro da ferramenta:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolScalePct:CNC.Controls.NumericField.Unit,None,False,True,,%
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Visualizador GCode
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Fundo preto
@@ -24,14 +24,14 @@ CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_toolAutoScale:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Ferramento de escala automática
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reiniciar view (Ctrl+V)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/ResetView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restaurar view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/RestoreView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restaurar view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Salvar view
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ligar/Desligar visibilidade do grid(Ctrl+G)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/GridOn.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ligar/Desligar área de trabalho (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/JobBoxOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ligar/Desligar área de trabalho (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ligar/Desligar work envelope (Ctrl+W)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/WorkBoxOn.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ligar/Desligar visibilidade do eixo
diff --git a/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
index 12e4ed9..400bf53 100644
--- a/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Controls.WPF.resources.pt-BR.csv
@@ -22,31 +22,31 @@ CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG28:System.Windo
 CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ir para posição 2 (G30)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,Home
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Recarregar
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Recarregar configurações do controlador.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Recarregar
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reiniciar
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Restaurar
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Retornar
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Salvar configurações novas ao controlador.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Salvar
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Salvar configurações novas ao controlador.
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Salvar mapeamento de teclas
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Salvar configurações
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Enviar
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Definir
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Definir todos
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Definir todos
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Definir todos
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
-CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Parar
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Copiar informações da versão do grbl e configurações
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Destravar
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Destravar
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Envio
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zerar tudo
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Confirmar antes de executar
@@ -60,23 +60,23 @@ CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Angulo:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Diametro:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Distancia rápida:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Feedrate rápido:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Buffer máximo:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Feedrate rápido:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,bytes
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Buffer máximo:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Maximum serial buffer size utilized (limited to 90% of reported value).
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Tempo entre as requisições de status enviado para o controlador.
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Poll interval:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Unit,None,False,True,,ms
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Delay de reinicio:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Poll interval:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Unit,None,False,True,,ms
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Delay de reinicio:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Atraso para que o controlador termine de iniciar antes de iniciar comunicação.
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,Distancia devagar:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Feedrate devagar:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,Distancia de passo:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Feedrate de passo:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Main
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Coolant
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,DRO
@@ -113,44 +113,42 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Contr
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Ferramenta
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filtrar respostas de tempo real
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mostrar todas as respostas de tempo real
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_aAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,eixo A:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Envia mais de um bloco de gcode ao controlador para execução mais suave. Disponível apenas em grblHAL!
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Buffer agressivo
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Remove elementos supérfluos dos comandos gcode.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Auto-comprimir gcode em transformações
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_bAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo B:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_cAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo C:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Remove elementos supérfluos dos comandos gcode.
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,{0} Eixo:
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Anti-Horário
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,Check
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,Configurar
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Anti-horário
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,Distancia 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,Distancia 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,Distancia 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Distancia 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Unit,None,False,True,,mm
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Distancia 3:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Habilitar
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Ventoinha
 CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Feed rate:
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Feed rate:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 1:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Feedrate 3:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Habilitar caso ocorra muitas respostas ok, tipicamente acontece quando enviando muitos comandos curtos."
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filtrar &quot;ok&quot; resposta
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filtrar respostas de tempo real
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Encher
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,Endereço IP:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mantem foco no MDI
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Envia mais de um bloco de gcode ao controlador para execução mais suave. Disponível apenas em grblHAL!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mantem foco no MDI
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Link step distance to UI jogging
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,Posição da máquinda
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mist
@@ -167,6 +165,7 @@ CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Co
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restaurar tamanho da janela na proxima inicialização.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Restaurar ultimo tamanho de janela ao iniciar
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,RPM
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,Baud rate:
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Porta:
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Carregar (SG_RESULT)
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mostrar todas as respostas de tempo real
@@ -182,18 +181,15 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:Syst
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Habilitar filtro (SFILT)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,Estado:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Raio da ponta:
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Ferramenta:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Ferramenta:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Ferramenta:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Embrulho:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,para:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo X:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo X:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo Y:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo Y:
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo Z:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Eixo Z:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z Eixo:
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Deletar
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,D_ownload e executar
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Habilitar retrocesso
diff --git a/Locale/pt-BR/csv/CNC.Converters.resources.pt-BR.csv b/Locale/pt-BR/csv/CNC.Converters.resources.pt-BR.csv
index ff0e342..07dec25 100644
--- a/Locale/pt-BR/csv/CNC.Converters.resources.pt-BR.csv
+++ b/Locale/pt-BR/csv/CNC.Converters.resources.pt-BR.csv
@@ -4,8 +4,8 @@ CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Contr
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,Profundidade do corte:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,Feed rate:
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,Plunge rate:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,Movimentos rápidos:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Label,None,False,True,,RPM:
diff --git a/Locale/pt-BR/translation.txt b/Locale/pt-BR/translation.txt
index d699dfa77d537329df09f15f5a8b24bcee38416b..61cd0d8b1748993c23870056ca6321f59f0c9951 100644
GIT binary patch
delta 2154
zcmbVNeN0nV6u+m1Qrhx8`~pS`8<0twV!=W~1RQh5fL|Era8_DqrKMJ^1q&);hOuZ2
zaU91*!x&?mGmbIzsZSR}bXkZo%Yun9gb;_wP#5E1^N)%CvGdA|uq|0eUi#j>=j)!|
zJ?H$|eM2!mtmt#Aa7blCx5|y}Y7d&#7D1s|CBqBhrC1d15+Wn~vXBgx#Z1hEA10V0
zUT3?QhaNjCXFg`<QF|fQRKT>Xf;pL$xk<f)c6({(rbo+cWU6I*SS4xplB1T@(Ay{J
zaa-O(tbcjIyIRtDN#i3c$$D-qCwXh>I4k*;lU|BzCmTHrW%E3F)>+lei&c4{QXZyx
z<{{jPS{fN=V%d}sg(EN$=vw-D38sV9VZqIqR6E=JLPC~B1W2-T2Vm?WkdnQRPjx`7
zdX_W)rUVv7%z*t5t1vwaV=5-q%fPa!Ua7pd0hGduBukJygBdWdU&k9)gA!9xhl8b}
zX7U>)u(<6bQ1Tx_K$EwUlB%J*otxfssg@G7N@ZteviKLN@Few&OgNhU8^{fGT*2g0
zEE`M`p1pPqghu@upjI+S$x&*FI9aX|wiwRJu+bQV{h6M?cT1)Nn~XNp7=1WytQOL<
zdNjhuLXS)sDyWwUS5`GB1l77h5b}$!gD|wdGy*d5)BVX9S+2q&>qVTfjknr@a9P<S
zRM<v@>*bbU{NCA$Db5bu?DF6{RR?jv)h3KowMchjL|uCVKC4pU<Lc~S12eK5oI0Yz
zqt#|1eRpdpWMD>aG7jz=#Qyq6Lf8JvP`uK785PYJh5a8~1N`=o7Yh&h1^wanP&6NF
z!E5Lh298;R@YHcXzH+=t(4IIKjg4P-;LV;sLEC#ofs4+2@YFfC(0tyXgq1_?;0&r+
zCT<9S75fsDLdQ_4EKr^0(#WZ2jT|OkihH*>FbOsEmL{Q&dbu{Rc2eDDs-vCNhFWUD
znfaMBxPcnaD^fHK;om|DzYedHgNf(84aTryY7Z+NSwqcY$M=@UCCrgf<ILIPSGNyf
z?(JGk`{^-OkM-lkr~@O%Y^c9$!QMMIY`HstYwkF(akK*CM@jy(4}<R2;<*P7^wW32
zgde*}Hgw;GllQ#XLi?2uytrw67;X1`!jfOo6xcIahPjg-ESsu8&D2I=VCrEAo}ONV
z;nQ8X_Nf^kPjAMvPb|XWrw29iEE=Ax&B=T)7Q)|}J+&p&{8nj73B}sLE!b(bUP4NU
zrEA{GUf67-y_M+DN+pnp&qp2-6$WCU_05<ZX{zV#4SK#!1@H6mP&mkwmOu(`RD*`+
zE1{6PL!q8GDPe+-slZFkl+6rWmk7qV*>Gk$OX6Y=mCMep5fBUZ0O9B)4wuTPCEYGc
zS?aRqgyy7G1>e0DViF{}mWa77U|z@a{z4Ss!2c5|>K~EBVm15@kjV?eU?F-6BPD#%
zyfF+`@cb~Sr)kXzuv{W`>7w~yIOOwX;ZP|?MnENq<|wED?vI4;#Lj5QR&Ylgbn~Xg
z(8+Htf?j@k37qE2c#_fGoe)pQ!?0ZJ(LpANO<G6;aWo00HGHLkPRb!(FyU24Dn8ty
z;R~D)&b0<e5w95FWE@dlb|6RIsfBbtvH_CB;Uchs=qQ3)AS%{FuAE;lfi_-P0?ndj
z6Wk2tFKverZm__ZIJq4(N`BS}9`34y+x*!MT4`P2<*S_F5?fvHIq=e*VB<+1sBGH_
zrTl~&9Q@)=aPj4|5|4VIQ_Z{TNn@yoYVnVHh?jF;1NeD#1C)sm8^FAXuWpBC-p8Sx
zr*Js@<&W(k7xf*GCKoS!0-ZCAlZCq8SnlZty}Fbt`v$d!pY0MuK7&g#8VeJCoRSPy
iJQEeeH77xtU?sK0FVg?PKH~NRFPxZJyz~V;ko^heb$Xfr

delta 1156
zcmZ`&ZAhC}6n>v1rZL8k`oXM%jp=4pq>C=vC}p&@h?K!Lw}}-eE=F-RMi)Z};#8b$
zUF$?W&J(N^BcdY|tzPjRLrNKC$k>LH{pi9Fbv9b-WVCLSGG(uB?B9MI?z!il^W5_s
z&a)BJj{T^;<IvL&dIvf5Hu@r>k_sZ6LTe~e(L~f$b+&Yt*N!2Xs={^Tin559Xs;?P
zU$RP8P7UA`_m3k!<AP+A-jlr2`%<%1AcadciszLYmFNZK9x3UiZ0Qxn@_6lCyu{`-
z=tM=_lW39oVy_1Id{RMzjr+!tfQ#Jj$BD>`{}$#eWoGuDLk5M?gTk5_P>JO;A&B*?
zClFtmi=lLrFIf(|Nk#QP7==d|>O!eN>}PMP$e8D$h1^>5<vFP|_bP2!6pCkW8-%f_
zMI~knohmU@+@=+wH@<^Ne0>RGuB0rQg4MeeW!s={>?^cu+Y;k7m0>hkKh$48KxT)N
zQW|_T;^-7#Hgs!f!c|3=TsEO??hmK#4|mDex+hxN>cVOC+B~g(a#xgox(MpM;U(jZ
zCZX*f3RmY#IduH{WV)x-@mxJ($rBMpuE8@j`gxBS8?4Zf=Vlij40*-#n{%;Y$|Mw`
zGjT|zrs?Z6JLMC9PWNi**?b*!&bvgF>@`twu$Gs4prHppJH%AbqzcQCa->{3zMRpw
zs+(PjRg-?*P5o;gYFpo<;!PW^hiYjxq@kP*J9UKYRQ9ln1~+Wv{&j(#ZB)|y!$mUf
z1SzoTrmaVAYI@`)>tlt-mYe=k?EbcL?zpLZ+d+38yJ%pmRy6&Vu7&mRS2pXBMcYr~
z$@jGCXmu>)A34FppFu~z?`4sFuT~`ev3ra<4=U;H{SjDbCh-)R_f3>_P)fV|uZop}
zE(4cD!poPU5aPv1wDL~|ba1Ib@iL>~l9ytz1GdDWh0Sr$@Iov+oEDE-o{ED<?v6(t
zxa<XdE$=134ml|iRxS6R#1!wPV1&C<F~sMM2yjUX#(3L^F*(hIpjx(^MmpxxV1Znb
zj^_qm%7uf=a}`u;9s<e8=Ilnie7M#o`QR;dL0*3o-$L$u2j|pWas}7;ZW#vUU#?&|
zoV)E<<=fR*ksUQK==i=9P7XC-g(n(O$DRf>aZaPcD5?qL;E861!UGrV-0DI(&wii?
z<@{kR-lb&6xS)~sZj45-ssk<#w4+@1bRbF1`Yu#*&qrvH>$*^o$oFpHI>!tvqsh93
z0UjI1$CH;wpk`wLCa&|NKrZqlOO4zkEphL-5^;`WOciEU)NAGGb|i3>A3DyNL>l+_
np^q&8Pv1%o%}gcJu<!rgt<>i}O|QB2^5`U5RdQzl>#Dy2TD8H6

diff --git a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
index 5bf31fa..696ff88 100644
--- a/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.Probing.resources.ru-RU.csv
@@ -10,18 +10,19 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Win
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Измерить
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Сохранить
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Смещение (G92)
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Measure
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Использовать камеру.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Центр X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Глубина:
@@ -42,10 +43,10 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Co
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,Зазор XY:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Начальное расстояние далеко от поверхности измерения
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Размер Y:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Щелкните по границе, углу или центру для выбора операции измерения."
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Щелкните по границе для выбора операции измерения.
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Нажмите для выбора операции измерения.
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Щелкните по границе, углу или центру для выбора операции измерения."
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Щелкните по границе, углу или центру для выбора операции измерения."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Нажмите для выбора операции измерения.
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Действие
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Камера
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Зазор датчика
@@ -64,30 +65,32 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:S
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Высота площадки/датчика
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Смещение заготовки
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Предпросмотр
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Добавить смещение
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Авария будет активирована контроллером, при срабатвании не активного датчика."
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Проверять состояние датчика перед стартом (G59.3)
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Авария будет активирована контроллером, при срабатвании не активного датчика."
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отменить коррекцию длинны
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Высота
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Дистанция поиска:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Расстояние отскока для повторного медленного измерения. 0 для пропуска.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Подача при повторном точном измерении 
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,Подача поиска:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Подача при повторном точном измерении 
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Связать
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Связать
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Разблокируйте и установите X или Y в 0 для измерения по одной оси.
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Связать
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Пауза перед замером
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Предпросмотр
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Измерить оснастку @ G59.3
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Измерять по Z
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Измерять по Z
@@ -97,9 +100,9 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Подача быстрых перемещений, установите в 0 для использования установок контроллера"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,Подача быстрых перемещений :
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Подача поиска:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Подача для предварительного измерения
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Подача поиска:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Установка системы координат или смещения
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Установить образцовое смещение
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Z = 0 в точке X0Y0:
@@ -134,6 +137,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Перемещение клавиатурой активно
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Перемещение клавиатурой отключено
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,Необходимо {0} точек измерения.
+CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Измерение...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Дистанция измерения должна быть более зазора XY + ½ диаметра щупа.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Авария при измерении, очистьте аварию на закладке Grbl."
@@ -145,8 +149,10 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceE
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Ошибка измерения, текущяя позиция не известна."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Ошибка измерения, датчик не подключен."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Ошибка измерения, Grbl не в режиме ГОТОВ или смена инструмента."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Ошибка измерения, неожиданный сигнал с датчика."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,GCode содержит дуги в плоскости XZ или YZ (G18/19). Трансляция невозможна. Используйте &apos;Arcs to Lines&apos; при необходимости.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Измерение завершено.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,Ошибка измерения
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInitFailed:System.String.$Content,None,True,True,,Угол: {0} град
diff --git a/Locale/ru-RU/csv/CNC.Controls.Viewer.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.Viewer.resources.ru-RU.csv
index 0a86fe1..4630aad 100644
--- a/Locale/ru-RU/csv/CNC.Controls.Viewer.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.Viewer.resources.ru-RU.csv
@@ -2,9 +2,9 @@
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Label,None,False,True,,Разрешение дуг:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,сегментов
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,Min. дистанция:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Диаметр инструмента:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Unit,None,False,True,,мм
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Диаметр инструмента по умолчанию
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Диаметр инструмента:
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolScalePct:CNC.Controls.NumericField.Unit,None,False,True,,%
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Просмотр G-Code
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Черный фон
@@ -24,14 +24,14 @@ CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_toolAutoScale:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Масштаб. инструмент
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Установить вид по-умолчанию (Ctrl+V)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/ResetView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Восстановить вид (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/RestoreView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Восстановить вид (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Сохранить настройки отображения
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключить отображение сетки (Ctrl+G)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/GridOn.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключить отображение границ обработки (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/JobBoxOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключить отображение границ обработки (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключить отображение рабочего поля (Ctrl+W)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/WorkBoxOn.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключить отображение осей
diff --git a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
index 74cbff6..9b3f657 100644
--- a/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Controls.WPF.resources.ru-RU.csv
@@ -22,31 +22,31 @@ CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG28:System.Windo
 CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перейти в G30
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,База
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перечитать
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Перечитать настройки из контроллера.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перечитать
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сброс
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Восстанов.
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,В начало
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Применить изменения в контроллере.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сохранить
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Применить изменения в контроллере.
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сохранить
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сохранить настройки
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Отправить
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст.
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст. все
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст. все
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст. все
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
-CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,Копировать
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Копировать версию grbl и настройки в буфер
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Разблок.
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,Копировать
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Разблок.
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Загрузить
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Обнул. все
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Подтверждать перед выполнением
@@ -60,23 +60,23 @@ CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Угол:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Диаметр:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Расстояние Быстро:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача Быстро:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Max. буфер:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача Быстро:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,байт
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Max. буфер:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Maксимальная загрузка последовательного буфера(Ограничте 90% глубины буфера).
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Интервал запроса состояния контроллера, ms."
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Интервал опроса:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Unit,None,False,True,,мс
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Таймаут Сброса:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Интервал опроса:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Unit,None,False,True,,мс
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Таймаут Сброса:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Задержка для запуска контроллера перед началом связи.
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,Дистанция медл.:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача медл.:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,Дистанция шага:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача шага:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Основной
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Охлаждение
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Рабочие Координаты
@@ -113,44 +113,42 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Contr
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Инструмент
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Отфильтровать ответы
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Показывать все ответы
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_aAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось A:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Буферизировать более одного блока G-Code в контроллере для плавного выполнения. Только для grblHAL!
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Агрессивная буферизация
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Удалять лишние элементы G-Code
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Сжимать G-Code при преобразовании
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_bAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось B:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_cAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось C:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Удалять лишние элементы G-Code
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,Ось {0}:
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Против часовой
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,Тест
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,Настроить
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,По часовой
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,Шаг 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Unit,None,False,True,,мм
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,мм
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,Шаг 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,мм
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Unit,None,False,True,,мм
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,Шаг 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Шаг 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Шаг 3:
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Разрешить
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Обдув
 CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Подача:
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Подача:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Подача 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Подача 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Подача 0:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Подача 1:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,Подача 2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Подача 3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Подача 3:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Включите, если ответы Ok засоряют консоль (обычно при отправке большого колличества коротких перемещений)."
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Отфильтровать &quot;ok&quot;
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Отфильтровать ответы
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Полив
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP адрес:
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Удерживать фокус консоли
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Буферизировать более одного блока G-Code в контроллере для плавного выполнения. Только для grblHAL!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Удерживать фокус консоли
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Використати крок UI
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,Машинные координаты
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Туман
@@ -167,6 +165,7 @@ CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Co
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Восстановить размер окна при сдеующем запуске.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Восстановить предыдущий размер окна при загрузке
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,Об/мин
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,Baud rate:
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Порт:
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Загрузить (SG_RESULT)
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Показывать все ответы
@@ -182,18 +181,15 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:Syst
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Включить фильтр (SFILT)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,Статус:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Радиус кончика:
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Инструмент:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Инструмент:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Инструмент:
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Подробный
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Web порт
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Свернуть:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,в:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось X:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось X:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Y:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Y:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Z:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Ось Z:
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Удалить
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Загрузить и вып_олнить
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Разрешить возврат
diff --git a/Locale/ru-RU/csv/CNC.Converters.resources.ru-RU.csv b/Locale/ru-RU/csv/CNC.Converters.resources.ru-RU.csv
index 6704e8f..d7aa31f 100644
--- a/Locale/ru-RU/csv/CNC.Converters.resources.ru-RU.csv
+++ b/Locale/ru-RU/csv/CNC.Converters.resources.ru-RU.csv
@@ -4,8 +4,8 @@ CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Contr
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,Глубина:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача:
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,Скорость погружения:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,мм/мин
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Unit,None,False,True,,мм
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,Быстро:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Label,None,False,True,,Об/мин:
diff --git a/Locale/ru-RU/translation.txt b/Locale/ru-RU/translation.txt
index 10306ac91c5d825bbb2d58ac090b66f2894fad3c..f1f5acd871398aa6ce2fe5fce57029a3043d34e1 100644
GIT binary patch
delta 2102
zcmbVNdrVVj6#vdGt$ko8$}=FgI`K6Lr6`3Vo47Dz0GUpQZem+Xfevder9kF3Ku3r%
zfE?|&8P+f~&KQEsOLo;PsLMhYvlt)S;u8_g{!mPuL$jEL?c6dWEX$ISn|tqf&*MAa
zIp_B~x8;oL`uD2d94+=}?U<vj#7dn9XXxG&Z|c?w7}Q%aS?>|Y^bTQ~i7jL4EFIr+
zF2a!n{q$9AJ9E=j%1W3Izi5w1U&##2!77-IRg$iZzG~>Jk}d<YlbwN8v2xPXke7i~
z)6*yG@v9Xv*gZS?V*}~Dr16oJY(06e3i38kEF1ZikY3)mlx&ijhD|Z@gjgQt#WO23
z@;TC{cn<MY#I~2>)0u@1MB7m^a?*afy_BYt)uF9x)`C*D@r8se^C%(Nt}>KH6(uR#
z`}myw5T%>wJm+D&ZY8Pz!yryfH0FgJ8ki4CxmRg?M?S=Hs{rb}aj)^-<WR_Js@&w@
z&!q+mZ=)WRvP`o0H>r3w>4+faE*Sx_e9<6?DNA!eypTLBV4>MfcNjiSwPR9hF`h7a
zurak#>^BF)Ma!y-g2K#9{E{8w0^wj0dtYxBM0M^lmAJ0pFo=D5K@dmR_DsjF;%C@y
z{T*AZszZmj00y@{68G40l~`Ej#|zGS94K?)#c~g(mIuY`3P%_UZaa2uvx*LPq6V$C
z_pq^MP<*4#qQQl`dZ`*|%#8brjM&-OBwpRs2PiaoaqlO!qQB{74eHwhid2@0kYL2K
ztp#FN+rltheZZ?sB}WrB+%ThOC_!vHa5X}i!A!)0bHB#%U?He6`KU{2Vks;Q8#WlR
zK0%FvFa2W2(YIBQhPKz2;@Ma=8jfe-qn>i{{P7>=qHx8H?UyS>&y^fOL4Crt&LuLV
zbQ2hbE5&$oehBN;^pvq)M`-nj))myd@eUa#0L?%ktKwS|A!?b1P1RNG{wYlX>1d3e
zPq}C#N(l)01O*$xu9|>R${W^0eBvY#p=9zmuDMo=gIB%y?X}0KzSWN(-EiX3n|2(y
zRgAgxP8uA*VUoq(aA4nclHc}W#~nZB-E-oMVL$c^)new54?TBX*gWjTq&u~E{jOKB
zoLTVF=savoRAcA+dR%xrh|h+7;)#3ND%||QiudoksiJ1yumOyiGLlWrvJef78AOBP
zE!3@{2a83|$k;S=K3Rk3M>|pbG!uKDY()2Hv6%a`Kb)Xqp^l&1WJJ#?{W}x6x}Iub
zletL=7ZAJU(WhaBa#cdKG_ZHs3!5#}E*lL&8?{9qcRuov2ViIqY*;ZXLmpgH_7;*E
zZ&pGJ4^zTku2MifZw!Ooyh#Dic(e+9R0j+02+j*6!pyjdX^f*xp1f{W&F{>F7%0U#
z4`Yn-xR(2DAjNh%rwq5}v#Wwu4j!=qqT=PW+=NEixQ@N{cM_pt_dm9Y`{y>(nU;uU
zA`(VqnWTOd3<6KmKqEh>hGsrP3$^@+23%6J7K%Y(Vi|ZT@m1-5I3xrAMF#^?tRDVQ
z^6qFj%)g6-P97Nvy@6=x=7ljNazsIgG#Ue+Dx{tS@{#t&!(5PV&W4lWd~`8*`ToV=
zkX%b(UA)w|8cxeG%tYX|lKxHbft0ldQWSv#=;H2tXqP$*z@^~>MewzfxKAW*wHSGF
z5d@^2o1k|ZzibB=57^*m{)&xOSta1+E;~4-V<pfAyvPYwo=^tPfD?*%M=3aXpA*W7
zdFRF!@ZK`8NW06RR>$2{u$hl}!6OY+!H)t>sSIrWEgcJuYMxaC%PG2<rSPo?v-xR1
zWJ}%}$c^FstyHhHR@lQ&w!ltlc^jM;q+*1b3h6=s+Jw;mVcED_{b!IV#U6xXp=reb
iY=?PZ!+rB-asB5+nXZUP^#?TIKBWJF^i2m`7XAXbg>vZt

delta 1133
zcmYL|ZA_b06vv<Q^o3GNd2#NAA@VYZxB)E`Xd5J>Lo`MiB0(};WnBZMFji}`l-Ur6
zjG1L2z+pXvnWi9Fv{?w_E<R*2h+h`65M2xsLuvu(5EBD|n2i}+yx<2voqO*6=bW71
zx&MV3WzToYaf=#9)vahz+wjx44=^###lmqlBKBxqn5S)E&$M<?VG@jjk@ANji$(@v
zAC%LX0348&3ug9D^7#Z-nN=YN6XkLN*l2hVo(IdGB;F#Jg?K?Nm;}9`qaSl22fxXl
zV`5HFWY=?-fQ=mc6IfgR3E)jkf?>Bw2Aun^#>u@J@{_y<3+YxxoHn?z!C*r}krR6h
z<@ncTB1WF<!@9z+SfD7NVVc*%A}h5#6xrJAAtf_Z2Z8lhjRKp0=XN~vo)rPRKHNsH
zZ412(JIr~mQh_fwci@=Ai?^Dc*x?LfqSM9FTWoTSUTDD13pQ5aN{hwHOA)lSN7<22
zjIpS_5>gZi1%e)j-_ORL&(zr4<ztgq?gB=xda>=Qi`9O9l<WFEc&X3Ny84gGF_k(n
z<ae_n8cR}e8iE1OzL$Z$W)&(!7olW#^h1<h2P$m)+R413dL>%!IB<5{%|dr(GjVOs
zf$ljstNz)-;r)^)!?Can&0#mD{kny#%Y1{&jW`=|VA`@BA1^kbVbO-kk#EtzXvNy4
z8Ju2Sz&C#LV0YAm+Nc-jA9-<#=R+$Vv_0bScMs}T<hT=cVAZM{3sxGLcCAc_6YCBr
z!H-go^)0C=T@UFPSl6O&qZ$ux*uQ+Rp~8x%R@}cGz#pDe;`p{4x3+6|EMvi^(;Bj?
zpp%@j@Ha(O&`seOxJI=x{A5>yN2V7FaPw8YbV36Wpb;%}b36qcPq`(V9%`YUf(hW1
z=>*d*u>L>P{v43g=>({h)QMmPnoEZJk|POPK^l4vb`-Rb0^?*(fgmlU!WVSyFx)2p
zAsD6NR2Y>mz5s(VsWcNZLDFVG9!S<KnAGqOSSXZWd1E%Znlv=6gX6Mdp%5?k6;X{2
zilsFj)E$<#--i1jmAwV`K$<!QIvM}?n>Fwf-F+9@XuSqTq$9Q9h@}cE+@ot}U{ZQ!
zh4C2BQ<4U<DcAxUs&0Z}I@kpBG~)oftb`NT9rpjXdIz*g$D5%S=vFJ(Dcr)1)!72|
zG9&lV_ouiMxww=nTKRoy3p7$$D<~!PdGN$>dU~N4FE8ifRF#Sn+rda3UN|ki*$zL6
z<oAJ9q2qu}l!TCv>945Jm8FuVeBe7kr8mGw69arf<^k|ZlQ-ajNO{AMNx?xdN*#l+
rUxuBJGil-`PkV2|fXFvfNO2#-i&Pl^vy4OBbFsv;s3`Re!>sr(&AYcZ

diff --git a/Locale/uk-UA/csv/CNC.Controls.Camera.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.Camera.resources.uk-UA.csv
new file mode 100644
index 0000000..e68bf90
--- /dev/null
+++ b/Locale/uk-UA/csv/CNC.Controls.Camera.resources.uk-UA.csv
@@ -0,0 +1,12 @@
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,btn_getPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Поточна позиція
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_moveOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перемістити
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,btn_useAsProbe:System.Windows.Controls.ContentControl.Content,Button,True,True,,Позиція зонда
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_confirmMove:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Подтверджувати переміщення
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,chk_moveToSpindle:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Початкове переміщення до шпінделя.
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_xOffset:CNC.Controls.NumericField.Label,None,False,True,,Зміщення X:
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,fld_yOffset:CNC.Controls.NumericField.Label,None,False,True,,Зміщення Y:
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Камера
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,lbl_cameraToSpindlePosition:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Камера у поз. шпінделя
+CNC.Controls.Camera.g.en-US.resources:configcontrol.baml,lbl_offsetMotion:System.Windows.Controls.ContentControl.Content,Label,True,True,,Зміщення координат:
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveCameraTo:System.String.$Content,None,True,True,,Перемістити камеру в позицію шпінделя?
+CNC.Controls.Camera.g.en-US.resources:cameracontrol.baml,str_moveSpindleTo:System.String.$Content,None,True,True,,Перемістити шпіндель в позицію камери?
diff --git a/Locale/uk-UA/csv/CNC.Controls.DragKnife.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.DragKnife.resources.uk-UA.csv
new file mode 100644
index 0000000..f05908d
--- /dev/null
+++ b/Locale/uk-UA/csv/CNC.Controls.DragKnife.resources.uk-UA.csv
@@ -0,0 +1,18 @@
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Скасувати
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,dlg_dragKnife:System.Windows.Window.Title,Title,True,True,,Параметри флюгерного ножа
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,Глибина:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_cutDepth:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_dentLength:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_dentLength:CNC.Controls.NumericField.Label,None,False,True,,Довжина ножа:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractAngle:CNC.Controls.NumericField.Label,None,False,True,,Кут відвода:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractAngle:CNC.Controls.NumericField.Unit,None,False,True,,град
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractDepth:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_retractDepth:CNC.Controls.NumericField.Label,None,False,True,,Заглиблення відвода:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_swivelAngle:CNC.Controls.NumericField.Label,None,False,True,,Кут спіралі:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_swivelAngle:CNC.Controls.NumericField.Unit,None,False,True,,град
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_tipOffset:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,fld_tipOffset:CNC.Controls.NumericField.Label,None,False,True,,Зміщення кіньчика:
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_knife:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Ніж
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,grp_retract:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Відхід
+CNC.Controls.DragKnife.g.en-US.resources:dragknifedialog.baml,lbl_retractEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Дозволити відвод
diff --git a/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
new file mode 100644
index 0000000..7ff8fbe
--- /dev/null
+++ b/Locale/uk-UA/csv/CNC.Controls.Probing.resources.uk-UA.csv
@@ -0,0 +1,171 @@
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_addPosition:System.Windows.Controls.ContentControl.Content,Button,True,True,,Додати _точку
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_addProfile:System.Windows.Controls.ContentControl.Content,Button,True,True,,...
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Застосувати
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_apply:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Застосувати
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистити
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_fromLimits:System.Windows.Controls.ContentControl.Content,Button,True,True,,По границі обробки
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.Controls.ContentControl.Content,Button,True,True,,Переміщення клавіатурою
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,btn_jog:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift для активації
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Завантажити
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Виміряти
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_Зберегти
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Зміщення (G92)
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Measure
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Використати камеру.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Центр X0,Y0"
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,Глибина:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зміщення точки вимірювання по Z від поточної позіції.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_diameter:CNC.Controls.NumericField.Label,None,False,True,,Діаметр:
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,fld_distance:CNC.Controls.NumericField.Label,None,False,True,,Крок
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_fixture:CNC.Controls.NumericField.Label,None,False,True,,Оснастка:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_offset:CNC.Controls.NumericField.Label,None,False,True,,Зміщення:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_offset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Відстань від кута до зонда
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_passes:CNC.Controls.NumericField.Label,None,False,True,,Повторити:
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_passes:CNC.Controls.NumericField.Unit,None,False,True,,
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetX:CNC.Controls.NumericField.Label,None,False,True,,X:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetX:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зміщення по X зонда від інструмента 
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetY:CNC.Controls.NumericField.Label,None,False,True,,Y:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_probeOffsetY:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зміщення по Y зонда від інструмента
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_touchPlate:CNC.Controls.NumericField.Label,None,False,True,,Контактна площадка:
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Controls.NumericField.Label,None,False,True,,размер X:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,Кліренс XY:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Початкова позиція далеко від поверхні вимірювання
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Размер Y:
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Клікніть по границі для вибора операції вимірювання.
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Клікніть по границі, куту або центру для вибора операції вимірювання."
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Клікніть по границі, куту або центру для вибора операції вимірювання."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Нажміть для вибора операції вимірювання.
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Дія
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Камера
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Кліренс зонда
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_dimensions:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Разміри заготовки
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_distanceAndSpeed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Дистанція і швидкість вимірювання
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,grp_gridSize:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Розмір мережі
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Кількість повторень
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_passes:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зазвичай потрібно більше одного вимірювання для підвищення точності.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_prbeProperties:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Зміщення зонда по XY
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grp_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Перед-перегляд
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,grp_probeArea:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Область вимірювання
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,grp_probeConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Вимірювання
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_probeTipOrTool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Виміряти кінець/інструмент
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Нажміть для вибора центра повороту, якщо не выбрао поворот відносно X0,Y0."
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Центер поворота
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Висота площадки/зонда
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Заготовка
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Зміщєння заготовки
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Перед-перегляд
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Додати зміщення
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перевіряти стан щупа перед стартом (G59.3)
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Аварія будет активована контролером, у разі спрацювання не активованого щупа."
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Відміна корекцію довжини
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Висота
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,Висота
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,дистанція пошуку:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Відстань відскоку для повторного повільного вимірювання. 0 для пропуска.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Подача другого, повільного руху вимірювання "
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,Подача пошуку:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Зв'язати
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Розблокируйте та встановіть X або Y в 0 для вимірювання за однією віссю.
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Зв'язати
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Пауза перед виміром
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перед-перегляд
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перед-перегляд
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перед-перегляд
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Перед-перегляд
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Виміряти оснастку @ G59.3
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Вимірювати по Z
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Вимірювати по Z
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_probingDistance:CNC.Controls.NumericField.Label,None,False,True,,Дистанція вимірювання:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_probingDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,Max. дистанція вимірювання
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windows.Controls.ContentControl.Content,Label,True,True,,Профіль:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Подача швидкого руху. 0 для використання налаштувань контролера
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,Подача швидких перемещень:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Подача для попереднього вимірювання
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Подача пошуку:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Установка системы координат або зміщення
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Встановити вихвдне зміщення
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Z = 0 і точці X0Y0:
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_width:CNC.Controls.NumericField.Label,None,False,True,,W:
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_withTool:System.Windows.Controls.ContentControl.Content,Label,True,True,,з інструментом:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_add:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Додати
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Видалити
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,mnu_update:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Обновити
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,set_coord:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Система координат:
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_cameraPosition:System.String.$Content,None,True,True,,"Позиція камери {0}, X: {1}, Y: {2}"
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderClearance:System.String.$Content,None,True,True,,Кліренс вимірювання XY надто великий для деталі размером {0}.
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderCompleted:System.String.$Content,None,True,True,,"Вимірювання завершено: відстань X  {0}, відстань Y {1}."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderFailed:System.String.$Content,None,True,True,,Помилка вимірювання
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderInitFailed:System.String.$Content,None,True,True,,Помилка ініціалізації!
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_CenterFinderInstructions:System.String.$Content,None,True,True,,"Клікніть на зображенні, для вибора операції вимірювання.\\nУстановіть щуп приблизно над центром заготовки перед запуском."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderPass:System.String.$Content,None,True,True,,"Вимірювання, прохід {0} из {1}..."
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderType:System.String.$Content,None,True,True,,Визначте тип вимірювання кліком на відповідному зображенні вище.
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_centerFinderWpSize:System.String.$Content,None,True,True,,Размір заготовки {0} не може бути 0.
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderCompleted:System.String.$Content,None,True,True,,Вимірювання завершено.
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderFailed:System.String.$Content,None,True,True,,Помилка вимірювання
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderInitFailed:System.String.$Content,None,True,True,,"Помилка вимірювання, позиція станка невідома."
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_EdgeFinderInstructions:System.String.$Content,None,True,True,,"Клікніть по границі, куту або центру на зображенні, для вибора операції вимірювання.\\nПеремістіть щуп в позицию, що відмічено зеленою крапкою перед запуском."
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,str_edgeFinderType:System.String.$Content,None,True,True,,Визначте грань або кут для вимірювання кліком на відповідній частині изображения вище.
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderCompleted:System.String.$Content,None,True,True,,Вимірювання завершено.
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderFailed:System.String.$Content,None,True,True,,Помилка вимірювання
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderInitFailed:System.String.$Content,None,True,True,,"Помилка вимірювання, позиція станка невідома."
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderInstructions:System.String.$Content,None,True,True,,"Клікніть по границі, куту або центру на зображенні, для вибора операції вимірювання.\\nПеремістіть щуп в позицию, що відмічено зеленою крапкою перед запуском."
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,str_edgeIntFinderType:System.String.$Content,None,True,True,,Визначте грань або кут для вимірювання кліком на відповідній частині изображения вище.
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapCompleted:System.String.$Content,None,True,True,,"Вимірювання завершено: Z min: {0}, Z max: {1}."
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapFailed:System.String.$Content,None,True,True,,Помилка вимірювання
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstructions:System.String.$Content,None,True,True,,"Швидке переміщенння в X0Y0 перед началом вимірювання мапи висот.\\nПереконайтесь, шо позиція по Z в положенні вільному від завад."
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,Переміщення клавіатурою включене
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,Переміщення клавіатурою вимкнено
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,Необхідно задати {0} точок вимірювання.
+CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Вимірювання...
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Дистанція вимірювання повинна бути білтша за Кліренс XY + ½ діаметра щупа.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Аварія при вимірюванні, скиньте аварію на вкладинці Grbl."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedCancelled:System.String.$Content,None,True,True,,Вимірювання прервано/помилка.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapMinSize:System.String.$Content,None,True,True,,Мапа висот повинна складатись мінімум з 4 точок.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingHeigthMapNarrow:System.String.$Content,None,True,True,,Мапа висот не може бути нескінченно вузькю.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingIllegalPosition:System.String.$Content,None,True,True,,"Невірна позиція зонда, спробуйте іньшу."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceError:System.String.$Content,None,True,True,,Дистанція пошуку повинна бути меньша за дистанцію вимірювання.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Помилка вимірювання, позиція станка невідома."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Помилка вимірювання, зонд не подключений."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Помилка вимірювання, Grbl не в режимі ГОТОВ або зміна інструмента."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Помилка вимірювання, неочікуваний сигнал від зонда."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,GCode містить дуги у площині XZ або YZ (G18/19). Трансляція неможлива. Використовуйте &apos;Arcs to Lines&apos; за потреби трансляції.
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Вимірювання завершено.
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,Помилка вимірювання
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInitFailed:System.String.$Content,None,True,True,,Кут: {0} град
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInstructions:System.String.$Content,None,True,True,,"Клікніть по границі на зображенні, для вибора операції вимірювання.\\nПеремістіть щуп в позицию, що відмічено зеленою крапкою перед запуском."
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationType:System.String.$Content,None,True,True,,Визначте грань для вимірювання кліком на відповідній частині изображения вище.
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_runMacro:System.String.$Content,None,True,True,,Виконати макрос {0}?
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthCompleted:System.String.$Content,None,True,True,,Вимірювання завершено.
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthFailed:System.String.$Content,None,True,True,,Помилка вимірювання
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,str_toolLengthInitFailed:System.String.$Content,None,True,True,,Вісь необхідно базувати перед вимірюванням оснастки!
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Center:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Пошук центра
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeExternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Внутрішній край
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_edgeInternal:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Зовнішний край
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_heightmap:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Мапа висот
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_Rotation:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Поворот
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,tab_toolOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Корекція інструмента
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,txt_warning:System.Windows.Documents.Run.Text,Text,True,True,,Увага! Використовуйте обережно - невірні параметри можуть призвести до пошкодження зонда!
diff --git a/Locale/uk-UA/csv/CNC.Controls.Viewer.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.Viewer.resources.uk-UA.csv
new file mode 100644
index 0000000..71d522c
--- /dev/null
+++ b/Locale/uk-UA/csv/CNC.Controls.Viewer.resources.uk-UA.csv
@@ -0,0 +1,41 @@
+CNC.Controls.Viewer.g.en-US.resources:viewer.baml,btn_resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сброс вид
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Label,None,False,True,,Відрізків дуги:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,сегментів
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,Min. дистанція:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,Діаметр інструмента:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Діаметр інструмента за замовчанням
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolScalePct:CNC.Controls.NumericField.Unit,None,False,True,,%
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Просмотр G-Code
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Чорний фон
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_cutColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Колір обробки:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Дозволити
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_gridColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Колір мережі:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Підсвітка:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_highlightCompleted:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Підсвічувати виконане
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_rapidsColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Колір швидких переміщень:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_retractColor:System.Windows.Controls.ContentControl.Content,Label,True,True,,Колір відвода:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showAxes:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Осі
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showBbox:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Границі обробки
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showCoordSys:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Система координат:
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showGrid:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Сітка
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showOverlay:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Текстовые данные
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,ViewCube
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_toolAutoScale:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Масштаб. інструмент
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Встановити вид за замовчанням (Ctrl+V)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/ResetView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/RestoreView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Відновити вид (Ctrl+R)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зберегти налаштування відображення
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключити зображення сітки (Ctrl+G)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/GridOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/JobBoxOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключити зображення границь обробки (Ctrl+J)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключити зображення робочего поля (Ctrl+W)
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/WorkBoxOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Переключити зображення вісей
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/XYZOn.png
+CNC.Controls.Viewer.g.en-US.resources:renderer.baml,str_toolCone:System.String.$Content,None,True,True,,Конус
+CNC.Controls.Viewer.g.en-US.resources:renderer.baml,str_toolCrosshair:System.String.$Content,None,True,True,,Перехрестя
+CNC.Controls.Viewer.g.en-US.resources:renderer.baml,str_toolNoShow:System.String.$Content,None,True,True,,Без зображ.
diff --git a/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
new file mode 100644
index 0000000..67d9092
--- /dev/null
+++ b/Locale/uk-UA/csv/CNC.Controls.WPF.resources.uk-UA.csv
@@ -0,0 +1,275 @@
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_add:System.Windows.Controls.ContentControl.Content,Button,True,True,,Додати
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_backup:System.Windows.Controls.ContentControl.Content,Button,True,True,,Архів
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Скасувати
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Скасувати
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Скасувати
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Скасувати
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистити
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистити все
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_clear:System.Windows.Controls.ContentControl.Content,Button,True,True,,Очистити все
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,Поточна позиція
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_currPos:System.Windows.Controls.ContentControl.Content,Button,True,True,,Поточна позиція
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+R
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_cycleStart:System.Windows.Controls.ContentControl.Content,Button,True,True,,Пуск
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,btn_edit:System.Windows.Controls.ContentControl.Content,Button,True,True,,Редагувати
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Пробіл
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_feedHold:System.Windows.Controls.ContentControl.Content,Button,True,True,,Без Руху
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatus:System.Windows.Controls.ContentControl.Content,Button,True,True,,Зчитати статус
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,btn_getStatusAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Зчитати статус усіх
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,btn_go:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,btn_go:System.Windows.Controls.ContentControl.Content,Button,True,True,,Старт
+CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG28:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перейти в G28
+CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перейти в G30
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,База
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Перечитати налаштування з контролера.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Перечитати
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,Сброс
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Відновити
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,На початок
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Зберегти
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зберегти зміни в контролері.
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Зберегти
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Зберегти налаштув.
+CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Відправити
+CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст.
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст. усі
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Уст. усі
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Стоп
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Копіювати версію grbl та налаштування в буфер
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,Копіювати
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,Розблок.
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Загрузити
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Обнул. Все
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Підтверджувати виконання
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,dgr_sdcard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Клікніть правою кнопкою для меню, подвійний клік для виконання файла."
+CNC.Controls.WPF.g.en-US.resources:about.baml,dlg_about:System.Windows.Window.Title,Title,True,True,,Про програму
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_connection:System.Windows.Window.Title,Title,True,True,,Підключення контролера
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,dlg_macroEditor:System.Windows.Window.Title,Title,True,True,,Редактор Макросів
+CNC.Controls.WPF.g.en-US.resources:consolewindow.baml,dlg_senderConsole:System.Windows.Window.Title,Title,True,True,,Консоль контролера
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,dlg_title:System.Windows.Window.Title,Title,True,True,,Підключення контролера
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Unit,None,True,True,,градуси
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,Кут:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,Діаметр:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,Відстань Швидко:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача Швидко:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,байт
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,Max. буфер:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Maксимальна загрузка послідовного буфера (Обмежтесь 90% глубини буфера).
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Інтервал опитування стану контролера, ms."
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Unit,None,False,True,,мс
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Інтервал опитування:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Unit,None,False,True,,мс
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Затримка Сброса:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Затримка для запуска контролера перед началом зв'язку.
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,дистанція повілно:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача повілно:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,дистанція кроку:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача кроку:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Основний
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Охолоджування
+CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Робочі Координати
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,grp_feedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Подача
+CNC.Controls.WPF.g.en-US.resources:stripgcodeconfigcontrol.baml,grp_gcodeStrip:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Обрізка команд G-Code
+CNC.Controls.WPF.g.en-US.resources:gotocontrol.baml,grp_goto:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Перехід
+CNC.Controls.WPF.g.en-US.resources:jogbasecontrol.baml,grp_jogDistance:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Відстань переміщєння
+CNC.Controls.WPF.g.en-US.resources:jogbasecontrol.baml,grp_jogFeedrate:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Подача
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,grp_kbdJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Переміщення клавіатурою
+CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,grp_mdi:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Консоль
+CNC.Controls.WPF.g.en-US.resources:outlinecontrol.baml,grp_outline:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Границі
+CNC.Controls.WPF.g.en-US.resources:limitscontrol.baml,grp_programLimits:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Границі обрабки
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Нажміть для вибора центра повороту, якщо не выбрао поворот відносно X0,Y0."
+CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,grp_rotationCenter:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Центер поворота
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,grp_signals:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Сигнали
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,grp_spindle:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Шпиндель
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,grp_stallGuard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Захист зупинки
+CNC.Controls.WPF.g.en-US.resources:jogcontrol.baml,grp_uijog:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Пульт
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,grp_uiJogging:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Екранний пульт
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,grp_workparams:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Параметри Обробки
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Код
+CNC.Controls.WPF.g.en-US.resources:grblalarmlist.baml,hdr_alarmMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Аварія
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_block:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Блок
+CNC.Controls.WPF.g.en-US.resources:gcodelistcontrol.baml,hdr_data:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Дані
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorCode:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Код
+CNC.Controls.WPF.g.en-US.resources:grblerrorlist.baml,hdr_errorMessage:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Помилка
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_name:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Им'я
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,hdr_offset:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Зміщення
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingId:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Id
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingName:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Им'я
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingUnit:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Одиниці
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,hdr_settingValue:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Значення
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Розмір
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,Інструмент
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Фільтрація відповідей
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Відображати усі відповіді
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Буферизувати більше одного блока G-Code в контролері для плавного виконання. Лише для grblHAL!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Агресивна буферизація
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Стискати G-Code при претворенні
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Видаляти зайві елементи G-Code
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,Вісь {0}:
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Проти часу
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,Тест
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,Налаштувати
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,За часом
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,Крок 0:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,Крок 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,Крок 2:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,Крок 3:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Дозволити
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Обдув
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Подача:
+CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,Подача:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,Подача 0:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,Подача 1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,Подача 2:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,Подача 3:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,"Увімкніть, коли відровіді Ok заважають у консолі (зазвичай при великій кількоспі коротких переміщень)."
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Видалити &quot;ok&quot;
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Фільтрація відповідей
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Полив
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP адреса:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Буферизувати більше одного блока G-Code в контролері для плавного виконання. Лише для grblHAL!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Утримувати фокус консолі
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Использовать шаг UI
+CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,Машинні координати
+CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Туман
+CNC.Controls.WPF.g.en-US.resources:mpgpending.baml,lbl_mpgModeActive:System.Windows.Controls.ContentControl.Content,Label,True,True,,"Штурвал активен, ожидание деактивации штурвала..."
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_netPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Порт:
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.ContentControl.Content,Label,True,True,,"Нема жобного макроса, використайте кнопку Редаг. щоб створити макрос."
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,lbl_noMacrosDefined:System.Windows.Controls.TextBlock.Text,Text,True,True,,"Нема жобного макроса, використайте кнопку Редаг. щоб створити макрос."
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_off:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Відкл.
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,Зміщення:
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_offset:System.Windows.Controls.ContentControl.Content,Label,True,True,,Зміщення:
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_onConnect:System.Windows.Controls.ContentControl.Content,Label,True,True,,Зв'язок відсутній:
+CNC.Controls.WPF.g.en-US.resources:overridecontrol.baml,lbl_override:System.Windows.Controls.ContentControl.Content,Label,True,True,,Корекція
+CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Controls.ContentControl.Content,Label,True,True,,Швидкі переміщєння:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Відновити размір вікна при наступному запуску.
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Відновити попредьній розмір вікна при старті
+CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,Об/хв
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,Baud rate:
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,Порт:
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Загрузить (SG_RESULT)
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Відображати усі відповіді
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalBlockDelete:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Видалити блок
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalCycleStart:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Запуск програми.
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalEStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,E-Stop
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalFeedHold:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Заборона руху
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalMotorWarning:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Попередження мотора
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalOptionalStop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Не обов'язкова зупинка
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalProbe:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Зонд
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalReset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Сброс
+CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Двері безопеки
+CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Увімкнути фільтр (SFILT)
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,Статус:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Радіус кіньчика:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Інструмент:
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,Інструмент:
+CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Детальний
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Web порт
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Згорнути:
+CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,в:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Вісь X:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Вісь Y:
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Вісь Z:
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Видалити
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Завантажити з вик_онанням
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Дозволити повернення
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_run:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Пуск
+CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,msg_restart:System.String.$Content,None,True,True,,Зміни налаштувань почнуть діяти після перезапуска програми!
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,pnl_kbdJogging:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Увага! - Grbl має помилки при перериванні переміщення (при відпусканні клавиш).
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreate:System.String.$Content,None,True,True,,Файл конфігурації не існує або пошкоджено. Створити новий?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfCreateFail:System.String.$Content,None,True,True,,Помилка збереження файла налаштувань.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_appconfNoConnect:System.String.$Content,None,True,True,,Неможливо встановити з'єднання ({0})
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_checking:System.String.$Content,None,True,True,,Перевірка…
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,str_clearEStop:System.String.$Content,None,True,True,,Відключіть E-Stop перед &lt;Скинути&gt;&gt;
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_convBlockOfBlocks:System.String.$Content,None,True,True,,Блок: {0}/{1}
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_convNumBlocks:System.String.$Content,None,True,True,,Блоки: {1}
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_deleteFile:System.String.$Content,None,True,True,,Видалити {0}?
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_downloadAndRun:System.String.$Content,None,True,True,,Завантажити та виконати {0}?
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_downloading:System.String.$Content,None,True,True,,Завантаження {0}...
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_g28g30:System.String.$Content,None,True,True,,Програма містить переміщення G28/G30. Станок не базовано!
+CNC.Controls.WPF.g.en-US.resources:gotoflyoutcontrol.baml,str_gotoFlyout:System.String.$Content,None,True,True,,_Перейти
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateAlarm:System.String.$Content,None,True,True,,Аварія
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateCheck:System.String.$Content,None,True,True,,ТЕСТ
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateDoor:System.String.$Content,None,True,True,,ДВЕРІ
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateHold:System.String.$Content,None,True,True,,ЗУПИНКА
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateHome:System.String.$Content,None,True,True,,БАЗА
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateIdle:System.String.$Content,None,True,True,,ГОТОВ
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateJog:System.String.$Content,None,True,True,,ПЕРЕМІЩ.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateRun:System.String.$Content,None,True,True,,АВТО
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateSleep:System.String.$Content,None,True,True,,СОН
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateTool:System.String.$Content,None,True,True,,ІНСТРУМ.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_grblStateUnknown:System.String.$Content,None,True,True,,НЕВИЗНАЧ.
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_illegalName:System.String.$Content,None,True,True,,"Файл: {0}\\n!,?,~ та ПРОБІЛ не підтримуються в імені файла."
+CNC.Controls.WPF.g.en-US.resources:jogflyoutcontrol.baml,str_jogFlyout:System.String.$Content,None,True,True,,_Пульт
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_keymappingsSaved:System.String.$Content,None,True,True,,Прив'язку клавіш збережено у {0}
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_macrosFlyout:System.String.$Content,None,True,True,,_Макрос
+CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,str_mposFlyout:System.String.$Content,None,True,True,,Маш._координати
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgBadResponseExit:System.String.$Content,None,True,True,,"Unexpected response received from controller: {0}, exiting."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Двері не зачинено, вийти?"
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Двері відчинено, зачинити та продовжити?"
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Статус дверей не можливо очистити &lt;Reset&gt;
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop активний! - відключіть для продовження…
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgEStopExit:System.String.$Content,None,True,True,,E-Stop активний! Вийти?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgHome:System.String.$Content,None,True,True,,"Необхідно виконати базування, &lt;База&gt; для продовження"
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoComm:System.String.$Content,None,True,True,,Контролер не відповідає. Стан контролера {0}. Перезапустити?
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,Аварія контролера {0}. Перезапуск…
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Контролер не відповідає!
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgNoResponseExit:System.String.$Content,None,True,True,,"No response received from controller, exiting."
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgResetExit:System.String.$Content,None,True,True,,Помилка перезапуску. Програму буде завершено.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgResetFailed:System.String.$Content,None,True,True,,Помилка перезапуску. Програму буде завершено.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_msgWait:System.String.$Content,None,True,True,,#N/A
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_notConnection:System.String.$Content,None,True,True,,Зв'язок відсутній.
+CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,str_outlineFlyout:System.String.$Content,None,True,True,,_Границі
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_pause:System.String.$Content,None,True,True,,Пауза
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateG17G18Arcs:System.String.$Content,None,True,True,,GCode містить дуги у площині XZ або YZ (G18/19). Трансляція неможлива. Використовуйте &apos;Arcs to Lines&apos; за потреби трансляції.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_rotateRadiusArcs:System.String.$Content,None,True,True,,GCode містить дуги у радіусній формі.  Трансляція неможлива. Використовуйте &apos;Arcs to Lines&apos; за потреби трансляції.
+CNC.Controls.WPF.g.en-US.resources:macroexecutecontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Виконати макрос {0}?
+CNC.Controls.WPF.g.en-US.resources:macrotoolbarcontrol.baml,str_runMacro:System.String.$Content,None,True,True,,Виконати макрос {0}?
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_saveSettings:System.String.$Content,None,True,True,,Налаштування змінено. Зберегти зараз?
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsError:System.String.$Content,None,True,True,,"Установка {0} повернула {1}, продовжити?"
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsFail:System.String.$Content,None,True,True,,Помилка...\\nПродовжити завантаження?
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsInvalid:System.String.$Content,None,True,True,,Файл не містить бідьяких налаштувань.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsRestore:System.String.$Content,None,True,True,,Відновити налаштування з файла
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_settingsSaved:System.String.$Content,None,True,True,,Налаштування збережено.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsTimeout:System.String.$Content,None,True,True,,"Перевищєно час при встановленні {0}, продовжити?"
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,str_settingsWritten:System.String.$Content,None,True,True,,Усі налаштування збережено у {0} в папцы програми.
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_stop:System.String.$Content,None,True,True,,Стоп
+CNC.Controls.WPF.g.en-US.resources:thcmonitorcontrol.baml,str_ThcFlyout:System.String.$Content,None,True,True,,_THC монітор
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_toolchanges:System.String.$Content,None,True,True,,"Програма містить {0} зміни інструмента M6, лише деякі версії Grbl підтримують цю команду."
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_toolchangeTLO:System.String.$Content,None,True,True,,"Програма містить {0} зміну інструмента, потрібно встановити точку відліку довжини інструмента перед стартом."
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_transferAborted:System.String.$Content,None,True,True,,Передачу перервано.
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,str_transferComplete:System.String.$Content,None,True,True,,Передача завершена.
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_transferDone:System.String.$Content,None,True,True,,Передача завершена.
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_transferring:System.String.$Content,None,True,True,,Предано {0} з {1} байт...
+CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,str_uploading:System.String.$Content,None,True,True,,Загрузка...
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMax:System.String.$Content,None,True,True,,Помилка ввода: max. значення {0}.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateMin:System.String.$Content,None,True,True,,Помилка ввода: min. значення {0}.
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateNotIP4:System.String.$Content,None,True,True,,Помилка ввода: невірний формат IP4 адреси..
+CNC.Controls.WPF.g.en-US.resources:libstrings.baml,str_validateRange:System.String.$Content,None,True,True,,Помилка ввода: дозволений діапазон {0} - {1}.
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_alarms:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Коди аварій
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,tab_errors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Коди помилок
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_network:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Мережа
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,tab_serial:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Послідовний порт
+CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line1:System.Windows.Documents.Run.Text,Text,True,True,,Виконати переміщення по границям обробки по X та Y.
+CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,txt_line2:System.Windows.Documents.Run.Text,Text,True,True,,"Упевніться, що путь інструмента вільний!"
+CNC.Controls.WPF.g.en-US.resources:errorsandalarms.baml,wnd_errorsAndAlarms:System.Windows.Window.Title,Title,True,True,,Коди аварій та помилок контролера
diff --git a/Locale/uk-UA/csv/CNC.Converters.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Converters.resources.uk-UA.csv
new file mode 100644
index 0000000..c444ca7
--- /dev/null
+++ b/Locale/uk-UA/csv/CNC.Converters.resources.uk-UA.csv
@@ -0,0 +1,18 @@
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,bn_cancel:System.Windows.Controls.ContentControl.Content,Button,True,True,,Скасувати
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,Глибина:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,Подача:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,Швидкість  занурення:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,мм/хв
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,Швидко:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Label,None,False,True,,Об/хв:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Unit,None,False,True,,
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_toolChange:CNC.Controls.NumericField.Unit,None,False,True,,мм
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_toolChange:CNC.Controls.NumericField.Label,None,False,True,,Зміна інструмента:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_scalingFactors:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Масштаб
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_spindle_feed:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Шпиндель та подачі
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_tool:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Інструмент
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,grp_zPosition:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,позиція по Z (відносно поверхні заготовки)
diff --git a/Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv b/Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv
new file mode 100644
index 0000000..a8630cc
--- /dev/null
+++ b/Locale/uk-UA/csv/CNC.Core.resources.uk-UA.csv
@@ -0,0 +1,43 @@
+CNC.Core.g.en-US.resources:libstrings.baml,str_contClearResetUnlock:System.String.$Content,None,True,True,,"Очистити,  &lt;Скинути&gt;, &lt;Розблок.&gt; для продовження"
+CNC.Core.g.en-US.resources:libstrings.baml,str_contHome:System.String.$Content,None,True,True,,&lt;База&gt; для продовження
+CNC.Core.g.en-US.resources:libstrings.baml,str_contHomeUnlock:System.String.$Content,None,True,True,,&lt;База&gt; або &lt;Розблок&gt; для продовження
+CNC.Core.g.en-US.resources:libstrings.baml,str_contResetUnlock:System.String.$Content,None,True,True,,&lt;Сброс&gt; і &lt;Розблок&gt; для продовження
+CNC.Core.g.en-US.resources:libstrings.baml,str_contUnlock:System.String.$Content,None,True,True,,&lt;Розблок&gt; для продовження
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcLoadError:System.String.$Content,None,True,True,,Строка: {0}\\nБлок: {1}\\n\\nПродовжити завантаження?
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserAxisError:System.String.$Content,None,True,True,,Конфликт команд осі
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserBadExpr:System.String.$Content,None,True,True,,Помилка у виразі
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserCMDInvalid:System.String.$Content,None,True,True,,Помилковий GCode
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserCmdUnknown:System.String.$Content,None,True,True,,Команда не розпізнана
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserErrE:System.String.$Content,None,True,True,,Параметер E больше за половину хода осі.
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG1NoFeed:System.String.$Content,None,True,True,,G1 - подача не встановлена
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserG6NoP:System.String.$Content,None,True,True,,G4 - відсутній параметр P
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserKlesseqJ:System.String.$Content,None,True,True,,Параметр K повинен бути більше за J!
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66NoPorE:System.String.$Content,None,True,True,,Параметер P або E Відсутній в M66
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserM66PandE:System.String.$Content,None,True,True,,Одночасну використання параметрів P- та E- для M66 неможливе
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserModalGrpError:System.String.$Content,None,True,True,,Порушення модальної группи
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegH:System.String.$Content,None,True,True,,Від'ємний параметр H
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegJ:System.String.$Content,None,True,True,,Від'ємний параметр J
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegK:System.String.$Content,None,True,True,,Від'ємний параметр K!
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNegP:System.String.$Content,None,True,True,,Від'ємний параметер P!
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoG0orG1:System.String.$Content,None,True,True,,G0 або G1 не активні
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoIandorJ:System.String.$Content,None,True,True,,Відсутній параметр I и/або J
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoInvalidQ:System.String.$Content,None,True,True,,Параметр Q відсутній або поза діапазоном
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoK:System.String.$Content,None,True,True,,Відсутній параметр K
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoP:System.String.$Content,None,True,True,,Відсутній параметр P
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoPandorQ:System.String.$Content,None,True,True,,Відсутній параметр P та/або Q
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserNoR:System.String.$Content,None,True,True,,Відсутній параметр R
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserPlaneNotXY:System.String.$Content,None,True,True,,Площина не XY
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserPlaneNotZx:System.String.$Content,None,True,True,,Площина не ZX
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserRadiusErr:System.String.$Content,None,True,True,,Помилка розрахунку радіуса дуги.
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserRless1:System.String.$Content,None,True,True,,Параметр R меньше 1
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserStrip:System.String.$Content,None,True,True,,команда {0} не знайдена. Видалити?
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserStripHdr:System.String.$Content,None,True,True,,Обрізати комманди
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolNoI:System.String.$Content,None,True,True,,Відсутній параметр I
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolNoJ:System.String.$Content,None,True,True,,Відсутній параметр J
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserToolProfile:System.String.$Content,None,True,True,,Інструмент {0} не пов'язаний з зондом
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserUnsupportedCmd:System.String.$Content,None,True,True,,Команда не підтримується
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserWordRepeated:System.String.$Content,None,True,True,,Повторна команда
+CNC.Core.g.en-US.resources:libstrings.baml,str_gcParserZPlus:System.String.$Content,None,True,True,,Команда доступна тільки для осі Z!
+CNC.Core.g.en-US.resources:libstrings.baml,str_joggingOnly:System.String.$Content,None,True,True,,Під час зміни інструмента дозволені лише команди переміщення та деякі системні!
+CNC.Core.g.en-US.resources:libstrings.baml,str_sdStreamComplete:System.String.$Content,None,True,True,,Трансляція з карти SD {0}% закіньчена
+CNC.Core.g.en-US.resources:libstrings.baml,str_serialPortError:System.String.$Content,None,True,True,,Неможливо відкрити COM порт: {0}
diff --git a/Locale/uk-UA/csv/ioSender.resources.uk-UA.csv b/Locale/uk-UA/csv/ioSender.resources.uk-UA.csv
new file mode 100644
index 0000000..f43d08a
--- /dev/null
+++ b/Locale/uk-UA/csv/ioSender.resources.uk-UA.csv
@@ -0,0 +1,52 @@
+ioSender.g.en-US.resources:mainwindow.baml,lbl_jogStep:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Відстань переміщення по-кроково з клавіатури (+&lt;CTRL&gt;).
+ioSender.g.en-US.resources:mainwindow.baml,mnu_about:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Про програму
+ioSender.g.en-US.resources:mainwindow.baml,mnu_briefTour:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Обзор
+ioSender.g.en-US.resources:mainwindow.baml,mnu_camera:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Камера
+ioSender.g.en-US.resources:mainwindow.baml,mnu_close:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Закрити
+ioSender.g.en-US.resources:mainwindow.baml,mnu_errorsAndAlarms:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Коди помилок
+ioSender.g.en-US.resources:mainwindow.baml,mnu_exit:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Вихід
+ioSender.g.en-US.resources:mainwindow.baml,mnu_file:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Файл
+ioSender.g.en-US.resources:mainwindow.baml,mnu_help:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Довідка
+ioSender.g.en-US.resources:mainwindow.baml,mnu_load:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Відкрити
+ioSender.g.en-US.resources:mainwindow.baml,mnu_open:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Відкрити
+ioSender.g.en-US.resources:mainwindow.baml,mnu_openConsole:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Консоль
+ioSender.g.en-US.resources:mainwindow.baml,mnu_save:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Зберегти
+ioSender.g.en-US.resources:mainwindow.baml,mnu_transform:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Перетворити
+ioSender.g.en-US.resources:mainwindow.baml,mnu_usageTips:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Замітки з використання
+ioSender.g.en-US.resources:mainwindow.baml,mnu_videoTutorials:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Відео інструкції
+ioSender.g.en-US.resources:mainwindow.baml,mnu_wiki:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,_Wiki
+ioSender.g.en-US.resources:mainwindow.baml,str_jogStep:System.String.$Content,None,True,True,,Крок переміщення : {0}
+ioSender.g.en-US.resources:mainwindow.baml,str_mnuArcsToLines:System.String.$Content,None,True,True,,Дуги у відрізки
+ioSender.g.en-US.resources:mainwindow.baml,str_mnuCompress:System.String.$Content,None,True,True,,Стиснути (експериментальна)
+ioSender.g.en-US.resources:mainwindow.baml,str_mnuDragKnife:System.String.$Content,None,True,True,,Вставити переміщення флюгерного ножа
+ioSender.g.en-US.resources:mainwindow.baml,str_mnuRotate:System.String.$Content,None,True,True,,Поворот
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorExit:System.String.$Content,None,True,True,,"Двері не зачинено, вийти?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorOpen:System.String.$Content,None,True,True,,"Двері відчинено, зачинити та продовжити?"
+ioSender.g.en-US.resources:jobview.baml,str_msgDoorPersist:System.String.$Content,None,True,True,,Статус дверей не можливо очистити &lt;Reset&gt;
+ioSender.g.en-US.resources:jobview.baml,str_msgEStop:System.String.$Content,None,True,True,,E-Stop активний! - відключіть для продовження…
+ioSender.g.en-US.resources:jobview.baml,str_msgEStopExit:System.String.$Content,None,True,True,,E-Stop активний! Вийти?
+ioSender.g.en-US.resources:jobview.baml,str_msgHome:System.String.$Content,None,True,True,,"Необхідно виконати базування, &lt;База&gt; для продовження"
+ioSender.g.en-US.resources:jobview.baml,str_msgNoComm:System.String.$Content,None,True,True,,Контролер не відповідає. Стан контролера {0}. Перезапустити?
+ioSender.g.en-US.resources:jobview.baml,str_msgNoCommAlarm:System.String.$Content,None,True,True,,Аварія контролера {0}. Перезапуск…
+ioSender.g.en-US.resources:jobview.baml,str_msgNoResponse:System.String.$Content,None,True,True,,Контролер не відповідає!
+ioSender.g.en-US.resources:jobview.baml,str_msgResetExit:System.String.$Content,None,True,True,,Помилка перезапуску. Програму буде завершено.
+ioSender.g.en-US.resources:jobview.baml,str_msgResetFailed:System.String.$Content,None,True,True,,Помилка перезапуску. Програму буде завершено.
+ioSender.g.en-US.resources:jobview.baml,str_msgWait:System.String.$Content,None,True,True,,#N/A
+ioSender.g.en-US.resources:mainwindow.baml,str_runTime:System.String.$Content,None,True,True,,Час роботи: {0}
+ioSender.g.en-US.resources:mainwindow.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Вид
+ioSender.g.en-US.resources:jobview.baml,tab_3DView:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,3D Вид
+ioSender.g.en-US.resources:mainwindow.baml,tab_appConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Налаштування: IoSender
+ioSender.g.en-US.resources:jobview.baml,tab_console:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Консоль
+ioSender.g.en-US.resources:mainwindow.baml,tab_grbl:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Grbl
+ioSender.g.en-US.resources:mainwindow.baml,tab_grblConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Налаштування: Grbl
+ioSender.g.en-US.resources:mainwindow.baml,tab_jogSidebar:System.Windows.Controls.ContentControl.Content,None,True,True,,_Пульт
+ioSender.g.en-US.resources:mainwindow.baml,tab_offsets:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Зміщення
+ioSender.g.en-US.resources:mainwindow.baml,tab_parting:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Поділ на частини
+ioSender.g.en-US.resources:mainwindow.baml,tab_pidTuner:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Налаштування PID
+ioSender.g.en-US.resources:mainwindow.baml,tab_probing:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Вимірювання
+ioSender.g.en-US.resources:jobview.baml,tab_program:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Програма
+ioSender.g.en-US.resources:mainwindow.baml,tab_sdCard:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Карта SD
+ioSender.g.en-US.resources:mainwindow.baml,tab_threading:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Різьбонарізання
+ioSender.g.en-US.resources:mainwindow.baml,tab_tools:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Інструменти
+ioSender.g.en-US.resources:mainwindow.baml,tab_trinamic:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Налаштування Trinamic
+ioSender.g.en-US.resources:mainwindow.baml,tab_turning:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Токарна обробка
diff --git a/Locale/uk-UA/translation.txt b/Locale/uk-UA/translation.txt
new file mode 100644
index 0000000000000000000000000000000000000000..963cd88ad5c3e20af0d1afac801923d3684d51c2
GIT binary patch
literal 107832
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
ICQ--#2HFbPng9R*

literal 0
HcmV?d00001

diff --git a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
index fe195ae..5928972 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Probing.resources.zh-CN.csv
@@ -10,18 +10,19 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_load:System.Win
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_probe:System.Windows.Controls.ContentControl.Content,Button,True,True,,_探测
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,_保存
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setG92:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Set offset (G92)
-CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,btn_setMeasure:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,Measure
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
+CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_start:System.Windows.Controls.ContentControl.Content,Button,True,True,,Start
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
-CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,Stop
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,btn_useCamera:System.Windows.Controls.ContentControl.Content,Button,True,True,,Use camera positions
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,chk_useX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,"Use X0,Y0"
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_depth:CNC.Controls.NumericField.Label,None,False,True,,深度：
@@ -42,10 +43,10 @@ CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_xSize:CNC.Co
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Label,None,False,True,,XY Clearance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,fld_xyClearance:CNC.Controls.NumericField.Tooltip2,None,False,True,,面到探头的初始距离
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,fld_ySize:CNC.Controls.NumericField.Label,None,False,True,,Y size:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边、角或中心以选择探测动作。
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边缘以选择探测操作。
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击以选择探测操作。
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边、角或中心以选择探测动作。
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击边、角或中心以选择探测动作。
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,grd_action:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,单击以选择探测操作。
 CNC.Controls.Probing.g.en-US.resources:csselectcontrol.baml,grp_action:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,行动
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_camera:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,相机
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_clearances:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Probing clearances
@@ -64,30 +65,32 @@ CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_RotationCenter:S
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,grp_touchOrFixture:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,触摸板/夹具高度
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
-CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
+CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpiece:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,grp_workpieceOffset:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,工件偏移
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,hdr_preview:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_addOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,添加偏移量
-CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,如果未启用并且探针被触发，控制器将生成警报。
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,A dialog will be shown until the probe is asserted or the dialog is cancelled.
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeConnected:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Manually validate probe is connected
 CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启动前检查探头状态 (G59.3)
+CNC.Controls.Probing.g.en-US.resources:configcontrol.baml,lbl_chkProbeStatus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,如果未启用并且探针被触发，控制器将生成警报。
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_clearToolOffset:System.Windows.Controls.ContentControl.Content,Button,True,True,,清除刀具长度偏移
+CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,H:
-CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_height:CNC.Controls.NumericField.Label,None,False,True,,高度
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Label,None,False,True,,Latch distance:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchDistance:CNC.Controls.NumericField.Tooltip2,None,False,True,,第二次慢速探测移动的缩回距离，设置为 0 跳过
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,第二次慢速探测移动的进给速度
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Label,None,False,True,,Latch feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_latchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,第二次慢速探测移动的进给速度
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,锁定
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,锁定
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Unlock and set X or Y size to 0 to probe in one direction only.
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_lock:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,锁定
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_pause:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,探测前暂停
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
-CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
+CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,lbl_preview:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Preview
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_probeFixture:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,探针夹具@G59.3
 CNC.Controls.Probing.g.en-US.resources:edgefindercontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
 CNC.Controls.Probing.g.en-US.resources:edgefinderintcontrol.baml,lbl_probeZ:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Probe Z
@@ -97,9 +100,9 @@ CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_profile:System.Windo
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,快速移动的进给速率，设置为 0 以使用控制器设置
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Label,None,False,True,,Rapids feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_rapidsFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Search feed rate:
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,初始探测移动的进给速率
+CNC.Controls.Probing.g.en-US.resources:probingview.baml,lbl_searchFeed:CNC.Controls.NumericField.Label,None,False,True,,Search feed rate:
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setCoordOrOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set coordinate system or offset
 CNC.Controls.Probing.g.en-US.resources:toollengthcontrol.baml,lbl_setRefernecOffset:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,建立参考偏移
 CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,lbl_setZ0AtX0Y0:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Set Z = 0 at X0Y0:
@@ -134,6 +137,7 @@ CNC.Controls.Probing.g.en-US.resources:heightmapcontrol.baml,str_heightMapInstru
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogActive:System.String.$Content,None,True,True,,键盘点动激活
 CNC.Controls.Probing.g.en-US.resources:probingview.baml,str_jogDisabled:System.String.$Content,None,True,True,,键盘慢跑已禁用
 CNC.Controls.Probing.g.en-US.resources:centerfindercontrol.baml,str_positionsRequired:System.String.$Content,None,True,True,,{0} probe positions are required.
+CNC.Controls.Probing.g.en-US.resources:probeverify.baml,str_probeVerify:System.Windows.Controls.ContentControl.Content,Label,True,True,,Assert probe to verify connection.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probing:System.String.$Content,None,True,True,,Probing...
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingDistanceError:System.String.$Content,None,True,True,,Probing distance must be larger than XY Clearance + ½ Probe/tool diameter.
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingFailedAlarm:System.String.$Content,None,True,True,,"Probing failed with alarm, clear in Grbl tab."
@@ -145,8 +149,10 @@ CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingLatchDistanceE
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoPos:System.String.$Content,None,True,True,,"Probing failed, could not establish current machine position."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoProbe:System.String.$Content,None,True,True,,"Probing failed, probe is not connected."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNotIdle:System.String.$Content,None,True,True,,"Probing failed, Grbl is not in idle or tool changing state."
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingNoVerifyContinue:System.String.$Content,None,True,True,,"Probe connection was not verified, continue anyway?"
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingProbeAsserted:System.String.$Content,None,True,True,,"Probing failed, probe signal is asserted."
 CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingRadiusArcs:System.String.$Content,None,True,True,,GCode 包含 XZ 或 YZ 平面 (G18/19) 中的弧，不能应用变换。 使用“弧线” 如果你真的需要这个。
+CNC.Controls.Probing.g.en-US.resources:libstrings.baml,str_probingVerifyStart:System.String.$Content,None,True,True,,Press [Start] again to start probing.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationCompleted:System.String.$Content,None,True,True,,Probing completed.
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationFailed:System.String.$Content,None,True,True,,Probing failed
 CNC.Controls.Probing.g.en-US.resources:rotationcontrol.baml,str_rotationInitFailed:System.String.$Content,None,True,True,,角度：{0} 度
diff --git a/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
index 07890d7..08552cf 100644
--- a/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.Viewer.resources.zh-CN.csv
@@ -2,9 +2,9 @@
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Label,None,False,True,,圆弧分辨率：
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_arcResolution:CNC.Controls.NumericField.Unit,None,False,True,,segments
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_minDistance:CNC.Controls.NumericField.Label,None,False,True,,最小距离：
+CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,刀具直径：
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,默认刀具直径。
-CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolDiameter:CNC.Controls.NumericField.Label,None,False,True,,刀具直径：
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,fld_toolScalePct:CNC.Controls.NumericField.Unit,None,False,True,,%
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,grp_gcodeViewer:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,G代码查看器
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_blackBackgroud:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Black background
@@ -24,14 +24,14 @@ CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_showViewCube:System
 CNC.Controls.Viewer.g.en-US.resources:configcontrol.baml,lbl_toolAutoScale:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,自动缩放工具
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reset view (Ctrl+V)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,resetView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/ResetView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/RestoreView.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,restoreView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore view (Ctrl+R)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save view
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,saveView:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/SaveView.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换网格可见性 (Ctrl+G)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showGrid:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/GridOn.png
-CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换作业边界可见性 (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/JobBoxOn.png
+CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showJobEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换作业边界可见性 (Ctrl+J)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换机器工作范围可见性 (Ctrl+W)
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showWorkEnvelope:System.Windows.Controls.ContentControl.Content,Button,True,True,,Resources/WorkBoxOn.png
 CNC.Controls.Viewer.g.en-US.resources:rendercontrol.baml,showXYZMarkers:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,切换轴可见性
diff --git a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
index 3546c20..aac8eb2 100644
--- a/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Controls.WPF.resources.zh-CN.csv
@@ -22,31 +22,31 @@ CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG28:System.Windo
 CNC.Controls.WPF.g.en-US.resources:gotobasecontrol.baml,btn_gotoG30:System.Windows.Controls.ContentControl.Content,Button,True,True,,转到位置 2 (G30)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+H
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_home:System.Windows.Controls.ContentControl.Content,Button,True,True,,起始点
+CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,btn_ok:System.Windows.Controls.ContentControl.Content,Button,True,True,,Ok
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Reload settings from controller.
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_reload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Reload
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.Controls.ContentControl.Content,Button,True,True,,复位
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_reset:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+Shift+R
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_restore:System.Windows.Controls.ContentControl.Content,Button,True,True,,Restore
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_rewind:System.Windows.Controls.ContentControl.Content,Button,True,True,,Rewind
-CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save
+CNC.Controls.WPF.g.en-US.resources:grblconfigview.baml,btn_save:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Save changed settings to controller.
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveKeyMap:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save keymappings
 CNC.Controls.WPF.g.en-US.resources:appconfigview.baml,btn_saveSettings:System.Windows.Controls.ContentControl.Content,Button,True,True,,Save settings
 CNC.Controls.WPF.g.en-US.resources:mdicontrol.baml,btn_send:System.Windows.Controls.ContentControl.Content,Button,True,True,,Send
 CNC.Controls.WPF.g.en-US.resources:coordvaluesetcontrol.baml,btn_set:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set
-CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
 CNC.Controls.WPF.g.en-US.resources:offsetview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
-CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
+CNC.Controls.WPF.g.en-US.resources:toolview.baml,btn_setAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Set all
 CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Alt+S
-CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
+CNC.Controls.WPF.g.en-US.resources:jobcontrol.baml,btn_stop:System.Windows.Controls.ContentControl.Content,Button,True,True,,停止
 CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,将 grbl 版本信息和设置复制到剪贴板
-CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,解锁
+CNC.Controls.WPF.g.en-US.resources:about.baml,btn_toClipboard:System.Windows.Controls.ContentControl.Content,Button,True,True,,To Clipboard
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Ctrl+U
+CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,btn_unlock:System.Windows.Controls.ContentControl.Content,Button,True,True,,解锁
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,btn_upload:System.Windows.Controls.ContentControl.Content,Button,True,True,,Upload
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,btn_zeroAll:System.Windows.Controls.ContentControl.Content,Button,True,True,,Zero all
 CNC.Controls.WPF.g.en-US.resources:macroeditor.baml,chk_confirm:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,执行前确认
@@ -60,23 +60,23 @@ CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls
 CNC.Controls.WPF.g.en-US.resources:gcoderotatedialog.baml,fld_angle:CNC.Controls.NumericField.Label,None,True,True,,角度:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,fld_diameter:CNC.Controls.NumericField.Label,None,True,True,,直径：
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastDistance:CNC.Controls.NumericField.Label,None,False,True,,快速进给距离：
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,快速进给：
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,最大缓冲区：
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_fastFeedrate:CNC.Controls.NumericField.Label,None,False,True,,快速进给：
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Unit,None,False,True,,bytes
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:CNC.Controls.NumericField.Label,None,False,True,,最大缓冲区：
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_maxBuffer:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,使用的最大串行缓冲区大小（限制为报告值的 90%）。
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Time between status request sent to controller.
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Poll interval:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Unit,None,False,True,,ms
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Reset delay:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_pollInterval:CNC.Controls.NumericField.Label,None,False,True,,Poll interval:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Unit,None,False,True,,ms
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:CNC.Controls.NumericField.Label,None,False,True,,Reset delay:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,fld_resetDelay:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,延迟以允许控制器在通信开始之前完成引导。
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowDistance:CNC.Controls.NumericField.Label,None,False,True,,Slow distance:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Slow feedrate:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_slowFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepDistance:CNC.Controls.NumericField.Label,None,False,True,,Step distance:
-CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Label,None,False,True,,Step feedrate:
+CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,fld_stepFeedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,grb_mainConfig:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,Main
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,grp_coolant:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,冷却液
 CNC.Controls.WPF.g.en-US.resources:drocontrol.baml,grp_dro:System.Windows.Controls.HeaderedContentControl.Header,Label,True,True,,DRO
@@ -113,44 +113,42 @@ CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,hdr_size:System.Windows.Contr
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,hdr_tool:System.Windows.Controls.DataGridColumn.Header,None,True,True,,刀具
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,过滤掉实时响应
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,label_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_aAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,A axis:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_agressiveBuffering:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,积极缓冲
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Removes superfluous gcode command elements.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,在转换上自动压缩 gcode
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_bAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,B axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_cAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,C axis:
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_autoCompressGcode:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Removes superfluous gcode command elements.
+CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_axis:System.String.$Content,None,True,True,,{0} axis:
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_ccw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,逆时针
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_check:System.Windows.Controls.ContentControl.Content,Label,True,True,,查看
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_configure:System.Windows.Controls.ContentControl.Content,Button,True,True,,配置文件未找到或无效，是否创建新的？
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_cw:System.Windows.Controls.ContentControl.Content,RadioButton,True,True,,顺时针
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Label,None,False,True,,距离 0：
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance0:CNC.Controls.NumericField.Unit,None,False,True,,mm
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Label,None,False,True,,距离1：
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance1:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance2:CNC.Controls.NumericField.Label,None,False,True,,距离2：
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,距离3：
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Unit,None,False,True,,mm
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_distance3:CNC.Controls.NumericField.Label,None,False,True,,距离3：
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_enable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启用
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_fan:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Fan
 CNC.Controls.WPF.g.en-US.resources:outlineflyout.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,进给速率:
 CNC.Controls.WPF.g.en-US.resources:outlinebasecontrol.baml,lbl_feedrate:CNC.Controls.NumericField.Label,None,True,True,,进给速度：
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,进给速度0：
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,进给速度1:
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate0:CNC.Controls.NumericField.Label,None,False,True,,进给速度0：
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate1:CNC.Controls.NumericField.Label,None,False,True,,进给速度1:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate2:CNC.Controls.NumericField.Label,None,False,True,,进给速度2:
-CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,进给3:
 CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
+CNC.Controls.WPF.g.en-US.resources:joguiconfigcontrol.baml,lbl_feedrate3:CNC.Controls.NumericField.Label,None,False,True,,进给3:
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,如果 ok 响应压倒控制台日志记录，则启用，通常在发送大量短命令时发生。
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_FilterOk:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Filter &quot;ok&quot; response
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_filterRT:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,过滤掉实时响应
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_flood:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,切削液
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_ipAddress:System.Windows.Controls.ContentControl.Content,Label,True,True,,IP地址：
-CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,保持 MDI 焦点
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Buffers more than one GCode block in controller for smoother execution. For grblHAL only!
+CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_keepMdiFocus:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,保持 MDI 焦点
 CNC.Controls.WPF.g.en-US.resources:jogconfigcontrol.baml,lbl_linkStepToUi:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Link step distance to UI jogging
 CNC.Controls.WPF.g.en-US.resources:machinepositionflyout.baml,lbl_machinePosition:System.Windows.Controls.TextBlock.Text,Text,True,True,,机器位置
 CNC.Controls.WPF.g.en-US.resources:coolantcontrol.baml,lbl_mist:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Mist
@@ -167,6 +165,7 @@ CNC.Controls.WPF.g.en-US.resources:feedcontrol.baml,lbl_rapids:System.Windows.Co
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.FrameworkElement.ToolTip,ToolTip,True,True,,Restore window size on next startup.
 CNC.Controls.WPF.g.en-US.resources:basicconfigcontrol.baml,lbl_restoreWindowSize:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Restore last window size on startup
 CNC.Controls.WPF.g.en-US.resources:spindlecontrol.baml,lbl_rpm:System.Windows.Controls.ContentControl.Content,Label,True,True,,RPM
+CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialBaud:System.Windows.Controls.ContentControl.Content,Label,True,True,,Baud rate:
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_serialPort:System.Windows.Controls.ContentControl.Content,Label,True,True,,端口:
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_sgLoad:System.Windows.Controls.ContentControl.Content,Label,True,True,,Load (SG_RESULT)
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_showAll:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Show all realtime responses
@@ -182,18 +181,15 @@ CNC.Controls.WPF.g.en-US.resources:signalscontrol.baml,lbl_signalSafetyDoor:Syst
 CNC.Controls.WPF.g.en-US.resources:trinamicview.baml,lbl_stallGuardEnable:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,启用过滤器 (SFILT)
 CNC.Controls.WPF.g.en-US.resources:statuscontrol.baml,lbl_state:System.Windows.Controls.ContentControl.Content,Label,True,True,,状态:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tipRadius:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Tip radius:
-CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,工具：
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,工具：
+CNC.Controls.WPF.g.en-US.resources:workparameterscontrol.baml,lbl_tool:System.Windows.Controls.ContentControl.Content,Label,True,True,,工具：
 CNC.Controls.WPF.g.en-US.resources:consolecontrol.baml,lbl_verbose:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,Verbose
 CNC.Controls.WPF.g.en-US.resources:portdialog.baml,lbl_websocket:System.Windows.Controls.ContentControl.Content,CheckBox,True,True,,WebSocket
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapSource:System.Windows.Controls.ContentControl.Content,Label,True,True,,Wrap:
 CNC.Controls.WPF.g.en-US.resources:gcodewrapdialog.baml,lbl_wrapTarget:System.Windows.Controls.ContentControl.Content,Label,True,True,,to:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_xAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,X axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_yAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Y axis:
 CNC.Controls.WPF.g.en-US.resources:toolview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
-CNC.Controls.WPF.g.en-US.resources:offsetview.baml,lbl_zAxis:CNC.Controls.CoordValueSetControl.Label,None,True,True,,Z axis:
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_delete:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,删除
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_downloadRun:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,下载并运行
 CNC.Controls.WPF.g.en-US.resources:sdcardview.baml,mnu_enableRewind:System.Windows.Controls.HeaderedItemsControl.Header,Menu,True,True,,Enable rewind
diff --git a/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv b/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
index 6cfb5f3..db5f339 100644
--- a/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
+++ b/Locale/zh-CN/csv/CNC.Converters.resources.zh-CN.csv
@@ -4,8 +4,8 @@ CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Contr
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_cutDepth:CNC.Controls.NumericField.Label,None,False,True,,铣削深度：
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_feedrate:CNC.Controls.NumericField.Label,None,False,True,,进给速度：
-CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Label,None,False,True,,Plunge rate:
+CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_plungeRate:CNC.Controls.NumericField.Unit,None,False,True,,mm/min
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Unit,None,False,True,,mm
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rapids:CNC.Controls.NumericField.Label,None,False,True,,Rapids:
 CNC.Converters.g.en-US.resources:jobparametersdialog.baml,fld_rpm:CNC.Controls.NumericField.Label,None,False,True,,RPM:
diff --git a/Locale/zh-CN/translation.txt b/Locale/zh-CN/translation.txt
index 16c7febbac895cb04de242bc1413e7a291f86b62..8a61c4840a43973f67602abbeda5d445ebec37a4 100644
GIT binary patch
delta 2047
zcmbVMeN2;Q5Pz<v&=w&u6esvmghdcRK%jgmUph4e1z}<Mu@0~;(6CxdMMOkqmSr)<
zFwXcage)X8nISGy9%qfB0wOUCl{qBFxCBv|b7+7uqKz@T_hk;;{&D6_`@YZJ@9w#~
z-`%x5QH@NhPPS-pwzd#kG#2dE7NbL(D?&YIEAVTtTwLi@EJnR_3RN_VV|v`=2*ch0
zAFtJH2eZ;+V%wPmqig5t)0vJLSs5#0<)ka2({4JI)1za>gwwGKR!W-PWTj)f=-(mf
z(KmT6_PN|K{)Nwe9qH|)br4drc->zadC<{)MP$33^pbBAVIrA^z2)sQ?y@mEE=tzC
zibemHv4}FCdtQNhmOw#~OG-#ezLI`+O4rQxU{I^yIupyEmJl+Fl9F)caw-*+sDyV=
zc+)<lvg{zqOkX#y1%{^+`pxn4G+s>0Br>CTM?8e_-fU2dnuY6?xOnk16>-dBF=#L%
zI)g&mMb&*hxK~mgg;zuYnOG7bWGPQo!W?BZi{-vS5Y(_pE!GCtDn$K~+aS8%>j7a7
zO97z>?@?gZax;!c8Zap`AFoH0;^9c6XkDJ86)%%V36k^z#M4#1ZsO(Y^&r|ZGC-_(
zzta=jH=V|iyjIlZxubg1IjqcW5d(QmZa7k4Lt8;LZri*KQ?}StF><f&yc&lSn={3U
zEvJ=u#!!HThJ4}u@wf*Ll{{)F84^9ERyE$-*@*Ew8%4Rj3NXuI#0M1?(dziZ1Dk8=
zlrby@$BxhA?THY;2eyJY*4605!hKY(!8$9N>#D`ZPhH-sL@KEs_urhyeZoPFFX{_u
zV4|oNRO28V)vB?w-Y5#b>{LN4|H%vyR3ChLGyt!2fAr@@@qmvkz?d^e?ERrw96d7v
zG8OUs(|2HrG;y9YCJrw(1_o`A=U^B8OLMSCZVc(Wj5w2-!4B7)xb4(3|I8_|CGq)2
zmcIY76noEpt5E7$B5qg_?k9DegIt;DvI=SxJ2T;_sKAA<N#x6BAQ*mj-iEsK7MwVL
z7eg*x#KsF|?7CQtLzfI#Oz({LZhT3y*b7GNYa@Aw1J7Qr#L{jv4tBU<RF@rlI;$|h
z(}9PsSnwE~GcH%*<P|%rJMN(W6^FRqecKIvdJD1nM=Q3|+t#~LEWUQY9h>?y8~U3u
z?N$;F_vhoWpAFyC-11b$u>?HzT`->f)BD4jbD2jO7Rhs{VH@Q_nkb_jDOY*sbZje|
z#(YE+6w%@<A_}AxH#MylQ$Fxsl3${<sNUKdoBh<-KU9k!3?0DQ!AiV)uNo%?hcWkl
zxtu}AljucKlruA!Y8q+LT8SeQ`u;u#OnBqk++b-vOU&s=vx8!sxmU{MMp=d(3co-p
zCo8p=gx<qa|IR?(YX8TN&%gbMv-d9oPCTqc$HN-z8n)29BoGh2zXW6baIA>@)eIv4
zHzVMYN1fu_<7X;N`lA^QV@=pPdIB59kK-LWyT-l})f0_M5%oM2#O!DDK@_-_&f<67
z!Ojo3gTa~W0SN)lwZU)_oCkxT4V;r9uuREYLg6S635Cy{DPf@2aPJk+$=AfdRcGG{
zX!GDPtH8o1lVN}#N~W)-Rbb^kE5Yp4rocf^Ca@?>pC8Qo(jW;EF#7p&u1kZ1d^{D5
zye}Qx`K)v>@FS^E=p0A~yOy_PK_<`4qVsqb<S2MUHk9(TY{+rCvcc%j*O$;Wy=JK4
z1~XWlttC*XaM~^KuG0DV6F97p7eXBWejO}ux@<6_AlCKV*8;&2MXZV_t{`%z+jK9j
YpM7#mPU)mQEz59hsh@MW0=g7`0gIu6@Bjb+

delta 1175
zcmZvcZ%CV06vp3^7#pJ&JBnLZ%bd2FISom48m-;bYAUiyP1O(9g*0;^&9bO5l@LVQ
zZiq;cl4tbVBCV7$#7PnF=qoH_sakbI+Au^#{NTj8KW3eb;jFlBuf;Ly_UYc|$GOir
zmvhgJY$yhPQ49^lK&5iXvxOW~MN$!tDZs4C1dqzf)v*U<=#ICdFy6%1<CA5Ie8C_X
za3c2*vv^6RD;B)M1))WV5h{g7!6kek?TUqD;ruQy*sJ*$2fmNz_GF)2o-btoW2DTn
zO2__dRkFwGMUBPOXWVpbK*qm&W19GO`aJQzHw#HBGGDsPZjs94@Bgp&$vxgL>UcpV
z=magQdQ<&Zm2hV1d101AhM?8~o3;)aIxFI|W`xXYxaO3&s?Fiux=IzFKCw-F@%TFN
zsduKM6uRdwmyaA{2}zWO4CC+o)6#O{$)`fGa=nm;=F{m2o>if}x)aN$VMNso;@a7J
ze5j^33c)%rD(c+GJy-9q?|}bY6Ys1amcwtUB^_>Oy~dU-q~s%(6eUJ4EMvj`Bmd0d
zQsQn)4-#5>xzXb#q_jE^x@hHHtzG-zZ@1xK`z5~BZj|Hh6(5SOxVZY`t^Mfp`;q4N
zaSbLEY`BD8LAWRZp`H}<-$=xIkAnwqM2_I45i>p)?YwCuLcI2?J{gvSb}R*>;0xMN
z@%19M$E>(MX2WvGj-0Uu#En`|ao-AcD1gEHW;jNtFgvvX^SB4S6CNC$@FFtl#f+qf
z9(drLl-6%N*gxq+!;~B44{ZGCxARf3KC)x$p;dZ02KM@SI*h=K5@*6{g<g0|$Yz({
zqdY`~(|Bw6lW2J6%`nd0q8uF1reb@}i>0}@d3atHi_ynke7U*`!)hB!A78@6N*iwe
z;FOxB7xd6=q+{KnMBkc<dw=o~9BV#2`PqjvkvgobIru=tM)3SP$`hV65YJuTRKW4a
zARcb?!u+%ciJSe<Z1f?x*~d4Y-jwr^XGz4b{i!BC^H)Y3Yl<T?lf{v1H(zsRHZ+ft
z#guqjIV9dwQ-H+ibQ&Vjok5v$rq@s>yOl-P#ejyQV_1iQCRiws#>IE@DX@=~mym<G
zi)ognoTLU8T};lM_PNB4lhj4*HzQeCrje{{wv4J-LYXA}JFKaUY^>Wz(W2=Txm7IA
zB*lzZQH9uKqDmQ4*H9%3RFgw&t)YfQ7IKn{l{%@7Eqo|J%|~RB(Z3_i1{<kB>}sSW
zIquB7y7NCM*|=L`ciiNc$+gnB>+muwIxX?qi&RM2tXWHkp9hK(h{(i#FOAFo2K1K3
A%K!iX

diff --git a/Media/Sender8.png b/Media/Sender8.png
index a777cc780ad02a610479545d25c237ec196e0284..876c6da73c647c88c6f3ca001862f6bd80f76c24 100644
GIT binary patch
literal 11906
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
SsSAl4hmw<0k}MN93jQA-&x@4+

literal 6396
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
Mf(D{Y-aO?00OT{SP5=M^

diff --git a/changelog.md b/changelog.md
index ab94d4e..ab543f3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,11 +1,27 @@
 ## ioSender changelog
 
-2022-07-18: [Release 2.0.39](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.40).
+2022-11-17: [Release 2.0.41](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.41).
+
+* Fix for incorrect handling of negative values entered in DRO. Issue #240.
+* Fix for incorrect handling of odd com port names \(with leading spaces\). Issue #230.
+* Now sets Real Time Clock \(RTC\) on connect to controllers that has a RTC.
+* Added support for up to 9 axes \(XYZABCUVW\) and remapping of ABC to UVW. Part of fix for [iMXRT1062 issue #43](https://github.com/grblHAL/iMXRT1062/issues/43).
+* Fixed bug that caused multi-pass center finder probing to sometimes fail.
+* Added baud rate selection to connection dialog.
+* Added support for LightBurn clusters \(when enabled in the controller\).
+* Added option for verifying probe connection before commencing a probe sequence.
+* Added _Measure_ option to some probing tabs, this logs probed coordinate to the console for now. Further functionality planned.
+* Added DRO view to Probing tab. Persistent in XL version, dependent on main window width in standard version.
+
+---
+
+2022-07-18: [Release 2.0.40](https://github.com/terjeio/Grbl-GCode-Sender/releases/tag/2.0.40).
 
 * Fix for incorrect rendering of paths consisting of many small moves. Issue #235
 * Fixed spindle RPM entry not working when spindle is running. Issue #236
 * Added retries on startup if unexpected data received from controller.
-* Added parser/rendering support for G5.1 splines and [multi turn G2/G3 arcs](http://linuxcnc.org/docs/html/gcode/g-code.html#gcode:g2-g3) controlled by P word. Requires grblHAL controller with support for those commands \(not yet released\).
+* Added parser/rendering support for G5.1 splines and [multi turn G2/G3 arcs](http://linuxcnc.org/docs/html/gcode/g-code.html#gcode:g2-g3) controlled by P word.
+Requires grblHAL controller with support for those commands \(not yet released\).
 
 ---
 
diff --git a/ioSender XL/ioSender XL/MainWindow.xaml.cs b/ioSender XL/ioSender XL/MainWindow.xaml.cs
index 324a801..f23de4a 100644
--- a/ioSender XL/ioSender XL/MainWindow.xaml.cs	
+++ b/ioSender XL/ioSender XL/MainWindow.xaml.cs	
@@ -1,7 +1,7 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.40 / 2022-06-13 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-14 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.40";
+        private const string version = "2.0.41";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -179,9 +179,9 @@ private void Window_Load(object sender, EventArgs e)
             }
 
             IGCodeConverter c = new Excellon2GCode();
-            GCode.File.AddConverter(c.GetType(), c.FileType);
+            GCode.File.AddConverter(c.GetType(), c.FileType, c.FileExtensions);
             c = new HpglToGCode();
-            GCode.File.AddConverter(c.GetType(), c.FileType);
+            GCode.File.AddConverter(c.GetType(), c.FileType, c.FileExtensions);
 
             GCode.File.AddTransformer(typeof(GCodeRotateViewModel), (string)FindResource("MenuRotate"), UIViewModel.TransformMenuItems);
             GCode.File.AddTransformer(typeof(ArcsToLines), (string)FindResource("MenuArcsToLines"), UIViewModel.TransformMenuItems);
diff --git a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs
index 54735db..e109ab5 100644
--- a/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs	
+++ b/ioSender XL/ioSender XL/Properties/AssemblyInfo.cs	
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.40.0")]
-[assembly: AssemblyFileVersion("2.0.40.0")]
+[assembly: AssemblyVersion("2.0.41.0")]
+[assembly: AssemblyFileVersion("2.0.41.0")]
diff --git a/ioSender/ioSender/MainWindow.xaml.cs b/ioSender/ioSender/MainWindow.xaml.cs
index de58d20..ca98481 100644
--- a/ioSender/ioSender/MainWindow.xaml.cs
+++ b/ioSender/ioSender/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 /*
  * MainWindow.xaml.cs - part of Grbl Code Sender
  *
- * v0.40 / 2022-06-12 / Io Engineering (Terje Io)
+ * v0.41 / 2022-09-14 / Io Engineering (Terje Io)
  *
  */
 
@@ -56,7 +56,7 @@ namespace GCode_Sender
 
     public partial class MainWindow : Window
     {
-        private const string version = "2.0.40";
+        private const string version = "2.0.41";
         public static MainWindow ui = null;
         public static CNC.Controls.Viewer.Viewer GCodeViewer = null;
         public static UIViewModel UIViewModel { get; } = new UIViewModel();
@@ -181,9 +181,9 @@ private void Window_Load(object sender, EventArgs e)
             }
 
             IGCodeConverter c = new Excellon2GCode();
-            GCode.File.AddConverter(c.GetType(), c.FileType);
+            GCode.File.AddConverter(c.GetType(), c.FileType, c.FileExtensions);
             c = new HpglToGCode();
-            GCode.File.AddConverter(c.GetType(), c.FileType);
+            GCode.File.AddConverter(c.GetType(), c.FileType, c.FileExtensions);
 
             GCode.File.AddTransformer(typeof(GCodeRotateViewModel), (string)FindResource("MenuRotate"), UIViewModel.TransformMenuItems);
             GCode.File.AddTransformer(typeof(ArcsToLines), (string)FindResource("MenuArcsToLines"), UIViewModel.TransformMenuItems);
diff --git a/ioSender/ioSender/Properties/AssemblyInfo.cs b/ioSender/ioSender/Properties/AssemblyInfo.cs
index 54735db..e109ab5 100644
--- a/ioSender/ioSender/Properties/AssemblyInfo.cs
+++ b/ioSender/ioSender/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.40.0")]
-[assembly: AssemblyFileVersion("2.0.40.0")]
+[assembly: AssemblyVersion("2.0.41.0")]
+[assembly: AssemblyFileVersion("2.0.41.0")]
diff --git a/readme.md b/readme.md
index ca48ba1..c821ff5 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-## ioSender - a gcode sender for grblHAL or grbl  
+## ioSender - a gcode sender for grblHAL and Grbl controllers
 
 ---
 
@@ -10,7 +10,7 @@ Please check out the [Wiki](https://github.com/terjeio/Grbl-GCode-Sender/wiki) f
 
 ---
 
-Latest release is 2.0.40, see the [changelog](changelog.md) for details.
+Latest release is 2.0.41, see the [changelog](changelog.md) for details. 
 
 ---
 
@@ -37,7 +37,7 @@ XL version, German translation.
 
 ![Jog flyout](Media/Sender7.png)
 
-Jogging flyout, supports up to 6 axes. The sender also supports keyboard jogging with \<Shift\> \(speed\) and \<Ctrl\> \(distance\) modifiers.
+Jogging flyout, supports up to 9 axes. The sender also supports keyboard jogging with \<Shift\> \(speed\) and \<Ctrl\> \(distance\) modifiers.
 <br><br>
 
 ![Easy configuration](Media/Sender3.png)
@@ -60,4 +60,4 @@ Lathe mode.
 Conversational programming for Lathe Mode. Threading requires [grblHAL](https://github.com/grblHAL) controller with driver that has spindle sync support.
 
 ---
-2022-07-18
+2022-09-25