diff --git a/Source/NETworkManager.sln.DotSettings b/Source/NETworkManager.sln.DotSettings index d9e1ca7a13..1387241f84 100644 --- a/Source/NETworkManager.sln.DotSettings +++ b/Source/NETworkManager.sln.DotSettings @@ -1,5 +1,6 @@  AES + ARP CNAME DES DNS @@ -18,6 +19,7 @@ RAW RDP SHA + SNMP SNMPV SSH TCP diff --git a/Source/NETworkManager/App.xaml b/Source/NETworkManager/App.xaml index 1a3dbd4cf0..81173cc9be 100644 --- a/Source/NETworkManager/App.xaml +++ b/Source/NETworkManager/App.xaml @@ -16,8 +16,6 @@ - - diff --git a/Source/NETworkManager/App.xaml.cs b/Source/NETworkManager/App.xaml.cs index e6e1e178b6..7d8494de32 100644 --- a/Source/NETworkManager/App.xaml.cs +++ b/Source/NETworkManager/App.xaml.cs @@ -60,6 +60,8 @@ private void Application_Startup(object sender, StartupEventArgs e) // Load localization (requires settings to be loaded first) LocalizationManager.Load(); + NETworkManager.Resources.Localization.Strings.Culture = LocalizationManager.Culture; + if (CommandLineManager.Current.Help) { StartupUri = new Uri("/Views/CommandLineHelpWindow.xaml", UriKind.Relative); diff --git a/Source/NETworkManager/ApplicationViewManager.cs b/Source/NETworkManager/ApplicationViewManager.cs index 4e9469a9ca..f3a994cbd2 100644 --- a/Source/NETworkManager/ApplicationViewManager.cs +++ b/Source/NETworkManager/ApplicationViewManager.cs @@ -1,5 +1,4 @@ using MahApps.Metro.IconPacks; -using NETworkManager.Models.Settings; using System.Collections.Generic; namespace NETworkManager @@ -29,7 +28,43 @@ public static class ApplicationViewManager public static string GetTranslatedNameByName(Name name) { - return LocalizationManager.GetStringByKey("String_ApplicationName_" + name); + switch (name) + { + case Name.NetworkInterface: + return Resources.Localization.Strings.NetworkInterface; + case Name.IPScanner: + return Resources.Localization.Strings.IPScanner; + case Name.PortScanner: + return Resources.Localization.Strings.PortScanner; + case Name.Ping: + return Resources.Localization.Strings.Ping; + case Name.Traceroute: + return Resources.Localization.Strings.Traceroute; + case Name.DNSLookup: + return Resources.Localization.Strings.DNSLookup; + case Name.RemoteDesktop: + return Resources.Localization.Strings.RemoteDesktop; + case Name.PuTTY: + return Resources.Localization.Strings.PuTTY; + case Name.SNMP: + return Resources.Localization.Strings.SNMP; + case Name.WakeOnLAN: + return Resources.Localization.Strings.WakeOnLAN; + case Name.HTTPHeaders: + return Resources.Localization.Strings.HTTPHeaders; + case Name.SubnetCalculator: + return Resources.Localization.Strings.SubnetCalculator; + case Name.Lookup: + return Resources.Localization.Strings.Lookup; + case Name.Connections: + return Resources.Localization.Strings.Connections; + case Name.Listeners: + return Resources.Localization.Strings.Listeners; + case Name.ARPTable: + return Resources.Localization.Strings.ARPTable; + default: + return ""; + } } public enum Name diff --git a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml index 1c871bac52..64285b2ec8 100644 --- a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml +++ b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml @@ -6,9 +6,10 @@ xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz" xmlns:converters="clr-namespace:NETworkManager.Converters" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" xmlns:networkManagerControls="clr-namespace:NETworkManager.Controls" mc:Ignorable="d" - Title="{DynamicResource String_ProductName}" Style="{DynamicResource DefaultWindow}" MinWidth="650" MinHeight="500" Height="650" Width="1000" TitleAlignment="Left" + Title="NETworkManager" Style="{DynamicResource DefaultWindow}" MinWidth="650" MinHeight="500" Height="650" Width="1000" TitleAlignment="Left" d:DataContext="{d:DesignInstance networkManagerControls:DragablzTabHostWindow}"> diff --git a/Source/NETworkManager/Controls/PuTTYControl.xaml b/Source/NETworkManager/Controls/PuTTYControl.xaml index 6eb7a07f50..3fe6a2c497 100644 --- a/Source/NETworkManager/Controls/PuTTYControl.xaml +++ b/Source/NETworkManager/Controls/PuTTYControl.xaml @@ -5,9 +5,10 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:converters="clr-namespace:NETworkManager.Converters" xmlns:windowsForms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms" - xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" xmlns:networkManagerControls="clr-namespace:NETworkManager.Controls" - dialogs:DialogParticipation.Register="{Binding}" + xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" + mah:DialogParticipation.Register="{Binding}" mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance networkManagerControls:PuttyControl}"> @@ -24,9 +25,9 @@ - - - @@ -156,7 +157,7 @@ - @@ -159,7 +160,7 @@ - + @@ -185,7 +186,7 @@ - + @@ -213,7 +214,7 @@ - + diff --git a/Source/NETworkManager/Views/AboutView.xaml b/Source/NETworkManager/Views/AboutView.xaml index 3b5c95f049..4f5c63db01 100644 --- a/Source/NETworkManager/Views/AboutView.xaml +++ b/Source/NETworkManager/Views/AboutView.xaml @@ -9,6 +9,7 @@ xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:converters="clr-namespace:NETworkManager.Converters" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:AboutViewModel}"> @@ -35,8 +36,8 @@ - - + + @@ -48,7 +49,7 @@ - - - + - - + + - + + + + + - - - - - - - - - - + + + + + + + + + + @@ -59,19 +62,12 @@ - + - - - - - - - - diff --git a/Source/NETworkManager/Views/CredentialDialog.xaml b/Source/NETworkManager/Views/CredentialDialog.xaml index c4382e60ec..e4200cce5f 100644 --- a/Source/NETworkManager/Views/CredentialDialog.xaml +++ b/Source/NETworkManager/Views/CredentialDialog.xaml @@ -8,6 +8,7 @@ xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance viewModels:CredentialViewModel}"> @@ -33,11 +34,11 @@ - - + + - - + + @@ -46,8 +47,8 @@ - - + + @@ -56,13 +57,13 @@ - + @@ -73,8 +74,8 @@ - @@ -76,7 +77,7 @@ - + @@ -137,7 +138,7 @@ - + @@ -147,7 +148,7 @@ - - - - + + + + @@ -202,7 +203,7 @@ - + @@ -278,7 +279,7 @@ - + @@ -294,7 +295,7 @@ - + diff --git a/Source/NETworkManager/Views/DNSLookupHostView.xaml b/Source/NETworkManager/Views/DNSLookupHostView.xaml index 0f68a55c58..b1be7f7daa 100644 --- a/Source/NETworkManager/Views/DNSLookupHostView.xaml +++ b/Source/NETworkManager/Views/DNSLookupHostView.xaml @@ -6,6 +6,7 @@ xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DNSLookupHostViewModel}"> @@ -17,7 +18,7 @@ - - + diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml index e0c9f07a2d..011ff56bb2 100644 --- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml +++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml @@ -6,12 +6,13 @@ xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DNSLookupSettingsViewModel}"> - - - - + + + + @@ -21,8 +22,8 @@ - - + + @@ -32,9 +33,9 @@ - - - + + + - + @@ -108,12 +109,12 @@ - + - + - + - + diff --git a/Source/NETworkManager/Views/GroupDialog.xaml b/Source/NETworkManager/Views/GroupDialog.xaml index 65b640846f..1079c907bc 100644 --- a/Source/NETworkManager/Views/GroupDialog.xaml +++ b/Source/NETworkManager/Views/GroupDialog.xaml @@ -6,6 +6,7 @@ xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance viewModels:GroupViewModel}"> @@ -26,8 +27,8 @@ - - + + @@ -38,8 +39,8 @@ - - + diff --git a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml index 391962ab60..5b3dcf72ed 100644 --- a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml +++ b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml @@ -5,12 +5,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:HTTPHeadersSettingsViewModel}"> - - + + - - + + \ No newline at end of file diff --git a/Source/NETworkManager/Views/HTTPHeadersView.xaml b/Source/NETworkManager/Views/HTTPHeadersView.xaml index f2eced3190..74dcd65867 100644 --- a/Source/NETworkManager/Views/HTTPHeadersView.xaml +++ b/Source/NETworkManager/Views/HTTPHeadersView.xaml @@ -9,6 +9,7 @@ xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:HTTPHeadersViewModel}"> @@ -24,7 +25,7 @@ - + @@ -39,8 +40,8 @@ - - + + @@ -81,7 +82,7 @@ - + @@ -99,11 +100,11 @@ - + - + @@ -126,13 +127,13 @@ - + - + - + - + diff --git a/Source/NETworkManager/Views/IPScannerHostView.xaml b/Source/NETworkManager/Views/IPScannerHostView.xaml index 60c1b2a7ab..b08586ee2f 100644 --- a/Source/NETworkManager/Views/IPScannerHostView.xaml +++ b/Source/NETworkManager/Views/IPScannerHostView.xaml @@ -8,6 +8,7 @@ xmlns:converters="clr-namespace:NETworkManager.Converters" xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialogs:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerHostViewModel}"> @@ -29,7 +30,7 @@ - - + - + @@ -95,7 +96,7 @@ - + @@ -104,7 +105,7 @@ - + @@ -113,7 +114,7 @@ - + @@ -122,7 +123,7 @@ - + @@ -152,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/IPScannerSettingsView.xaml b/Source/NETworkManager/Views/IPScannerSettingsView.xaml index 8d3d073450..9f057ea468 100644 --- a/Source/NETworkManager/Views/IPScannerSettingsView.xaml +++ b/Source/NETworkManager/Views/IPScannerSettingsView.xaml @@ -6,25 +6,26 @@ xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerSettingsViewModel}"> - - - - + + + + - - + + - + - + - - - - - + + + + + @@ -34,8 +35,8 @@ - - + + @@ -45,17 +46,17 @@ - - - + + + - + - + - - - - + + + + diff --git a/Source/NETworkManager/Views/IPScannerView.xaml b/Source/NETworkManager/Views/IPScannerView.xaml index 164ba89842..20866b4546 100644 --- a/Source/NETworkManager/Views/IPScannerView.xaml +++ b/Source/NETworkManager/Views/IPScannerView.xaml @@ -11,6 +11,7 @@ xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:network="clr-namespace:NETworkManager.Models.Network" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" Loaded="UserControl_Loaded" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerViewModel}"> @@ -31,7 +32,7 @@ - + @@ -46,8 +47,8 @@ - - + + @@ -97,10 +98,10 @@ @@ -159,13 +160,13 @@ - + - + - + - + - - - + + + @@ -359,13 +360,13 @@ - - + + - + @@ -388,13 +389,13 @@ - + - + - + - + @@ -403,7 +404,7 @@ - + diff --git a/Source/NETworkManager/Views/ListenersView.xaml b/Source/NETworkManager/Views/ListenersView.xaml index af3f16d9b1..12d47452c0 100644 --- a/Source/NETworkManager/Views/ListenersView.xaml +++ b/Source/NETworkManager/Views/ListenersView.xaml @@ -10,6 +10,7 @@ xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:network="clr-namespace:NETworkManager.Models.Network" xmlns:utilities="clr-namespace:NETworkManager.Utilities" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialog:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:ListenersViewModel}"> @@ -31,7 +32,7 @@ - - - + + + @@ -103,7 +104,7 @@ - + @@ -143,7 +144,7 @@ - + diff --git a/Source/NETworkManager/Views/LookupHostView.xaml b/Source/NETworkManager/Views/LookupHostView.xaml index 9c6234f3c0..d81c88623a 100644 --- a/Source/NETworkManager/Views/LookupHostView.xaml +++ b/Source/NETworkManager/Views/LookupHostView.xaml @@ -5,6 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:views ="clr-namespace:NETworkManager.Views" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:LookupHostViewModel}"> @@ -16,10 +17,10 @@ - + - + diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml b/Source/NETworkManager/Views/LookupOUILookupView.xaml index 36505a8720..89daeb9e99 100644 --- a/Source/NETworkManager/Views/LookupOUILookupView.xaml +++ b/Source/NETworkManager/Views/LookupOUILookupView.xaml @@ -11,6 +11,7 @@ xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:lookup="clr-namespace:NETworkManager.Models.Lookup" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:LookupOUILookupViewModel}"> @@ -24,7 +25,7 @@ - + @@ -39,8 +40,8 @@ - - + + @@ -77,20 +78,20 @@ - + - + - + - - + + diff --git a/Source/NETworkManager/Views/LookupPortLookupView.xaml b/Source/NETworkManager/Views/LookupPortLookupView.xaml index 61fe5fa4c5..88976ffcdb 100644 --- a/Source/NETworkManager/Views/LookupPortLookupView.xaml +++ b/Source/NETworkManager/Views/LookupPortLookupView.xaml @@ -11,6 +11,7 @@ xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:lookup="clr-namespace:NETworkManager.Models.Lookup" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:LookupPortLookupViewModel}"> @@ -23,7 +24,7 @@ - + @@ -38,8 +39,8 @@ - - + + @@ -76,20 +77,20 @@ - + - + - + - - - - + + + + diff --git a/Source/NETworkManager/Views/NetworkInterfaceView.xaml b/Source/NETworkManager/Views/NetworkInterfaceView.xaml index 3d4f70c47d..6b31be36ce 100644 --- a/Source/NETworkManager/Views/NetworkInterfaceView.xaml +++ b/Source/NETworkManager/Views/NetworkInterfaceView.xaml @@ -11,6 +11,7 @@ xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialog:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:NetworkInterfaceViewModel}"> @@ -56,7 +57,7 @@ - + @@ -77,7 +78,7 @@ - + @@ -163,7 +164,7 @@ - + - + - - + - + - - + + @@ -443,8 +444,8 @@ - - + + @@ -454,8 +455,8 @@ - - + + @@ -480,8 +481,8 @@ - - + + @@ -492,8 +493,8 @@ - - + + @@ -515,8 +516,8 @@ - - + + @@ -525,8 +526,8 @@ - - + + @@ -570,7 +571,7 @@ - + @@ -586,7 +587,7 @@ - + @@ -619,7 +620,7 @@ - + @@ -632,7 +633,7 @@ - + @@ -641,7 +642,7 @@ - + @@ -650,7 +651,7 @@ - + @@ -659,7 +660,7 @@ - + @@ -689,7 +690,7 @@ - diff --git a/Source/NETworkManager/Views/PingHostView.xaml b/Source/NETworkManager/Views/PingHostView.xaml index 193f32d763..2157a9a7d9 100644 --- a/Source/NETworkManager/Views/PingHostView.xaml +++ b/Source/NETworkManager/Views/PingHostView.xaml @@ -8,6 +8,7 @@ xmlns:converters="clr-namespace:NETworkManager.Converters" xmlns:dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialog:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PingHostViewModel}"> @@ -29,7 +30,7 @@ - - + - + @@ -95,7 +96,7 @@ - + @@ -104,7 +105,7 @@ - + @@ -113,7 +114,7 @@ - + @@ -122,7 +123,7 @@ - + @@ -152,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/PingSettingsView.xaml b/Source/NETworkManager/Views/PingSettingsView.xaml index d7cd49f675..be11546653 100644 --- a/Source/NETworkManager/Views/PingSettingsView.xaml +++ b/Source/NETworkManager/Views/PingSettingsView.xaml @@ -5,27 +5,28 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PingSettingsViewModel}"> - - + + - + - + - + - - + + - + - - - - - - + + + + + + diff --git a/Source/NETworkManager/Views/PingView.xaml b/Source/NETworkManager/Views/PingView.xaml index 0b5d8c10db..4decc46331 100644 --- a/Source/NETworkManager/Views/PingView.xaml +++ b/Source/NETworkManager/Views/PingView.xaml @@ -11,6 +11,7 @@ xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:network="clr-namespace:NETworkManager.Models.Network" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" Loaded="UserControl_Loaded" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PingViewModel}"> @@ -30,7 +31,7 @@ - + @@ -45,8 +46,8 @@ - - + + @@ -95,10 +96,10 @@ @@ -121,12 +122,12 @@ - + - + - + - + - + - + @@ -270,7 +271,7 @@ - + @@ -279,11 +280,11 @@ - + - + - + diff --git a/Source/NETworkManager/Views/PortScannerHostView.xaml b/Source/NETworkManager/Views/PortScannerHostView.xaml index e5554d147d..74f92db0bd 100644 --- a/Source/NETworkManager/Views/PortScannerHostView.xaml +++ b/Source/NETworkManager/Views/PortScannerHostView.xaml @@ -8,6 +8,7 @@ xmlns:converters="clr-namespace:NETworkManager.Converters" xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialogs:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerHostViewModel}"> @@ -29,7 +30,7 @@ - - + - + @@ -95,7 +96,7 @@ - + @@ -104,7 +105,7 @@ - + @@ -113,7 +114,7 @@ - + @@ -122,7 +123,7 @@ - + @@ -152,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml b/Source/NETworkManager/Views/PortScannerSettingsView.xaml index 0c03755dc1..7a0316f9b8 100644 --- a/Source/NETworkManager/Views/PortScannerSettingsView.xaml +++ b/Source/NETworkManager/Views/PortScannerSettingsView.xaml @@ -5,21 +5,22 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerSettingsViewModel}"> - - + + - - - - + + + + - - - - - - + + + + + + diff --git a/Source/NETworkManager/Views/PortScannerView.xaml b/Source/NETworkManager/Views/PortScannerView.xaml index f975a41cff..2ac491d3e9 100644 --- a/Source/NETworkManager/Views/PortScannerView.xaml +++ b/Source/NETworkManager/Views/PortScannerView.xaml @@ -10,6 +10,7 @@ xmlns:controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:network="clr-namespace:NETworkManager.Models.Network" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" Loaded="UserControl_Loaded" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerViewModel}"> @@ -27,7 +28,7 @@ - + @@ -47,8 +48,8 @@ - - + + @@ -58,8 +59,8 @@ - - + + @@ -112,10 +113,10 @@ @@ -174,12 +175,12 @@ - + - - - - - - - + + + + + + + @@ -296,7 +297,7 @@ - + @@ -319,13 +320,13 @@ - + - + - + - + @@ -334,7 +335,7 @@ - + diff --git a/Source/NETworkManager/Views/ProfileDialog.xaml b/Source/NETworkManager/Views/ProfileDialog.xaml index ebbc8e6bb8..6b82c92e0d 100644 --- a/Source/NETworkManager/Views/ProfileDialog.xaml +++ b/Source/NETworkManager/Views/ProfileDialog.xaml @@ -8,6 +8,7 @@ xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" xmlns:settings="clr-namespace:NETworkManager.Models.Settings" mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance viewModels:ProfileViewModel}"> @@ -25,7 +26,7 @@ - - - - - + + + + + - + - + @@ -610,7 +611,7 @@ - + @@ -623,16 +624,16 @@ - + @@ -642,7 +643,7 @@ - + @@ -652,8 +653,8 @@ - - + + @@ -662,7 +663,7 @@ - + @@ -672,14 +673,14 @@ - + - + @@ -696,7 +697,7 @@ - + @@ -719,8 +720,8 @@ - - + + @@ -730,8 +731,8 @@ - - + + @@ -741,8 +742,8 @@ - - + + @@ -759,8 +760,8 @@ - - + - + @@ -114,7 +115,7 @@ - + @@ -123,7 +124,7 @@ - + @@ -132,7 +133,7 @@ - + @@ -141,7 +142,7 @@ - + @@ -150,7 +151,7 @@ - + @@ -180,7 +181,7 @@ - @@ -307,7 +308,7 @@ - + - + diff --git a/Source/NETworkManager/Views/PuTTYSettingsView.xaml b/Source/NETworkManager/Views/PuTTYSettingsView.xaml index 469fadd9a8..ad105970ef 100644 --- a/Source/NETworkManager/Views/PuTTYSettingsView.xaml +++ b/Source/NETworkManager/Views/PuTTYSettingsView.xaml @@ -7,11 +7,12 @@ xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialogs:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PuTTYSettingsViewModel}"> - - + + @@ -21,11 +22,11 @@ - - + - + @@ -114,7 +115,7 @@ - + @@ -123,7 +124,7 @@ - + @@ -132,7 +133,7 @@ - + @@ -141,7 +142,7 @@ - + @@ -150,7 +151,7 @@ - + @@ -159,7 +160,7 @@ - + @@ -189,7 +190,7 @@ - @@ -316,7 +317,7 @@ - + @@ -346,11 +347,11 @@ - + - + diff --git a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml index 75b990a048..3781d80896 100644 --- a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml +++ b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml @@ -6,19 +6,20 @@ xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:RemoteDesktopSettingsViewModel}"> - - - - + + + + - + - + @@ -31,7 +32,7 @@ - + @@ -42,7 +43,7 @@ - + @@ -55,11 +56,11 @@ - + - - - + + + @@ -69,9 +70,9 @@ - - - + + + @@ -80,15 +81,15 @@ - - + + - - - - - - - + + + + + + + diff --git a/Source/NETworkManager/Views/SNMPHostView.xaml b/Source/NETworkManager/Views/SNMPHostView.xaml index 9b95580561..99d46d26ba 100644 --- a/Source/NETworkManager/Views/SNMPHostView.xaml +++ b/Source/NETworkManager/Views/SNMPHostView.xaml @@ -6,6 +6,7 @@ xmlns:dragablz="clr-namespace:Dragablz;assembly=Dragablz" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SNMPHostViewModel}"> @@ -17,7 +18,7 @@ - - + diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml b/Source/NETworkManager/Views/SNMPSettingsView.xaml index f305a4947c..d5ff561822 100644 --- a/Source/NETworkManager/Views/SNMPSettingsView.xaml +++ b/Source/NETworkManager/Views/SNMPSettingsView.xaml @@ -6,15 +6,16 @@ xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SNMPSettingsViewModel}"> - - + + - + - - + + @@ -24,11 +25,11 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/Source/NETworkManager/Views/SNMPView.xaml b/Source/NETworkManager/Views/SNMPView.xaml index 30cf8e271f..52f55283f8 100644 --- a/Source/NETworkManager/Views/SNMPView.xaml +++ b/Source/NETworkManager/Views/SNMPView.xaml @@ -10,6 +10,7 @@ xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:network="clr-namespace:NETworkManager.Models.Network" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SNMPViewModel}"> @@ -33,7 +34,7 @@ - + @@ -56,8 +57,8 @@ - - + + @@ -66,12 +67,12 @@ - + - + - - + + @@ -81,7 +82,7 @@ - + - + - + - + @@ -475,14 +476,14 @@ - - + + @@ -566,7 +567,7 @@ - + @@ -589,13 +590,13 @@ - + - + - + - + - + @@ -103,14 +104,14 @@ - - + + - - + + - - + @@ -96,7 +97,7 @@ - + diff --git a/Source/NETworkManager/Views/SettingsSettingsView.xaml b/Source/NETworkManager/Views/SettingsSettingsView.xaml index e5144a63c0..6a9f06f0de 100644 --- a/Source/NETworkManager/Views/SettingsSettingsView.xaml +++ b/Source/NETworkManager/Views/SettingsSettingsView.xaml @@ -10,6 +10,7 @@ xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialogs:DialogParticipation.Register="{Binding}" mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance viewModels:SettingsSettingsViewModel}"> @@ -21,8 +22,8 @@ - - + + @@ -50,7 +51,7 @@ - - - + - + @@ -95,7 +96,7 @@ - + @@ -104,7 +105,7 @@ - + @@ -113,7 +114,7 @@ - + @@ -122,7 +123,7 @@ - + @@ -152,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/TracerouteSettingsView.xaml b/Source/NETworkManager/Views/TracerouteSettingsView.xaml index b36c0f1222..1b545a9577 100644 --- a/Source/NETworkManager/Views/TracerouteSettingsView.xaml +++ b/Source/NETworkManager/Views/TracerouteSettingsView.xaml @@ -5,22 +5,23 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TracerouteSettingsViewModel}"> - - + + - - + + - + - - - - - - - + + + + + + + diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml index 774110655c..f85822f6e4 100644 --- a/Source/NETworkManager/Views/TracerouteView.xaml +++ b/Source/NETworkManager/Views/TracerouteView.xaml @@ -11,6 +11,7 @@ xmlns:mahAppsControls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:network="clr-namespace:NETworkManager.Models.Network" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" Loaded="UserControl_Loaded" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TracerouteViewModel}"> @@ -29,7 +30,7 @@ - + @@ -45,8 +46,8 @@ - - + + @@ -95,10 +96,10 @@ @@ -111,13 +112,13 @@ - + - - + + @@ -283,7 +284,7 @@ - + @@ -291,7 +292,7 @@ - + @@ -299,13 +300,13 @@ - - + + - + @@ -328,13 +329,13 @@ - + - + - + - + diff --git a/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml b/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml index 6d9f940aab..156221eb4d 100644 --- a/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml +++ b/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml @@ -6,11 +6,12 @@ xmlns:validators="clr-namespace:NETworkManager.Validators" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WakeOnLANSettingsViewModel}"> - - - + + + diff --git a/Source/NETworkManager/Views/WakeOnLANView.xaml b/Source/NETworkManager/Views/WakeOnLANView.xaml index 7910ddf235..ca5666ba0a 100644 --- a/Source/NETworkManager/Views/WakeOnLANView.xaml +++ b/Source/NETworkManager/Views/WakeOnLANView.xaml @@ -11,6 +11,7 @@ xmlns:wpfHelpers="clr-namespace:NETworkManager.WpfHelper" xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialogs:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WakeOnLANViewModel}"> @@ -31,7 +32,7 @@ - + @@ -47,8 +48,8 @@ - - + + @@ -61,8 +62,8 @@ - - + + @@ -75,8 +76,8 @@ - - + + @@ -101,7 +102,7 @@ - + @@ -138,7 +139,7 @@ - + @@ -151,7 +152,7 @@ - + @@ -160,7 +161,7 @@ - + @@ -169,7 +170,7 @@ - + @@ -178,7 +179,7 @@ - + @@ -211,7 +212,7 @@ -