aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
authorShai Frieder <Shai.Frieder@twine-s.com>2019-04-08 09:42:10 +0300
committerShai Frieder <Shai.Frieder@twine-s.com>2019-04-08 09:42:10 +0300
commit49db61f198119289433e1f2e35b97e011c47aefe (patch)
treec04d78e2abb5aac8c22350c90cb8b469f6eca30d /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
parentc9fc2b64bdb42f11976a020a856dde10d469c0e6 (diff)
parent1608e69a417bc5e40a607c3958c4a60f19f66f1a (diff)
downloadTango-49db61f198119289433e1f2e35b97e011c47aefe.tar.gz
Tango-49db61f198119289433e1f2e35b97e011c47aefe.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
index 9794404b9..7c4e960ec 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MachineConnectionView.xaml
@@ -124,7 +124,7 @@
</StackPanel>
<StackPanel Margin="20 0 0 0" Orientation="Horizontal" VerticalAlignment="Center">
- <ToggleButton IsChecked="{Binding EnableKeepAlive}" VerticalAlignment="Center" ToolTip="Upload hardware configuration after connection is successful"></ToggleButton>
+ <ToggleButton IsChecked="{Binding EnableKeepAlive}" VerticalAlignment="Center" ToolTip="Allow a keep alive mechanism to improve lost connection detection"></ToggleButton>
<TextBlock VerticalAlignment="Center" FontSize="10" Margin="5 0 0 0">Keep Alive</TextBlock>
</StackPanel>
</StackPanel>