From 26d027b2331b6a32484efc6ed1aac8647d01909c Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Fri, 27 Jul 2018 23:10:04 +0200 Subject: [PATCH 01/24] Use Transifex for translation... --- Source/NETworkManager/App.xaml.cs | 2 + Source/NETworkManager/MainWindow.xaml.cs | 2 + .../NETworkManager/Models/Update/Updater.cs | 5 +- Source/NETworkManager/NETworkManager.csproj | 18 +++ .../Localization/Strings.Designer.cs | 72 ++++++++++ .../Localization/Strings.de-DE.Designer.cs | 0 .../Resources/Localization/Strings.de-DE.resx | 123 ++++++++++++++++++ .../Resources/Localization/Strings.resx | 123 ++++++++++++++++++ 8 files changed, 342 insertions(+), 3 deletions(-) create mode 100644 Source/NETworkManager/Resources/Localization/Strings.Designer.cs create mode 100644 Source/NETworkManager/Resources/Localization/Strings.de-DE.Designer.cs create mode 100644 Source/NETworkManager/Resources/Localization/Strings.de-DE.resx create mode 100644 Source/NETworkManager/Resources/Localization/Strings.resx 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/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs index 1b1a2917ae..936ba9a73e 100644 --- a/Source/NETworkManager/MainWindow.xaml.cs +++ b/Source/NETworkManager/MainWindow.xaml.cs @@ -249,6 +249,8 @@ public MainWindow() // Language Meta LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(LocalizationManager.Culture.IetfLanguageTag))); + Debug.WriteLine(NETworkManager.Resources.Localization.Strings.Application); + // Load appearance AppearanceManager.Load(); diff --git a/Source/NETworkManager/Models/Update/Updater.cs b/Source/NETworkManager/Models/Update/Updater.cs index 4627b870b8..37a0d33545 100644 --- a/Source/NETworkManager/Models/Update/Updater.cs +++ b/Source/NETworkManager/Models/Update/Updater.cs @@ -2,7 +2,6 @@ using System.Threading.Tasks; using Octokit; using NETworkManager.Models.Settings; -using NETworkManager.Properties; namespace NETworkManager.Models.Update { @@ -38,9 +37,9 @@ public void Check() { try { - var client = new GitHubClient(new ProductHeaderValue(Resources.NETworkManager_ProjectName)); + var client = new GitHubClient(new ProductHeaderValue(Properties.Resources.NETworkManager_ProjectName)); - var latestRelease = client.Repository.Release.GetLatest(Resources.NETworkManager_GitHub_User, Resources.NETworkManager_GitHub_Repo); + var latestRelease = client.Repository.Release.GetLatest(Properties.Resources.NETworkManager_GitHub_User, Properties.Resources.NETworkManager_GitHub_Repo); var latestVersion = new Version(latestRelease.Result.TagName.TrimStart('v')); diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj index a3a837f42f..5b00190833 100644 --- a/Source/NETworkManager/NETworkManager.csproj +++ b/Source/NETworkManager/NETworkManager.csproj @@ -245,6 +245,16 @@ + + Strings.de-DE.resx + True + True + + + True + True + Strings.resx + @@ -1120,6 +1130,14 @@ PublicResXFileCodeGenerator Resources.Designer.cs + + PublicResXFileCodeGenerator + Strings.de-DE.Designer.cs + + + PublicResXFileCodeGenerator + Strings.Designer.cs + diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs new file mode 100644 index 0000000000..2c24a7a1e6 --- /dev/null +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace NETworkManager.Resources.Localization { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class Strings { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Strings() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NETworkManager.Resources.Localization.Strings", typeof(Strings).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Application. + /// + public static string Application { + get { + return ResourceManager.GetString("Application", resourceCulture); + } + } + } +} diff --git a/Source/NETworkManager/Resources/Localization/Strings.de-DE.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.de-DE.Designer.cs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx new file mode 100644 index 0000000000..0432785d1f --- /dev/null +++ b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Anwendung + + \ No newline at end of file diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx new file mode 100644 index 0000000000..68b31feffb --- /dev/null +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Application + + \ No newline at end of file From 9759d6a9cc1d4f4c1669b99d17c8a4da2cccff1f Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Fri, 27 Jul 2018 23:18:32 +0200 Subject: [PATCH 02/24] Update --- .../Localization/Strings.Designer.cs | 204 +++++++++++++++++- .../Resources/Localization/Strings.resx | 70 +++++- 2 files changed, 269 insertions(+), 5 deletions(-) diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs index 2c24a7a1e6..cb1d822096 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -61,11 +61,209 @@ internal Strings() { } /// - /// Looks up a localized string similar to Application. + /// Looks up a localized string similar to About. /// - public static string Application { + public static string About { get { - return ResourceManager.GetString("Application", resourceCulture); + return ResourceManager.GetString("About", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Accent. + /// + public static string Accent { + get { + return ResourceManager.GetString("Accent", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to ARP. + /// + public static string ARP { + get { + return ResourceManager.GetString("ARP", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Autostart. + /// + public static string Autostart { + get { + return ResourceManager.GetString("Autostart", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Configure. + /// + public static string Configure { + get { + return ResourceManager.GetString("Configure", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Default application. + /// + public static string DefaultApplication { + get { + return ResourceManager.GetString("DefaultApplication", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Destination. + /// + public static string Destination { + get { + return ResourceManager.GetString("Destination", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Details. + /// + public static string Details { + get { + return ResourceManager.GetString("Details", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DNS. + /// + public static string DNS { + get { + return ResourceManager.GetString("DNS", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Information. + /// + public static string Information { + get { + return ResourceManager.GetString("Information", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Interface. + /// + public static string Interface { + get { + return ResourceManager.GetString("Interface", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Language. + /// + public static string Language { + get { + return ResourceManager.GetString("Language", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Location. + /// + public static string Location { + get { + return ResourceManager.GetString("Location", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MAC-Address. + /// + public static string MACAddress { + get { + return ResourceManager.GetString("MACAddress", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ping. + /// + public static string Ping { + get { + return ResourceManager.GetString("Ping", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Portable. + /// + public static string Portable { + get { + return ResourceManager.GetString("Portable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Result. + /// + public static string Result { + get { + return ResourceManager.GetString("Result", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Settings. + /// + public static string Settings { + get { + return ResourceManager.GetString("Settings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Statistics. + /// + public static string Statistics { + get { + return ResourceManager.GetString("Statistics", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Status. + /// + public static string Status { + get { + return ResourceManager.GetString("Status", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Theme. + /// + public static string Theme { + get { + return ResourceManager.GetString("Theme", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Tray. + /// + public static string Tray { + get { + return ResourceManager.GetString("Tray", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Window. + /// + public static string Window { + get { + return ResourceManager.GetString("Window", resourceCulture); } } } diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx index 68b31feffb..6681b458f1 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -117,7 +117,73 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Application + + About + + + Accent + + + ARP + + + Autostart + + + Configure + + + Default application + + + Destination + + + Details + + + DNS + + + Information + + + Interface + + + Language + + + Location + + + MAC-Address + + + Ping + + + Portable + + + Result + + + Settings + + + Statistics + + + Status + + + Theme + + + Tray + + + Window \ No newline at end of file From d12e7b81aea9cd08fa126804f548d92ac93289e5 Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Fri, 27 Jul 2018 23:33:47 +0200 Subject: [PATCH 03/24] Update --- .../Localization/Strings.Designer.cs | 686 +++++++++++++++++- .../Resources/Localization/Strings.resx | 230 +++++- 2 files changed, 914 insertions(+), 2 deletions(-) diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs index cb1d822096..3723049985 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -78,6 +78,42 @@ public static string Accent { } } + /// + /// Looks up a localized string similar to Add credentials. + /// + public static string AddCredentials { + get { + return ResourceManager.GetString("AddCredentials", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add entry. + /// + public static string AddEntry { + get { + return ResourceManager.GetString("AddEntry", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Add profile. + /// + public static string AddProfile { + get { + return ResourceManager.GetString("AddProfile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Are you sure?. + /// + public static string AreYouSure { + get { + return ResourceManager.GetString("AreYouSure", resourceCulture); + } + } + /// /// Looks up a localized string similar to ARP. /// @@ -87,6 +123,24 @@ public static string ARP { } } + /// + /// Looks up a localized string similar to ARP Table. + /// + public static string ARPTable { + get { + return ResourceManager.GetString("ARPTable", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Authentication. + /// + public static string Authentication { + get { + return ResourceManager.GetString("Authentication", resourceCulture); + } + } + /// /// Looks up a localized string similar to Autostart. /// @@ -96,6 +150,24 @@ public static string Autostart { } } + /// + /// Looks up a localized string similar to Calculator. + /// + public static string Calculator { + get { + return ResourceManager.GetString("Calculator", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Command Line Arguments. + /// + public static string CommandLineArguments { + get { + return ResourceManager.GetString("CommandLineArguments", resourceCulture); + } + } + /// /// Looks up a localized string similar to Configure. /// @@ -105,6 +177,69 @@ public static string Configure { } } + /// + /// Looks up a localized string similar to Confirm. + /// + public static string Confirm { + get { + return ResourceManager.GetString("Confirm", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Connect. + /// + public static string Connect { + get { + return ResourceManager.GetString("Connect", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Connect as. + /// + public static string ConnectAs { + get { + return ResourceManager.GetString("ConnectAs", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Copy profile. + /// + public static string CopyProfile { + get { + return ResourceManager.GetString("CopyProfile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Credential not found!. + /// + public static string CredentialNotFound { + get { + return ResourceManager.GetString("CredentialNotFound", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Credentials. + /// + public static string Credentials { + get { + return ResourceManager.GetString("Credentials", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Data. + /// + public static string Data { + get { + return ResourceManager.GetString("Data", resourceCulture); + } + } + /// /// Looks up a localized string similar to Default application. /// @@ -114,6 +249,24 @@ public static string DefaultApplication { } } + /// + /// Looks up a localized string similar to Delete credentials. + /// + public static string DeleteCredentials { + get { + return ResourceManager.GetString("DeleteCredentials", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Delete profile. + /// + public static string DeleteProfile { + get { + return ResourceManager.GetString("DeleteProfile", resourceCulture); + } + } + /// /// Looks up a localized string similar to Destination. /// @@ -132,6 +285,24 @@ public static string Details { } } + /// + /// Looks up a localized string similar to Disconnected. + /// + public static string Disconnected { + get { + return ResourceManager.GetString("Disconnected", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Display. + /// + public static string Display { + get { + return ResourceManager.GetString("Display", resourceCulture); + } + } + /// /// Looks up a localized string similar to DNS. /// @@ -141,6 +312,132 @@ public static string DNS { } } + /// + /// Looks up a localized string similar to DNS Lookup. + /// + public static string DNSLookup { + get { + return ResourceManager.GetString("DNSLookup", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Don't fragment. + /// + public static string DontFragment { + get { + return ResourceManager.GetString("DontFragment", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit credentials. + /// + public static string EditCredentials { + get { + return ResourceManager.GetString("EditCredentials", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit group. + /// + public static string EditGroup { + get { + return ResourceManager.GetString("EditGroup", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Edit profile. + /// + public static string EditProfile { + get { + return ResourceManager.GetString("EditProfile", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Error. + /// + public static string Error { + get { + return ResourceManager.GetString("Error", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Export. + /// + public static string Export { + get { + return ResourceManager.GetString("Export", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Filter. + /// + public static string Filter { + get { + return ResourceManager.GetString("Filter", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to General. + /// + public static string General { + get { + return ResourceManager.GetString("General", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Headers. + /// + public static string Headers { + get { + return ResourceManager.GetString("Headers", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to History. + /// + public static string History { + get { + return ResourceManager.GetString("History", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to HotKeys. + /// + public static string HotKeys { + get { + return ResourceManager.GetString("HotKeys", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to HTTP Headers. + /// + public static string HTTPHeaders { + get { + return ResourceManager.GetString("HTTPHeaders", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Import. + /// + public static string Import { + get { + return ResourceManager.GetString("Import", resourceCulture); + } + } + /// /// Looks up a localized string similar to Information. /// @@ -159,6 +456,24 @@ public static string Interface { } } + /// + /// Looks up a localized string similar to IP Scanner. + /// + public static string IPScanner { + get { + return ResourceManager.GetString("IPScanner", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Keyboard. + /// + public static string Keyboard { + get { + return ResourceManager.GetString("Keyboard", resourceCulture); + } + } + /// /// Looks up a localized string similar to Language. /// @@ -168,6 +483,33 @@ public static string Language { } } + /// + /// Looks up a localized string similar to Libraries. + /// + public static string Libraries { + get { + return ResourceManager.GetString("Libraries", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to License. + /// + public static string License { + get { + return ResourceManager.GetString("License", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Local devices and resources. + /// + public static string LocalDevicesAndResources { + get { + return ResourceManager.GetString("LocalDevicesAndResources", resourceCulture); + } + } + /// /// Looks up a localized string similar to Location. /// @@ -178,7 +520,16 @@ public static string Location { } /// - /// Looks up a localized string similar to MAC-Address. + /// Looks up a localized string similar to Lookup. + /// + public static string Lookup { + get { + return ResourceManager.GetString("Lookup", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to MAC Address. /// public static string MACAddress { get { @@ -186,6 +537,69 @@ public static string MACAddress { } } + /// + /// Looks up a localized string similar to Master Password. + /// + public static string MasterPassword { + get { + return ResourceManager.GetString("MasterPassword", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Multithreading. + /// + public static string Multithreading { + get { + return ResourceManager.GetString("Multithreading", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Network. + /// + public static string Network { + get { + return ResourceManager.GetString("Network", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Network Interface. + /// + public static string NetworkInterface { + get { + return ResourceManager.GetString("NetworkInterface", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to New tab. + /// + public static string NewTab { + get { + return ResourceManager.GetString("NewTab", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to OUI. + /// + public static string OUI { + get { + return ResourceManager.GetString("OUI", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Overwrite?. + /// + public static string Overwrite { + get { + return ResourceManager.GetString("Overwrite", resourceCulture); + } + } + /// /// Looks up a localized string similar to Ping. /// @@ -195,6 +609,15 @@ public static string Ping { } } + /// + /// Looks up a localized string similar to Port. + /// + public static string Port { + get { + return ResourceManager.GetString("Port", resourceCulture); + } + } + /// /// Looks up a localized string similar to Portable. /// @@ -204,6 +627,78 @@ public static string Portable { } } + /// + /// Looks up a localized string similar to Port Scanner. + /// + public static string PortScanner { + get { + return ResourceManager.GetString("PortScanner", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Profiles. + /// + public static string Profiles { + get { + return ResourceManager.GetString("Profiles", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to PuTTY. + /// + public static string PuTTY { + get { + return ResourceManager.GetString("PuTTY", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Query. + /// + public static string Query { + get { + return ResourceManager.GetString("Query", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Remote Desktop. + /// + public static string RemoteDesktop { + get { + return ResourceManager.GetString("RemoteDesktop", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Reset. + /// + public static string Reset { + get { + return ResourceManager.GetString("Reset", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resolve PTR. + /// + public static string ResolvePTR { + get { + return ResourceManager.GetString("ResolvePTR", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Resources. + /// + public static string Resources { + get { + return ResourceManager.GetString("Resources", resourceCulture); + } + } + /// /// Looks up a localized string similar to Result. /// @@ -213,6 +708,51 @@ public static string Result { } } + /// + /// Looks up a localized string similar to Route. + /// + public static string Route { + get { + return ResourceManager.GetString("Route", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Scan. + /// + public static string Scan { + get { + return ResourceManager.GetString("Scan", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Search. + /// + public static string Search { + get { + return ResourceManager.GetString("Search", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Select a profile.... + /// + public static string SelectAProfileDots { + get { + return ResourceManager.GetString("SelectAProfileDots", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Set Master Password. + /// + public static string SetMasterPassword { + get { + return ResourceManager.GetString("SetMasterPassword", resourceCulture); + } + } + /// /// Looks up a localized string similar to Settings. /// @@ -222,6 +762,33 @@ public static string Settings { } } + /// + /// Looks up a localized string similar to Settings have been reset!. + /// + public static string SettingsHaveBeenReset { + get { + return ResourceManager.GetString("SettingsHaveBeenReset", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to SNMP. + /// + public static string SNMP { + get { + return ResourceManager.GetString("SNMP", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Socket. + /// + public static string Socket { + get { + return ResourceManager.GetString("Socket", resourceCulture); + } + } + /// /// Looks up a localized string similar to Statistics. /// @@ -240,6 +807,42 @@ public static string Status { } } + /// + /// Looks up a localized string similar to Subnet. + /// + public static string Subnet { + get { + return ResourceManager.GetString("Subnet", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Subnetting. + /// + public static string Subnetting { + get { + return ResourceManager.GetString("Subnetting", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Success!. + /// + public static string Success { + get { + return ResourceManager.GetString("Success", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Supernetting. + /// + public static string Supernetting { + get { + return ResourceManager.GetString("Supernetting", resourceCulture); + } + } + /// /// Looks up a localized string similar to Theme. /// @@ -249,6 +852,24 @@ public static string Theme { } } + /// + /// Looks up a localized string similar to Traceroute. + /// + public static string Traceroute { + get { + return ResourceManager.GetString("Traceroute", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Transparency. + /// + public static string Transparency { + get { + return ResourceManager.GetString("Transparency", resourceCulture); + } + } + /// /// Looks up a localized string similar to Tray. /// @@ -258,6 +879,60 @@ public static string Tray { } } + /// + /// Looks up a localized string similar to Update. + /// + public static string Update { + get { + return ResourceManager.GetString("Update", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to v1/v2c. + /// + public static string v1v2c { + get { + return ResourceManager.GetString("v1v2c", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to v3. + /// + public static string v3 { + get { + return ResourceManager.GetString("v3", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Validation failed!. + /// + public static string ValidationFailed { + get { + return ResourceManager.GetString("ValidationFailed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Wake on LAN. + /// + public static string WakeOnLAN { + get { + return ResourceManager.GetString("WakeOnLAN", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Website. + /// + public static string Website { + get { + return ResourceManager.GetString("Website", resourceCulture); + } + } + /// /// Looks up a localized string similar to Window. /// @@ -266,5 +941,14 @@ public static string Window { return ResourceManager.GetString("Window", resourceCulture); } } + + /// + /// Looks up a localized string similar to Wrong credentials. + /// + public static string WrongCredentials { + get { + return ResourceManager.GetString("WrongCredentials", resourceCulture); + } + } } } diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx index 6681b458f1..6a98e35da7 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -123,67 +123,295 @@ Accent + + Add credentials + + + Add entry + + + Add profile + + + Are you sure? + ARP + + ARP Table + + + Authentication + Autostart + + Calculator + + + Command Line Arguments + Configure + + Confirm + + + Connect + + + Connect as + + + Copy profile + + + Credential not found! + + + Credentials + + + Data + Default application + + Delete credentials + + + Delete profile + Destination Details + + Disconnected + + + Display + DNS + + DNS Lookup + + + Don't fragment + + + Edit credentials + + + Edit group + + + Edit profile + + + Error + + + Export + + + Filter + + + General + + + Headers + + + History + + + HotKeys + + + HTTP Headers + + + Import + Information Interface + + IP Scanner + + + Keyboard + Language + + Libraries + + + License + + + Local devices and resources + Location + + Lookup + - MAC-Address + MAC Address + + + Master Password + + + Multithreading + + + Network + + + Network Interface + + + New tab + + + OUI + + + Overwrite? Ping + + Port + Portable + + Port Scanner + + + Profiles + + + PuTTY + + + Query + + + Remote Desktop + + + Reset + + + Resolve PTR + + + Resources + Result + + Route + + + Scan + + + Search + + + Select a profile... + + + Set Master Password + Settings + + Settings have been reset! + + + SNMP + + + Socket + Statistics Status + + Subnet + + + Subnetting + + + Success! + + + Supernetting + Theme + + Traceroute + + + Transparency + Tray + + Update + + + v1/v2c + + + v3 + + + Validation failed! + + + Wake on LAN + + + Website + Window + + Wrong credentials + \ No newline at end of file From 56dcce7eb780330cbbb408f65299059fcc18c6e5 Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Sat, 28 Jul 2018 01:27:17 +0200 Subject: [PATCH 04/24] Update --- .../Resources/Localization/Strings.Designer.cs | 6 +++--- Source/NETworkManager/Resources/Localization/Strings.resx | 4 ++-- Source/NETworkManager/Resources/Localization/de-DE.xaml | 2 -- Source/NETworkManager/Resources/Localization/en-US.xaml | 2 -- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs index 3723049985..9bd4b314d0 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -943,11 +943,11 @@ public static string Window { } /// - /// Looks up a localized string similar to Wrong credentials. + /// Looks up a localized string similar to Wrong password. /// - public static string WrongCredentials { + public static string WrongPassword { get { - return ResourceManager.GetString("WrongCredentials", resourceCulture); + return ResourceManager.GetString("WrongPassword", resourceCulture); } } } diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx index 6a98e35da7..ca866cf245 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -411,7 +411,7 @@ Window - - Wrong credentials + + Wrong password \ No newline at end of file diff --git a/Source/NETworkManager/Resources/Localization/de-DE.xaml b/Source/NETworkManager/Resources/Localization/de-DE.xaml index 5e45737905..03e6aecb53 100644 --- a/Source/NETworkManager/Resources/Localization/de-DE.xaml +++ b/Source/NETworkManager/Resources/Localization/de-DE.xaml @@ -6,8 +6,6 @@ Ziel Einstellungen Status - Clients - Client MAC-Adresse Details Interface diff --git a/Source/NETworkManager/Resources/Localization/en-US.xaml b/Source/NETworkManager/Resources/Localization/en-US.xaml index 99ed078726..8fc2129ab3 100644 --- a/Source/NETworkManager/Resources/Localization/en-US.xaml +++ b/Source/NETworkManager/Resources/Localization/en-US.xaml @@ -6,8 +6,6 @@ Destination Settings Status - Clients - Client MAC-Address Details Interface From 997b0541549cf082090eb1e07ce35f38f039f39c Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Sat, 28 Jul 2018 02:16:17 +0200 Subject: [PATCH 05/24] Update --- Source/NETworkManager/MainWindow.xaml.cs | 2 - Source/NETworkManager/NETworkManager.csproj | 12 +- .../Localization/Strings.Designer.cs | 2 +- .../Localization/Strings.de-DE.Designer.cs | 0 .../Resources/Localization/Strings.de-DE.resx | 336 +++++++++++++- .../Resources/Localization/Strings.es-ES.resx | 417 ++++++++++++++++++ .../Resources/Localization/Strings.resx | 2 +- .../Resources/Localization/Strings.ru-RU.resx | 417 ++++++++++++++++++ 8 files changed, 1154 insertions(+), 34 deletions(-) delete mode 100644 Source/NETworkManager/Resources/Localization/Strings.de-DE.Designer.cs create mode 100644 Source/NETworkManager/Resources/Localization/Strings.es-ES.resx create mode 100644 Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs index 936ba9a73e..1b1a2917ae 100644 --- a/Source/NETworkManager/MainWindow.xaml.cs +++ b/Source/NETworkManager/MainWindow.xaml.cs @@ -249,8 +249,6 @@ public MainWindow() // Language Meta LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(LocalizationManager.Culture.IetfLanguageTag))); - Debug.WriteLine(NETworkManager.Resources.Localization.Strings.Application); - // Load appearance AppearanceManager.Load(); diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj index 5b00190833..64a6c53cea 100644 --- a/Source/NETworkManager/NETworkManager.csproj +++ b/Source/NETworkManager/NETworkManager.csproj @@ -245,11 +245,6 @@ - - Strings.de-DE.resx - True - True - True True @@ -1130,14 +1125,13 @@ PublicResXFileCodeGenerator Resources.Designer.cs - - PublicResXFileCodeGenerator - Strings.de-DE.Designer.cs - + PublicResXFileCodeGenerator Strings.Designer.cs + + diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs index 9bd4b314d0..c3d3bb783f 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -943,7 +943,7 @@ public static string Window { } /// - /// Looks up a localized string similar to Wrong password. + /// Looks up a localized string similar to Wrong password!. /// public static string WrongPassword { get { diff --git a/Source/NETworkManager/Resources/Localization/Strings.de-DE.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.de-DE.Designer.cs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx index 0432785d1f..ada71554f7 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.de-DE.resx @@ -1,4 +1,4 @@ - + - - + + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -117,7 +117,301 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Anwendung + + Über - \ No newline at end of file + + Akzent + + + Anmeldeinformationen hinzufügen + + + Eintrag hinzufügen + + + Profil hinzufügen + + + Sind Sie sicher? + + + ARP + + + ARP-Tabelle + + + Authentifizierung + + + Autostart + + + Rechner + + + Befehlszeilenargumente + + + Konfigurieren + + + Bestätigen + + + Verbinden + + + Verbinden als + + + Profil kopieren + + + Anmeldeinformation nicht gefunden! + + + Anmeldeinformationen + + + Daten + + + Standardanwendung + + + Anmeldeinformation löschen + + + Profil löschen + + + Ziel + + + Details + + + Getrennt + + + Anzeige + + + DNS + + + DNS-Lookup + + + Nicht fragmentieren + + + Anmeldeinformation bearbeiten + + + Gruppe bearbeiten + + + Profil bearbeiten + + + Fehler + + + Exportieren + + + Filter + + + Allgemein + + + Headers + + + History + + + HotKeys + + + HTTP-Headers + + + Importieren + + + Informationen + + + Interface + + + IP-Scanner + + + Tastatur + + + Sprache + + + Bibliotheken + + + Lizenz + + + Lokale Geräte und Ressourcen + + + Speicherort + + + Lookup + + + MAC-Adresse + + + Masterpasswort + + + Multithreading + + + Netzwerk + + + Netzwerkinterface + + + Neuer Tab + + + OUI + + + Überschreiben? + + + Ping + + + Port + + + Portable + + + Port-Scanner + + + Profile + + + PuTTY + + + Abfrage + + + Remote Desktop + + + Zurücksetzen + + + Resolve PTR + + + Ressourcen + + + Ergebnis + + + Route + + + Scannen + + + Suche + + + Profil auswählen... + + + Masterpasswort setzen + + + Einstellungen + + + Einstellungen wurden zurückgesetzt! + + + SNMP + + + Socket + + + Statistik + + + Status + + + Subnetz + + + Subnetting + + + Erfolgreich! + + + Supernetting + + + Thema + + + Traceroute + + + Transparenz + + + Tray + + + Update + + + v1/v2c + + + v3 + + + Validierung fehlgeschlagen! + + + Wake on LAN + + + Webseite + + + Fenster + + + Falsches Passwort! + + diff --git a/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx b/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx new file mode 100644 index 0000000000..19859890e1 --- /dev/null +++ b/Source/NETworkManager/Resources/Localization/Strings.es-ES.resx @@ -0,0 +1,417 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Acerca de + + + Tono + + + Añadir credencial + + + Añadir entrada + + + Añadir perfil + + + ¿Estás seguro? + + + ARP + + + Tabla ARP + + + Autenticación + + + Inicio automático + + + Calculadora + + + Argumentos de línea de comandos + + + Configurar + + + Confirmar + + + Conectar + + + Conectar como + + + Copiar perfil + + + ¡Credencial no encontrada! + + + Credenciales + + + Datos + + + Aplicación predeterminada + + + Eliminar credencial + + + Eliminar perfil + + + Destino + + + Detalles + + + Desconectado + + + Visualizar + + + DNS + + + Búsqueda de DNS + + + No fragmentar + + + Editar credencial + + + Editar grupo + + + Editar perfil + + + Error + + + Exportar + + + Filtrar + + + General + + + Encabezados + + + Historial + + + Atajos del teclado + + + Encabezados HTTP + + + Importar + + + Información + + + Interfaz + + + Escáner de IP + + + Keyboard + + + Idioma + + + Librerías + + + Licencia + + + Dispositivos y recursos locales + + + Ubicación + + + Búsqueda + + + Dirección MAC + + + Contraseña maestra + + + Multi-hilo + + + Red + + + Interfaz de red + + + Nueva pestaña + + + OUI + + + ¿Sobrescribir? + + + Ping + + + Puerto + + + Portable + + + Escáner de puertos + + + Perfiles + + + PuTTY + + + Consulta + + + Escritorio remoto + + + Restablecer + + + Resolver PTR + + + Recursos + + + Resultado + + + Route + + + Escanear + + + Buscar + + + Seleccione un perfil... + + + Establecer contraseña maestra + + + Configuración + + + Settings have been reset! + + + SNMP + + + Socket + + + Estadísticas + + + Estado + + + Subred + + + Subredes + + + ¡Éxito! + + + Superredes + + + Tema + + + Traceroute + + + Transparencia + + + Fijar + + + Actualizar + + + v1/v2c + + + v3 + + + ¡Validación fallida! + + + Wake on LAN + + + Sitio web + + + Ventana + + + ¡Contraseña incorrecta! + + diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx index ca866cf245..146b91542c 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -412,6 +412,6 @@ Window - Wrong password + Wrong password! \ No newline at end of file diff --git a/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx b/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx new file mode 100644 index 0000000000..5570d75d0c --- /dev/null +++ b/Source/NETworkManager/Resources/Localization/Strings.ru-RU.resx @@ -0,0 +1,417 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Справка + + + Тон + + + Добавить учетные данные + + + Добавить запись + + + Добавить профиль + + + Вы уверены? + + + ARP + + + ARP Таблица + + + Идентификация + + + Автозапуск + + + Калькулятор + + + Параметр командной строки + + + Конфигурация + + + Подтвердить + + + Подключить + + + Подключить как + + + Копировать профиль + + + Учетные данные не найдены! + + + Учетные данные + + + Данные + + + Приложение по умолчанию + + + Удалить учетные данные + + + Удалить профиль + + + Цель + + + Подробности + + + Отсоединенный + + + Дисплей + + + DNS + + + поиск DNS + + + Не фрагментировать + + + Изменить учетные данные + + + Изменить группу + + + Изменить профиль + + + Ошибка + + + Экспорт + + + Фильтр + + + General + + + Заголовки + + + История + + + Комбинация клавиш + + + HTTP Headers + + + Импорт + + + Информация + + + Интерфейс + + + IP Scanner + + + Keyboard + + + Язык + + + Библиотеки + + + Лицензия + + + Локальные устройства и ресурсы + + + Расположение + + + Lookup + + + MAC-адрес + + + Мастер-пароль + + + Многопоточный режим + + + Сеть + + + Network Interface + + + Новая вкладка + + + OUI + + + Изменить + + + Ping + + + Порт + + + Портативный + + + Сканер портов + + + Профили + + + PuTTY + + + Запрос + + + Remote Desktop + + + Сброс + + + Resolve PTR + + + Ресурсы + + + Результат + + + Route + + + Скан + + + Поиск + + + Выберите профиль... + + + Установить мастер-пароль + + + Установки + + + Settings have been reset! + + + SNMP + + + Socket + + + Статистика + + + Состояние + + + Подсеть + + + Разбиение на подсети + + + Успешно! + + + Супер плетение + + + Тема + + + Traceroute + + + Прозрачность + + + Tray + + + Обновление + + + v1/v2c + + + v3 + + + Проверка не удалась! + + + Wake on LAN + + + Вебсайт + + + Окно + + + Неверный пароль! + + From 042173e41a2e85a4eb04697a22752cf62d0b388e Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Sun, 29 Jul 2018 01:54:33 +0200 Subject: [PATCH 06/24] Update --- .../NETworkManager/Controls/PuTTYControl.xaml | 7 +- .../Controls/PuTTYControl.xaml.cs | 2 +- .../Controls/RemoteDesktopControl.xaml | 3 +- Source/NETworkManager/MainWindow.xaml | 3 +- Source/NETworkManager/MainWindow.xaml.cs | 5 +- .../Localization/Strings.Designer.cs | 9 ++ .../Resources/Localization/Strings.resx | 3 + .../Resources/Localization/de-DE.xaml | 107 +----------------- .../Resources/Localization/en-US.xaml | 105 ----------------- .../Resources/Localization/es-ES.xaml | 107 ------------------ .../Resources/Localization/ru-RU.xaml | 107 ------------------ .../ViewModels/ARPTableViewModel.cs | 68 +++++------ .../ViewModels/CredentialsViewModel.cs | 42 +++---- .../ViewModels/DNSLookupHostViewModel.cs | 6 +- .../ViewModels/HTTPHeadersHostViewModel.cs | 4 +- .../ViewModels/IPScannerHostViewModel.cs | 14 +-- .../ViewModels/NetworkInterfaceViewModel.cs | 12 +- .../ViewModels/PingHostViewModel.cs | 46 ++++---- .../ViewModels/PortScannerHostViewModel.cs | 16 +-- .../ViewModels/ProfilesViewModel.cs | 10 +- .../ViewModels/PuTTYHostViewModel.cs | 12 +- .../ViewModels/PuTTYSettingsViewModel.cs | 2 +- .../ViewModels/RemoteDesktopHostViewModel.cs | 22 ++-- .../ViewModels/SNMPHostViewModel.cs | 4 +- .../ViewModels/SettingsAutostartViewModel.cs | 2 +- .../SettingsImportExportViewModel.cs | 8 +- .../ViewModels/SettingsSettingsViewModel.cs | 10 +- .../SubnetCalculatorSubnettingViewModel.cs | 2 +- .../ViewModels/TracerouteHostViewModel.cs | 14 +-- .../ViewModels/WakeOnLANViewModel.cs | 10 +- Source/NETworkManager/Views/AboutView.xaml | 7 +- .../Views/CommandLineHelpWindow.xaml | 3 +- .../Views/DNSLookupSettingsView.xaml | 5 +- .../NETworkManager/Views/DNSLookupView.xaml | 7 +- .../Views/HTTPHeadersSettingsView.xaml | 5 +- .../NETworkManager/Views/HTTPHeadersView.xaml | 7 +- .../Views/IPScannerHostView.xaml | 3 +- .../Views/IPScannerSettingsView.xaml | 13 ++- .../NETworkManager/Views/IPScannerView.xaml | 7 +- .../NETworkManager/Views/LookupHostView.xaml | 5 +- .../Views/LookupOUILookupView.xaml | 5 +- .../Views/LookupPortLookupView.xaml | 5 +- .../Views/NetworkInterfaceView.xaml | 15 +-- Source/NETworkManager/Views/PingHostView.xaml | 3 +- .../Views/PingSettingsView.xaml | 9 +- Source/NETworkManager/Views/PingView.xaml | 7 +- .../Views/PortScannerHostView.xaml | 3 +- .../Views/PortScannerSettingsView.xaml | 11 +- .../NETworkManager/Views/PortScannerView.xaml | 7 +- .../NETworkManager/Views/ProfileDialog.xaml | 19 ++-- Source/NETworkManager/Views/ProfilesView.xaml | 17 +-- .../NETworkManager/Views/PuTTYHostView.xaml | 3 +- .../Views/PuTTYSettingsView.xaml | 3 +- .../Views/RemoteDesktopHostView.xaml | 3 +- .../Views/RemoteDesktopSettingsView.xaml | 11 +- .../Views/SNMPSettingsView.xaml | 7 +- Source/NETworkManager/Views/SNMPView.xaml | 11 +- .../Views/SettingsAppearanceView.xaml | 7 +- .../Views/SettingsAutostartView.xaml | 3 +- .../Views/SettingsGeneralView.xaml | 5 +- .../Views/SettingsImportExportView.xaml | 5 +- .../Views/SettingsLanguageView.xaml | 3 +- .../Views/SettingsSettingsView.xaml | 7 +- .../Views/SettingsUpdateView.xaml | 3 +- Source/NETworkManager/Views/SettingsView.xaml | 15 +-- .../Views/SettingsWindowView.xaml | 5 +- .../Views/SubnetCalculatorCalculatorView.xaml | 5 +- .../Views/SubnetCalculatorHostView.xaml | 10 +- .../Views/SubnetCalculatorSubnettingView.xaml | 5 +- .../SubnetCalculatorSupernettingView.xaml | 5 +- .../Views/TracerouteHostView.xaml | 3 +- .../Views/TracerouteSettingsView.xaml | 9 +- .../NETworkManager/Views/TracerouteView.xaml | 7 +- .../Views/WakeOnLANSettingsView.xaml | 3 +- .../NETworkManager/Views/WakeOnLANView.xaml | 5 +- 75 files changed, 346 insertions(+), 722 deletions(-) diff --git a/Source/NETworkManager/Controls/PuTTYControl.xaml b/Source/NETworkManager/Controls/PuTTYControl.xaml index 6eb7a07f50..46544cc8bb 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,7 +25,7 @@ - + - + diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs index 1b1a2917ae..d0cc3d8e3a 100644 --- a/Source/NETworkManager/MainWindow.xaml.cs +++ b/Source/NETworkManager/MainWindow.xaml.cs @@ -21,7 +21,6 @@ using NETworkManager.Models.Update; using NETworkManager.Models.Documentation; using ContextMenu = System.Windows.Controls.ContextMenu; -using MessageBox = System.Windows.MessageBox; namespace NETworkManager { @@ -302,7 +301,7 @@ protected override async void OnContentRendered(EventArgs e) ConfigurationManager.Current.IsDialogOpen = true; - await this.ShowMessageAsync(LocalizationManager.GetStringByKey("String_Header_SettingsHaveBeenReset"), LocalizationManager.GetStringByKey("String_SettingsFileFoundWasCorruptOrNotCompatibleMessage"), MessageDialogStyle.Affirmative, settings); + await this.ShowMessageAsync(NETworkManager.Resources.Localization.Strings.SettingsHaveBeenReset, LocalizationManager.GetStringByKey("String_SettingsFileFoundWasCorruptOrNotCompatibleMessage"), MessageDialogStyle.Affirmative, settings); ConfigurationManager.Current.IsDialogOpen = false; } @@ -382,7 +381,7 @@ private async void MetroWindowMain_Closing(object sender, CancelEventArgs e) // Fix airspace issues ConfigurationManager.Current.IsDialogOpen = true; - var result = await this.ShowMessageAsync(LocalizationManager.GetStringByKey("String_Header_Confirm"), LocalizationManager.GetStringByKey("String_ConfirmCloseQuesiton"), MessageDialogStyle.AffirmativeAndNegative, settings); + var result = await this.ShowMessageAsync(NETworkManager.Resources.Localization.Strings.Confirm, LocalizationManager.GetStringByKey("String_ConfirmCloseQuesiton"), MessageDialogStyle.AffirmativeAndNegative, settings); ConfigurationManager.Current.IsDialogOpen = false; diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs index c3d3bb783f..ad09403783 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -159,6 +159,15 @@ public static string Calculator { } } + /// + /// Looks up a localized string similar to Client. + /// + public static string Client { + get { + return ResourceManager.GetString("Client", resourceCulture); + } + } + /// /// Looks up a localized string similar to Command Line Arguments. /// diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx index 146b91542c..043558c2e8 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -414,4 +414,7 @@ Wrong password! + + Client + \ No newline at end of file diff --git a/Source/NETworkManager/Resources/Localization/de-DE.xaml b/Source/NETworkManager/Resources/Localization/de-DE.xaml index 03e6aecb53..28ac169b6a 100644 --- a/Source/NETworkManager/Resources/Localization/de-DE.xaml +++ b/Source/NETworkManager/Resources/Localization/de-DE.xaml @@ -2,112 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib"> - - Ziel - Einstellungen - Status - MAC-Adresse - Details - Interface - Informationen - Konfigurieren - Statistik - Über - Fenster - Sprache - Autostart - Thema - Akzent - Tray - Speicherort - Portable - Standardanwendung - Ergebnis - Ping - DNS - ARP - Traceroute - Multithreading - Bestätigen - HotKeys - DNS Lookup - Route - Nicht fragmentieren - Importieren - Exportieren - Zurücksetzen - Fehler - Sind Sie sicher? - Validierung fehlgeschlagen! - Erfolgreich! - OUI - Port-Scanner - Port - Socket - History - Update - Transparenz - Wake on LAN - Befehlszeilenargumente - Profil auswählen... - Profile - Profil hinzufügen - Profil bearbeiten - Profil kopieren - Profil löschen - Client hinzufügen - Client bearbeiten - Client kopieren - Client löschen - Bibliotheken - Lizenz - Suche - Scannen - Lookup - Subnetz - Rechner - Verbinden - Remote Desktop - Getrennt - Lokale Geräte und Ressourcen - Anzeige - Filter - ARP-Tabelle - Webseite - Headers - Eintrag hinzufügen - Anmeldeinformationen - Masterpasswort - Masterpasswort setzen - Falsches Passwort! - Anmeldeinformation hinzufügen - Anmeldeinformation bearbeiten - Anmeldeinformation löschen - Authentifizierung - Anmeldeinformation nicht gefunden! - Verbinden als - Abfrage - SNMP - v1/v2c - v3 - HTTP-Headers - Netzwerk - Daten - IP-Scanner - PuTTY - Gruppe bearbeiten - Überschreiben? - Neuer Tab - Ressourcen - Subnetting - Supernetting - Netzwerkinterface - Allgemein - Resolve PTR - Tastatur - Einstellungen wurden zurückgesetzt! - - + NETworkManager Ein leistungsstarkes Tool zum Verwalten von Netzwerken und zur Behebung von Netzwerkproblemen! Einstellungen diff --git a/Source/NETworkManager/Resources/Localization/en-US.xaml b/Source/NETworkManager/Resources/Localization/en-US.xaml index 8fc2129ab3..64b9218e0f 100644 --- a/Source/NETworkManager/Resources/Localization/en-US.xaml +++ b/Source/NETworkManager/Resources/Localization/en-US.xaml @@ -2,111 +2,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib"> - - Destination - Settings - Status - MAC-Address - Details - Interface - Information - Configure - Statistics - About - Window - Language - Autostart - Theme - Accent - Tray - Location - Portable - Default application - Result - Ping - DNS - ARP - Traceroute - Multithreading - Confirm - HotKeys - DNS Lookup - Route - Don't fragment - Import - Export - Reset - Error - Are you sure? - Validation failed! - Success! - OUI - Port Scanner - Port - Socket - History - Update - Transparency - Wake on LAN - Command Line Arguments - Select a profile... - Profiles - Add profile - Edit profile - Copy profile - Delete profile - Add client - Edit client - Copy client - Delete client - Libraries - License - Search - Scan - Lookup - Subnet - Calculator - Connect - Remote Desktop - Disconnected - Local devices and resources - Display - Filter - ARP Table - Website - Headers - Add entry - Credentials - Master Password - Set Master Password - Wrong password! - Add credential - Edit credential - Delete credential - Authentication - Credential not found! - Connect as - Query - SNMP - v1/v2c - v3 - HTTP Headers - Network - Data - IP Scanner - PuTTY - Edit group - Overwrite? - New tab - Resources - Subnetting - Supernetting - Network Interface - General - Resolve PTR - Keyboard - Settings have been reset! - NETworkManager A powerful tool for managing networks and troubleshoot network problems! diff --git a/Source/NETworkManager/Resources/Localization/es-ES.xaml b/Source/NETworkManager/Resources/Localization/es-ES.xaml index 2ca319ca97..7e4aa6d0e7 100644 --- a/Source/NETworkManager/Resources/Localization/es-ES.xaml +++ b/Source/NETworkManager/Resources/Localization/es-ES.xaml @@ -2,113 +2,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib"> - - Destino - Configuración - Estado - Clientes - Cliente - Dirección MAC - Detalles - Interfaz - Información - Configurar - Estadísticas - Acerca de - Ventana - Idioma - Inicio automático - Tema - Tono - Fijar - Ubicación - Portable - Aplicación predeterminada - Resultado - Ping - DNS - ARP - Traceroute - Multi-hilo - Confirmar - Atajos del teclado - Búsqueda de DNS - Route - No fragmentar - Importar - Exportar - Restablecer - Error - ¿Estás seguro? - ¡Validación fallida! - ¡Éxito! - OUI - Escáner de puertos - Puerto - Socket - Historial - Actualizar - Transparencia - Wake on LAN - Argumentos de línea de comandos - Seleccione un perfil... - Perfiles - Añadir perfil - Editar perfil - Copiar perfil - Eliminar perfil - Añadir cliente - Editar cliente - Copiar cliente - Eliminar cliente - Librerías - Licencia - Buscar - Escanear - Búsqueda - Subred - Calculadora - Conectar - Escritorio remoto - Desconectado - Dispositivos y recursos locales - Visualizar - Filtrar - Tabla ARP - Sitio web - Encabezados - Añadir entrada - Credenciales - Contraseña maestra - Establecer contraseña maestra - ¡Contraseña incorrecta! - Añadir credencial - Editar credencial - Eliminar credencial - Autenticación - ¡Credencial no encontrada! - Conectar como - Consulta - SNMP - v1/v2c - v3 - Encabezados HTTP - Red - Datos - Escáner de IP - PuTTY - Editar grupo - ¿Sobrescribir? - Nueva pestaña - Recursos - Subredes - Superredes - Interfaz de red - General - Resolver PTR - Keyboard - Settings have been reset! - NETworkManager ¡Una potente herramienta para gestionar redes y solucionar problemas de red! diff --git a/Source/NETworkManager/Resources/Localization/ru-RU.xaml b/Source/NETworkManager/Resources/Localization/ru-RU.xaml index 819fac5c38..238190ff03 100644 --- a/Source/NETworkManager/Resources/Localization/ru-RU.xaml +++ b/Source/NETworkManager/Resources/Localization/ru-RU.xaml @@ -2,113 +2,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib"> - - Цель - Установки - Состояние - Клиенты - Клиент - MAC-адрес - Подробности - Интерфейс - Информация - Конфигурация - Статистика - Справка - Окно - Язык - Автозапуск - Тема - Тон - Tray - Расположение - Портативный - Приложение по умолчанию - Результат - Ping - DNS - ARP - Traceroute - Многопоточный режим - Подтвердить - Комбинация клавиш - поиск DNS - Route - Не фрагментировать - Импорт - Экспорт - Сброс - Ошибка - Вы уверены? - Проверка не удалась! - Успешно! - OUI - Сканер портов - Порт - Socket - История - Обновление - Прозрачность - Wake on LAN - Параметр командной строки - Выберите профиль... - Профили - Добавить профиль - Изменить профиль - Копировать профиль - Удалить профиль - Добавить клиента - Изменить клиента - Копировать клиента - Удалить клиента - Библиотеки - Лицензия - Поиск - Скан - Lookup - Подсеть - Калькулятор - Подключить - Remote Desktop - Отсоединенный - Локальные устройства и ресурсы - Дисплей - Фильтр - ARP Таблица - Вебсайт - Заголовки - Добавить запись - Учетные данные - Мастер-пароль - Установить мастер-пароль - Неверный пароль! - Добавить учетные данные - Изменить учетные данные - Удалить учетные данные - Идентификация - Учетные данные не найдены! - Подключить как - Запрос - SNMP - v1/v2c - v3 - HTTP Headers - Сеть - Данные - IP Scanner - PuTTY - Изменить группу - Изменить - Новая вкладка - Ресурсы - Разбиение на подсети - Супер плетение - Network Interface - General - Resolve PTR - Keyboard - Settings have been reset! - NETworkManager Мощный инструмент для управления сетями и устранения сетевых проблем! diff --git a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs index 9b61006630..fcd90c6a6d 100644 --- a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs +++ b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs @@ -17,15 +17,15 @@ namespace NETworkManager.ViewModels public class ARPTableViewModel : ViewModelBase { #region Variables - private IDialogCoordinator dialogCoordinator; + private readonly IDialogCoordinator _dialogCoordinator; - private bool _isLoading = true; - private DispatcherTimer _autoRefreshTimer = new DispatcherTimer(); + private readonly bool _isLoading; + private readonly DispatcherTimer _autoRefreshTimer = new DispatcherTimer(); private string _search; public string Search { - get { return _search; } + get => _search; set { if (value == _search) @@ -42,7 +42,7 @@ public string Search private ObservableCollection _arpTable = new ObservableCollection(); public ObservableCollection ARPTable { - get { return _arpTable; } + get => _arpTable; set { if (value == _arpTable) @@ -53,16 +53,12 @@ public ObservableCollection ARPTable } } - private ICollectionView _arpTableView; - public ICollectionView ARPTableView - { - get { return _arpTableView; } - } + public ICollectionView ARPTableView { get; } private ARPTableInfo _selectedARPTableInfo; public ARPTableInfo SelectedARPTableInfo { - get { return _selectedARPTableInfo; } + get => _selectedARPTableInfo; set { if (value == _selectedARPTableInfo) @@ -76,7 +72,7 @@ public ARPTableInfo SelectedARPTableInfo private bool _autoRefresh; public bool AutoRefresh { - get { return _autoRefresh; } + get => _autoRefresh; set { if (value == _autoRefresh) @@ -100,16 +96,12 @@ public bool AutoRefresh } } - private ICollectionView _autoRefreshTimes; - public ICollectionView AutoRefreshTimes - { - get { return _autoRefreshTimes; } - } + public ICollectionView AutoRefreshTimes { get; } private AutoRefreshTimeInfo _selectedAutoRefreshTime; public AutoRefreshTimeInfo SelectedAutoRefreshTime { - get { return _selectedAutoRefreshTime; } + get => _selectedAutoRefreshTime; set { if (value == _selectedAutoRefreshTime) @@ -130,7 +122,7 @@ public AutoRefreshTimeInfo SelectedAutoRefreshTime private bool _isRefreshing; public bool IsRefreshing { - get { return _isRefreshing; } + get => _isRefreshing; set { if (value == _isRefreshing) @@ -144,7 +136,7 @@ public bool IsRefreshing private bool _displayStatusMessage; public bool DisplayStatusMessage { - get { return _displayStatusMessage; } + get => _displayStatusMessage; set { if (value == _displayStatusMessage) @@ -158,7 +150,7 @@ public bool DisplayStatusMessage private string _statusMessage; public string StatusMessage { - get { return _statusMessage; } + get => _statusMessage; set { if (value == _statusMessage) @@ -173,24 +165,26 @@ public string StatusMessage #region Contructor, load settings public ARPTableViewModel(IDialogCoordinator instance) { - dialogCoordinator = instance; + _isLoading = true; + _dialogCoordinator = instance; - _arpTableView = CollectionViewSource.GetDefaultView(ARPTable); - _arpTableView.SortDescriptions.Add(new SortDescription(nameof(ARPTableInfo.IPAddressInt32), ListSortDirection.Ascending)); - _arpTableView.Filter = o => + ARPTableView = CollectionViewSource.GetDefaultView(ARPTable); + ARPTableView.SortDescriptions.Add(new SortDescription(nameof(ARPTableInfo.IPAddressInt32), ListSortDirection.Ascending)); + ARPTableView.Filter = o => { + if (!(o is ARPTableInfo info)) + return false; + if (string.IsNullOrEmpty(Search)) return true; - ARPTableInfo info = o as ARPTableInfo; - - string filter = Search.Replace(" ", "").Replace("-", "").Replace(":", ""); + var filter = Search.Replace(" ", "").Replace("-", "").Replace(":", ""); // Search by IPAddress and MACAddress return info.IPAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || info.MACAddress.ToString().IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1 || (info.IsMulticast ? LocalizationManager.GetStringByKey("String_Yes") : LocalizationManager.GetStringByKey("String_No")).IndexOf(filter, StringComparison.OrdinalIgnoreCase) > -1; }; - _autoRefreshTimes = CollectionViewSource.GetDefaultView(AutoRefreshTime.Defaults); + AutoRefreshTimes = CollectionViewSource.GetDefaultView(AutoRefreshTime.Defaults); SelectedAutoRefreshTime = AutoRefreshTimes.SourceCollection.Cast().FirstOrDefault(x => (x.Value == SettingsManager.Current.ARPTable_AutoRefreshTime.Value && x.TimeUnit == SettingsManager.Current.ARPTable_AutoRefreshTime.TimeUnit)); _autoRefreshTimer.Tick += AutoRefreshTimer_Tick; @@ -235,7 +229,7 @@ private async void DeleteTableAction() try { - ARPTable arpTable = new ARPTable(); + var arpTable = new ARPTable(); arpTable.UserHasCanceled += ArpTable_UserHasCanceled; @@ -285,18 +279,18 @@ private async void AddEntryAction() { DisplayStatusMessage = false; - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddEntry") + Title = Resources.Localization.Strings.AddEntry }; - ArpTableAddEntryViewModel arpTableAddEntryViewModel = new ArpTableAddEntryViewModel(async instance => + var arpTableAddEntryViewModel = new ArpTableAddEntryViewModel(async instance => { - await dialogCoordinator.HideMetroDialogAsync(this, customDialog); + await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); try { - ARPTable arpTable = new ARPTable(); + var arpTable = new ARPTable(); arpTable.UserHasCanceled += ArpTable_UserHasCanceled; @@ -311,7 +305,7 @@ private async void AddEntryAction() } }, instance => { - dialogCoordinator.HideMetroDialogAsync(this, customDialog); + _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }); customDialog.Content = new ARPTableAddEntryDialog @@ -319,7 +313,7 @@ private async void AddEntryAction() DataContext = arpTableAddEntryViewModel }; - await dialogCoordinator.ShowMetroDialogAsync(this, customDialog); + await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog); } public ICommand CopySelectedIPAddressCommand diff --git a/Source/NETworkManager/ViewModels/CredentialsViewModel.cs b/Source/NETworkManager/ViewModels/CredentialsViewModel.cs index 2930bb2cdc..a55485a569 100644 --- a/Source/NETworkManager/ViewModels/CredentialsViewModel.cs +++ b/Source/NETworkManager/ViewModels/CredentialsViewModel.cs @@ -250,7 +250,7 @@ public async void SetMasterPassword() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_SetMasterPassword") + Title = Resources.Localization.Strings.SetMasterPassword }; var credentialsSetMasterPasswordViewModel = new CredentialsSetMasterPasswordViewModel(instance => @@ -279,17 +279,17 @@ public async void SetMasterPassword() public async void DecryptAndLoad() { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_MasterPassword") + Title = Resources.Localization.Strings.MasterPassword }; - CredentialsMasterPasswordViewModel credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance => + var credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); if (!CredentialManager.Load(instance.Password)) - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_WrongPassword"), LocalizationManager.GetStringByKey("String_WrongPasswordDecryptionFailed"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.WrongPassword, LocalizationManager.GetStringByKey("String_WrongPasswordDecryptionFailed"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); CheckCredentialsLoaded(); @@ -311,7 +311,7 @@ public async void ChangeMasterPassword() { var customDialogSetMasterPassword = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_SetMasterPassword") + Title = Resources.Localization.Strings.SetMasterPassword }; var credentialsSetMasterPasswordViewModel = new CredentialsSetMasterPasswordViewModel(instance => @@ -337,14 +337,14 @@ public async void Add() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddCredential") + Title = Resources.Localization.Strings.AddCredentials }; var credentialViewModel = new CredentialViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); - CredentialInfo credentialInfo = new CredentialInfo + var credentialInfo = new CredentialInfo { ID = instance.Id, Name = instance.Name, @@ -370,18 +370,18 @@ public async void Add() public async void Edit() { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditCredential") + Title = Resources.Localization.Strings.EditCredentials }; - CredentialViewModel credentialViewModel = new CredentialViewModel(instance => + var credentialViewModel = new CredentialViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); CredentialManager.RemoveCredential(SelectedCredential); - CredentialInfo credentialInfo = new CredentialInfo + var credentialInfo = new CredentialInfo { ID = instance.Id, Name = instance.Name, @@ -407,18 +407,18 @@ public async void Edit() public async void Delete() { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteCredential") + Title = Resources.Localization.Strings.DeleteCredentials }; - ConfirmRemoveViewModel confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => + var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); - List list = new List(SelectedCredentials.Cast()); + var list = new List(SelectedCredentials.Cast()); - foreach (CredentialInfo credential in list) + foreach (var credential in list) CredentialManager.RemoveCredential(credential); TimerLockUiStart(); // Reset timer @@ -439,19 +439,19 @@ public async void LockUnlock() { if (IsLocked) { - CustomDialog customDialogMasterPassword = new CustomDialog + var customDialogMasterPassword = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_MasterPassword") + Title = Resources.Localization.Strings.MasterPassword }; - CredentialsMasterPasswordViewModel credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance => + var credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialogMasterPassword); if (CredentialManager.VerifyMasterPasword(instance.Password)) TimerLockUiStart(); else - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_WrongPassword"), LocalizationManager.GetStringByKey("String_WrongPassword"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.WrongPassword, LocalizationManager.GetStringByKey("String_WrongPassword"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); }, instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialogMasterPassword); diff --git a/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs index bf5451402d..a52f757d63 100644 --- a/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs @@ -38,7 +38,7 @@ public DNSLookupHostViewModel() TabItems = new ObservableCollection { - new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new DNSLookupView (_tabId), _tabId) + new DragablzTabItem(Resources.Localization.Strings.NewTab, new DNSLookupView (_tabId), _tabId) }; } #endregion @@ -67,8 +67,8 @@ public void AddTab(string host = null) { _tabId++; - TabItems.Add(new DragablzTabItem(host ?? LocalizationManager.GetStringByKey("String_Header_NewTab"), new DNSLookupView(_tabId, host), _tabId)); - + TabItems.Add(new DragablzTabItem(host ?? Resources.Localization.Strings.NewTab, new DNSLookupView(_tabId, host), _tabId)); + SelectedTabIndex = TabItems.Count - 1; } #endregion diff --git a/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs b/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs index 57447e5e31..32e301f9f9 100644 --- a/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/HTTPHeadersHostViewModel.cs @@ -38,7 +38,7 @@ public HTTPHeadersHostViewModel() TabItems = new ObservableCollection { - new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new HTTPHeadersView (_tabId), _tabId) + new DragablzTabItem(Resources.Localization.Strings.NewTab, new HTTPHeadersView (_tabId), _tabId) }; } #endregion @@ -67,7 +67,7 @@ private void AddTab() { _tabId++; - TabItems.Add(new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new HTTPHeadersView(_tabId), _tabId)); + TabItems.Add(new DragablzTabItem(Resources.Localization.Strings.NewTab, new HTTPHeadersView(_tabId), _tabId)); SelectedTabIndex = TabItems.Count - 1; } diff --git a/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs index 64d84a73bf..1a50223dbc 100644 --- a/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs @@ -134,7 +134,7 @@ public IPScannerHostViewModel(IDialogCoordinator instance) TabItems = new ObservableCollection() { - new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new IPScannerView(_tabId), _tabId) + new DragablzTabItem(Resources.Localization.Strings.NewTab, new IPScannerView(_tabId), _tabId) }; Profiles = new CollectionViewSource { Source = ProfileManager.Profiles }.View; @@ -197,7 +197,7 @@ private async void AddProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title =Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -227,7 +227,7 @@ private async void EditProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -259,7 +259,7 @@ private async void CopyAsProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -289,7 +289,7 @@ private async void DeleteProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -326,7 +326,7 @@ private async void EditGroupAction(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => @@ -396,7 +396,7 @@ public void AddTab(string host = null) { _tabId++; - TabItems.Add(new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new IPScannerView(_tabId, host), _tabId)); + TabItems.Add(new DragablzTabItem(Resources.Localization.Strings.NewTab, new IPScannerView(_tabId, host), _tabId)); SelectedTabIndex = TabItems.Count - 1; } diff --git a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs index 9c913279ff..e4cfb85c4b 100644 --- a/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs +++ b/Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs @@ -789,7 +789,7 @@ public async void OpenNetworkConnectionsAction() } catch (Exception ex) { - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error"), ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); } } @@ -822,7 +822,7 @@ private async void AddProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -852,7 +852,7 @@ private async void EditProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -884,7 +884,7 @@ private async void CopyAsProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -914,7 +914,7 @@ private async void DeleteProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -941,7 +941,7 @@ private async void EditGroupAction(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => diff --git a/Source/NETworkManager/ViewModels/PingHostViewModel.cs b/Source/NETworkManager/ViewModels/PingHostViewModel.cs index 46a13d5ed7..9b5a79ebf6 100644 --- a/Source/NETworkManager/ViewModels/PingHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/PingHostViewModel.cs @@ -135,7 +135,7 @@ public PingHostViewModel(IDialogCoordinator instance) TabItems = new ObservableCollection { - new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new PingView(_tabId), _tabId) + new DragablzTabItem(Resources.Localization.Strings.NewTab, new PingView(_tabId), _tabId) }; Profiles = new CollectionViewSource { Source = ProfileManager.Profiles }.View; @@ -174,10 +174,7 @@ private void LoadSettings() { ExpandProfileView = SettingsManager.Current.Ping_ExpandProfileView; - if (ExpandProfileView) - ProfileWidth = new GridLength(SettingsManager.Current.Ping_ProfileWidth); - else - ProfileWidth = new GridLength(40); + ProfileWidth = ExpandProfileView ? new GridLength(SettingsManager.Current.Ping_ProfileWidth) : new GridLength(40); _tempProfileWidth = SettingsManager.Current.Ping_ProfileWidth; } @@ -211,12 +208,12 @@ public ICommand AddProfileCommand private async void AddProfileAction() { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; - ProfileViewModel profileViewModel = new ProfileViewModel(instance => + var profileViewModel = new ProfileViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); @@ -241,12 +238,12 @@ public ICommand EditProfileCommand private async void EditProfileAction() { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; - ProfileViewModel profileViewModel = new ProfileViewModel(instance => + var profileViewModel = new ProfileViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); @@ -273,12 +270,12 @@ public ICommand CopyAsProfileCommand private async void CopyAsProfileAction() { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; - ProfileViewModel profileViewModel = new ProfileViewModel(instance => + var profileViewModel = new ProfileViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); @@ -303,12 +300,12 @@ public ICommand DeleteProfileCommand private async void DeleteProfileAction() { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; - ConfirmRemoveViewModel confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => + var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); @@ -326,19 +323,16 @@ private async void DeleteProfileAction() await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog); } - public ICommand EditGroupCommand - { - get { return new RelayCommand(p => EditGroupAction(p)); } - } + public ICommand EditGroupCommand => new RelayCommand(EditGroupAction); private async void EditGroupAction(object group) { - CustomDialog customDialog = new CustomDialog + var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; - GroupViewModel editGroupViewModel = new GroupViewModel(instance => + var editGroupViewModel = new GroupViewModel(instance => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); @@ -370,7 +364,7 @@ private void ClearSearchAction() private static void CloseItemAction(ItemActionCallbackArgs args) { - ((args.DragablzItem.Content as DragablzTabItem)?.View as PingView).CloseTab(); + ((args.DragablzItem.Content as DragablzTabItem)?.View as PingView)?.CloseTab(); } #endregion @@ -403,7 +397,7 @@ public void AddTab(string host = null) { _tabId++; - TabItems.Add(new DragablzTabItem(host ?? LocalizationManager.GetStringByKey("String_Header_NewTab"), new PingView(_tabId, host), _tabId)); + TabItems.Add(new DragablzTabItem(host ?? Resources.Localization.Strings.NewTab, new PingView(_tabId, host), _tabId)); SelectedTabIndex = TabItems.Count - 1; } diff --git a/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs index c777a2c617..ba59b1c970 100644 --- a/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/PortScannerHostViewModel.cs @@ -41,7 +41,7 @@ public int SelectedTabIndex OnPropertyChanged(); } } - + #region Profiles public ICollectionView Profiles { get; } @@ -134,7 +134,7 @@ public PortScannerHostViewModel(IDialogCoordinator instance) TabItems = new ObservableCollection() { - new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new PortScannerView(_tabId), _tabId) + new DragablzTabItem(Resources.Localization.Strings.NewTab, new PortScannerView(_tabId), _tabId) }; Profiles = new CollectionViewSource { Source = ProfileManager.Profiles }.View; @@ -207,7 +207,7 @@ private async void AddProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -237,7 +237,7 @@ private async void EditProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -269,7 +269,7 @@ private async void CopyAsProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -299,7 +299,7 @@ private async void DeleteProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -326,7 +326,7 @@ private async void EditGroupAction(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => @@ -396,7 +396,7 @@ public void AddTab(string host = null, string ports = null) { _tabId++; - TabItems.Add(new DragablzTabItem(string.IsNullOrEmpty(host) ? LocalizationManager.GetStringByKey("String_Header_NewTab") : host, new PortScannerView(_tabId, host, ports), _tabId)); + TabItems.Add(new DragablzTabItem(string.IsNullOrEmpty(host) ? Resources.Localization.Strings.NewTab : host, new PortScannerView(_tabId, host, ports), _tabId)); SelectedTabIndex = TabItems.Count - 1; } diff --git a/Source/NETworkManager/ViewModels/ProfilesViewModel.cs b/Source/NETworkManager/ViewModels/ProfilesViewModel.cs index 7974251ff1..8fb406aff5 100644 --- a/Source/NETworkManager/ViewModels/ProfilesViewModel.cs +++ b/Source/NETworkManager/ViewModels/ProfilesViewModel.cs @@ -153,7 +153,7 @@ public async void AddProfile() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -178,7 +178,7 @@ public async void CopyAsProfile() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -203,7 +203,7 @@ public async void EditProfile() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -230,7 +230,7 @@ public async void DeleteProfile() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -258,7 +258,7 @@ public async void EditGroup(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => diff --git a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs index cb821bc2b5..c32085b58c 100644 --- a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs @@ -253,7 +253,7 @@ private async void AddProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -286,7 +286,7 @@ private async void EditProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -321,7 +321,7 @@ private async void CopyAsProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -354,7 +354,7 @@ private async void DeleteProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -384,7 +384,7 @@ private async void EditGroupAction(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => @@ -441,7 +441,7 @@ private async void Connect(string host = null) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_Connect") + Title = Resources.Localization.Strings.Connect }; var puTTYConnectViewModel = new PuTTYConnectViewModel(instance => diff --git a/Source/NETworkManager/ViewModels/PuTTYSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYSettingsViewModel.cs index 17916dd212..3d2c55b02d 100644 --- a/Source/NETworkManager/ViewModels/PuTTYSettingsViewModel.cs +++ b/Source/NETworkManager/ViewModels/PuTTYSettingsViewModel.cs @@ -219,7 +219,7 @@ private async void ConfigurePuTTY() settings.AffirmativeButtonText = LocalizationManager.GetStringByKey("String_Button_OK"); - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error"), ex.Message, MessageDialogStyle.Affirmative, settings); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, ex.Message, MessageDialogStyle.Affirmative, settings); } } diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs index 5cfdc3f5f4..f364cba146 100644 --- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs @@ -250,7 +250,7 @@ private async void AddProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -283,7 +283,7 @@ private async void EditProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -318,7 +318,7 @@ private async void CopyAsProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -351,7 +351,7 @@ private async void DeleteProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -381,7 +381,7 @@ private async void EditGroupAction(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => @@ -440,7 +440,7 @@ private async void Connect(string host = null) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_Connect") + Title = Resources.Localization.Strings.Connect }; var remoteDesktopConnectViewModel = new RemoteDesktopConnectViewModel(instance => @@ -510,7 +510,7 @@ private async void ConnectProfile() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_MasterPassword") + Title = Resources.Localization.Strings.MasterPassword }; var credentialsMasterPasswordViewModel = new CredentialsMasterPasswordViewModel(async instance => @@ -525,7 +525,7 @@ private async void ConnectProfile() if (credentialInfo == null) { ConfigurationManager.Current.IsDialogOpen = true; - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_CredentialNotFound"), LocalizationManager.GetStringByKey("String_CredentialNotFoundMessage"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.CredentialNotFound, LocalizationManager.GetStringByKey("String_CredentialNotFoundMessage"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); ConfigurationManager.Current.IsDialogOpen = false; return; @@ -540,7 +540,7 @@ private async void ConnectProfile() else { ConfigurationManager.Current.IsDialogOpen = true; - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_WrongPassword"), LocalizationManager.GetStringByKey("String_WrongPasswordDecryptionFailed"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.WrongPassword, LocalizationManager.GetStringByKey("String_WrongPasswordDecryptionFailed"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); ConfigurationManager.Current.IsDialogOpen = false; } }, instance => @@ -564,7 +564,7 @@ private async void ConnectProfile() if (credentialInfo == null) { ConfigurationManager.Current.IsDialogOpen = true; - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_CredentialNotFound"), LocalizationManager.GetStringByKey("String_CredentialNotFoundMessage"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.CredentialNotFound, LocalizationManager.GetStringByKey("String_CredentialNotFoundMessage"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); ConfigurationManager.Current.IsDialogOpen = false; return; @@ -587,7 +587,7 @@ private async void ConnectProfileAs() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_ConnectAs") + Title = Resources.Localization.Strings.ConnectAs }; var remoteDesktopConnectViewModel = new RemoteDesktopConnectViewModel(instance => diff --git a/Source/NETworkManager/ViewModels/SNMPHostViewModel.cs b/Source/NETworkManager/ViewModels/SNMPHostViewModel.cs index 4696231113..b1d3dd1fd1 100644 --- a/Source/NETworkManager/ViewModels/SNMPHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/SNMPHostViewModel.cs @@ -38,7 +38,7 @@ public SNMPHostViewModel() TabItems = new ObservableCollection { - new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new SNMPView (_tabId), _tabId) + new DragablzTabItem(Resources.Localization.Strings.NewTab, new SNMPView (_tabId), _tabId) }; } #endregion @@ -67,7 +67,7 @@ public void AddTab(string host = null) { _tabId++; - TabItems.Add(new DragablzTabItem(host ?? LocalizationManager.GetStringByKey("String_Header_NewTab"), new SNMPView(_tabId, host), _tabId)); + TabItems.Add(new DragablzTabItem(host ?? Resources.Localization.Strings.NewTab, new SNMPView(_tabId, host), _tabId)); SelectedTabIndex = TabItems.Count - 1; } diff --git a/Source/NETworkManager/ViewModels/SettingsAutostartViewModel.cs b/Source/NETworkManager/ViewModels/SettingsAutostartViewModel.cs index 3e598d11e6..30e7d07a06 100644 --- a/Source/NETworkManager/ViewModels/SettingsAutostartViewModel.cs +++ b/Source/NETworkManager/ViewModels/SettingsAutostartViewModel.cs @@ -100,7 +100,7 @@ private async void EnableDisableAutostart(bool enable) } catch (Exception ex) { - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error"), ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); } ConfiguringAutostart = false; diff --git a/Source/NETworkManager/ViewModels/SettingsImportExportViewModel.cs b/Source/NETworkManager/ViewModels/SettingsImportExportViewModel.cs index 79bb860994..7a342b0bf3 100644 --- a/Source/NETworkManager/ViewModels/SettingsImportExportViewModel.cs +++ b/Source/NETworkManager/ViewModels/SettingsImportExportViewModel.cs @@ -247,7 +247,7 @@ private async void ValidateImportSettingsAction() } catch (ImportFileNotValidException) { - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_ValidationFailed"), LocalizationManager.GetStringByKey("String_NoValidFileFoundToImport"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.ValidationFailed, LocalizationManager.GetStringByKey("String_NoValidFileFoundToImport"), MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); } } @@ -270,7 +270,7 @@ private async void ImportSettingsAction() if (ImportSettingsExists && (ImportEverything || ImportSettings)) message += Environment.NewLine + Environment.NewLine + $"* {LocalizationManager.GetStringByKey("String_ApplicationIsRestartedAfterwards")}"; - if (await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_AreYouSure"), message, MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative) + if (await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.AreYouSure, message, MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative) return; var importOptions = new List(); @@ -304,7 +304,7 @@ private async void ImportSettingsAction() if (importOptions.Contains(ImportExportManager.ImportExportOptions.Profiles)) message += Environment.NewLine + $"* {LocalizationManager.GetStringByKey("String_ProfilesReloaded")}"; - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Success"), message, MessageDialogStyle.Affirmative, settings); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Success, message, MessageDialogStyle.Affirmative, settings); return; } @@ -343,7 +343,7 @@ private async void ExportSettingsAction() settings.AffirmativeButtonText = LocalizationManager.GetStringByKey("String_Button_OK"); - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Success"), $"{LocalizationManager.GetStringByKey("String_SettingsSuccessfullyExported")}\n\n{LocalizationManager.GetStringByKey("String_Path")}: {saveFileDialog.FileName}", MessageDialogStyle.Affirmative, settings); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Success, $"{LocalizationManager.GetStringByKey("String_SettingsSuccessfullyExported")}\n\n{LocalizationManager.GetStringByKey("String_Path")}: {saveFileDialog.FileName}", MessageDialogStyle.Affirmative, settings); } #endregion diff --git a/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs index b6cf2d901a..f42603bffb 100644 --- a/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs +++ b/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs @@ -237,7 +237,7 @@ private async void ChangeSettingsAction() settings.FirstAuxiliaryButtonText = LocalizationManager.GetStringByKey("String_Button_MoveAndRestart"); settings.DefaultButtonFocus = MessageDialogResult.FirstAuxiliary; - var result = await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Overwrite"), LocalizationManager.GetStringByKey("String_OverwriteSettingsInTheDestinationFolder"), MessageDialogStyle.AffirmativeAndNegativeAndSingleAuxiliary, AppearanceManager.MetroDialog); + var result = await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Overwrite, LocalizationManager.GetStringByKey("String_OverwriteSettingsInTheDestinationFolder"), MessageDialogStyle.AffirmativeAndNegativeAndSingleAuxiliary, AppearanceManager.MetroDialog); switch (result) { @@ -269,7 +269,7 @@ private async void ChangeSettingsAction() settings.AffirmativeButtonText = LocalizationManager.GetStringByKey("String_Button_OK"); - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error"), ex.Message, MessageDialogStyle.Affirmative, settings); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, ex.Message, MessageDialogStyle.Affirmative, settings); } LocationSelectedPath = string.Empty; @@ -316,7 +316,7 @@ public async void ResetSettingsAction() message += Environment.NewLine + $"* {LocalizationManager.GetStringByKey("String_ApplicationIsRestartedAfterwards")}"; } - if (await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_AreYouSure"), message, MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative) + if (await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.AreYouSure, message, MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative) return; var forceRestart = false; @@ -339,7 +339,7 @@ public async void ResetSettingsAction() { settings.AffirmativeButtonText = LocalizationManager.GetStringByKey("String_Button_OK"); - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Success"), LocalizationManager.GetStringByKey("String_SettingsSuccessfullyReset"), MessageDialogStyle.Affirmative, settings); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Success, LocalizationManager.GetStringByKey("String_SettingsSuccessfullyReset"), MessageDialogStyle.Affirmative, settings); } } #endregion @@ -366,7 +366,7 @@ private async void MakePortable(bool isPortable) } catch (Exception ex) { - await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_Error"), ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); + await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.Error, ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog); } MakingPortable = false; diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs index 746a4ed233..48040f6a62 100644 --- a/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs +++ b/Source/NETworkManager/ViewModels/SubnetCalculatorSubnettingViewModel.cs @@ -269,7 +269,7 @@ private async void Subnetting() settings.DefaultButtonFocus = MessageDialogResult.Affirmative; - if (await _dialogCoordinator.ShowMessageAsync(this, LocalizationManager.GetStringByKey("String_Header_AreYouSure"), LocalizationManager.GetStringByKey("String_TheProcessCanTakeUpSomeTimeAndResources"), MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative) + if (await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.AreYouSure, LocalizationManager.GetStringByKey("String_TheProcessCanTakeUpSomeTimeAndResources"), MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative) { IsCalculationRunning = false; diff --git a/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs b/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs index a4ee50b4d4..55d3a460b0 100644 --- a/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs +++ b/Source/NETworkManager/ViewModels/TracerouteHostViewModel.cs @@ -135,7 +135,7 @@ public TracerouteHostViewModel(IDialogCoordinator instance) TabItems = new ObservableCollection() { - new DragablzTabItem(LocalizationManager.GetStringByKey("String_Header_NewTab"), new TracerouteView(_tabId), _tabId) + new DragablzTabItem(Resources.Localization.Strings.NewTab, new TracerouteView(_tabId), _tabId) }; Profiles = new CollectionViewSource { Source = ProfileManager.Profiles }.View; @@ -208,7 +208,7 @@ private async void AddProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -238,7 +238,7 @@ private async void EditProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -270,7 +270,7 @@ private async void CopyAsProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -300,7 +300,7 @@ private async void DeleteProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -327,7 +327,7 @@ private async void EditGroupAction(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => @@ -397,7 +397,7 @@ public void AddTab(string host = null) { _tabId++; - TabItems.Add(new DragablzTabItem(host ?? LocalizationManager.GetStringByKey("String_Header_NewTab"), new TracerouteView(_tabId, host), _tabId)); + TabItems.Add(new DragablzTabItem(host ?? Resources.Localization.Strings.NewTab, new TracerouteView(_tabId, host), _tabId)); SelectedTabIndex = TabItems.Count - 1; } diff --git a/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs b/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs index 185a673c7a..6f3c2e5c16 100644 --- a/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs +++ b/Source/NETworkManager/ViewModels/WakeOnLANViewModel.cs @@ -335,7 +335,7 @@ private async void AddProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_AddProfile") + Title = Resources.Localization.Strings.AddProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -365,7 +365,7 @@ private async void EditProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditProfile") + Title = Resources.Localization.Strings.EditProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -397,7 +397,7 @@ private async void CopyAsProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_CopyProfile") + Title = Resources.Localization.Strings.CopyProfile }; var profileViewModel = new ProfileViewModel(instance => @@ -427,7 +427,7 @@ private async void DeleteProfileAction() { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_DeleteProfile") + Title = Resources.Localization.Strings.DeleteProfile }; var confirmRemoveViewModel = new ConfirmRemoveViewModel(instance => @@ -454,7 +454,7 @@ private async void EditGroupAction(object group) { var customDialog = new CustomDialog { - Title = LocalizationManager.GetStringByKey("String_Header_EditGroup") + Title = Resources.Localization.Strings.EditGroup }; var editGroupViewModel = new GroupViewModel(instance => diff --git a/Source/NETworkManager/Views/AboutView.xaml b/Source/NETworkManager/Views/AboutView.xaml index 3b5c95f049..49e0e43a59 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}"> @@ -85,7 +86,7 @@ - + @@ -127,7 +128,7 @@ - + - + - + diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml b/Source/NETworkManager/Views/LookupOUILookupView.xaml index 36505a8720..4351ae1f4f 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 @@ - + @@ -85,7 +86,7 @@ - + - + @@ -77,7 +78,7 @@ - + @@ -163,7 +164,7 @@ - + - + - + - + diff --git a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml index 037d235653..5adb683507 100644 --- a/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml +++ b/Source/NETworkManager/Views/SubnetCalculatorSubnettingView.xaml @@ -11,6 +11,7 @@ xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro" xmlns:viewModels="clr-namespace:NETworkManager.ViewModels" xmlns:net="clr-namespace:System.Net;assembly=System.Net.IPNetwork" + xmlns:localization="clr-namespace:NETworkManager.Resources.Localization" dialogs:DialogParticipation.Register="{Binding}" mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SubnetCalculatorSubnettingViewModel}"> @@ -28,7 +29,7 @@ - + @@ -132,7 +133,7 @@ - + - - - + + + @@ -115,7 +115,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -214,7 +214,7 @@ - + diff --git a/Source/NETworkManager/Views/AboutView.xaml b/Source/NETworkManager/Views/AboutView.xaml index 49e0e43a59..4f5c63db01 100644 --- a/Source/NETworkManager/Views/AboutView.xaml +++ b/Source/NETworkManager/Views/AboutView.xaml @@ -36,8 +36,8 @@ - - + + @@ -49,7 +49,7 @@ - - @@ -195,7 +195,7 @@ - - + + - + + + + + - - - - - - - - - - + + + + + + + + + + @@ -60,19 +60,19 @@ - + - + - diff --git a/Source/NETworkManager/Views/CredentialDialog.xaml b/Source/NETworkManager/Views/CredentialDialog.xaml index d746846211..e4200cce5f 100644 --- a/Source/NETworkManager/Views/CredentialDialog.xaml +++ b/Source/NETworkManager/Views/CredentialDialog.xaml @@ -34,11 +34,11 @@ - - + + - - + + @@ -47,8 +47,8 @@ - - + + @@ -57,13 +57,13 @@ - + @@ -74,8 +74,8 @@ - @@ -77,7 +77,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -148,7 +148,7 @@ - - - - + + + + @@ -203,7 +203,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -295,7 +295,7 @@ - + diff --git a/Source/NETworkManager/Views/DNSLookupHostView.xaml b/Source/NETworkManager/Views/DNSLookupHostView.xaml index 7db6514f9c..b1be7f7daa 100644 --- a/Source/NETworkManager/Views/DNSLookupHostView.xaml +++ b/Source/NETworkManager/Views/DNSLookupHostView.xaml @@ -18,7 +18,7 @@ - - + diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml index babaf995b9..42f41a0c82 100644 --- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml +++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml @@ -10,9 +10,9 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DNSLookupSettingsViewModel}"> - - - + + + @@ -22,8 +22,8 @@ - - + + @@ -33,9 +33,9 @@ - - - + + + - + @@ -114,7 +114,7 @@ - + - + - + - + - + diff --git a/Source/NETworkManager/Views/GroupDialog.xaml b/Source/NETworkManager/Views/GroupDialog.xaml index 98c6c46a91..1079c907bc 100644 --- a/Source/NETworkManager/Views/GroupDialog.xaml +++ b/Source/NETworkManager/Views/GroupDialog.xaml @@ -27,8 +27,8 @@ - - + + @@ -39,8 +39,8 @@ - - + diff --git a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml index 4d64ad968f..26dc143f69 100644 --- a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml +++ b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml @@ -9,9 +9,9 @@ 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 ea928034e2..74dcd65867 100644 --- a/Source/NETworkManager/Views/HTTPHeadersView.xaml +++ b/Source/NETworkManager/Views/HTTPHeadersView.xaml @@ -40,8 +40,8 @@ - - + + @@ -82,7 +82,7 @@ - + @@ -127,13 +127,13 @@ - + - + - + - + diff --git a/Source/NETworkManager/Views/IPScannerHostView.xaml b/Source/NETworkManager/Views/IPScannerHostView.xaml index 2d03feda78..ad499fc074 100644 --- a/Source/NETworkManager/Views/IPScannerHostView.xaml +++ b/Source/NETworkManager/Views/IPScannerHostView.xaml @@ -30,7 +30,7 @@ - - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -153,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/IPScannerSettingsView.xaml b/Source/NETworkManager/Views/IPScannerSettingsView.xaml index 66a206dbd2..461b581425 100644 --- a/Source/NETworkManager/Views/IPScannerSettingsView.xaml +++ b/Source/NETworkManager/Views/IPScannerSettingsView.xaml @@ -10,22 +10,22 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerSettingsViewModel}"> - + - + - + - + - + - - - - + + + + @@ -35,8 +35,8 @@ - - + + @@ -46,17 +46,17 @@ - - - + + + - + - + - + - + diff --git a/Source/NETworkManager/Views/IPScannerView.xaml b/Source/NETworkManager/Views/IPScannerView.xaml index 3be08e73bb..20866b4546 100644 --- a/Source/NETworkManager/Views/IPScannerView.xaml +++ b/Source/NETworkManager/Views/IPScannerView.xaml @@ -47,8 +47,8 @@ - - + + @@ -98,10 +98,10 @@ @@ -166,7 +166,7 @@ - + - + - + - - - + + + @@ -360,8 +360,8 @@ - - + + @@ -389,13 +389,13 @@ - + - + - + - + @@ -404,7 +404,7 @@ - + diff --git a/Source/NETworkManager/Views/ListenersView.xaml b/Source/NETworkManager/Views/ListenersView.xaml index 78b467fba4..12d47452c0 100644 --- a/Source/NETworkManager/Views/ListenersView.xaml +++ b/Source/NETworkManager/Views/ListenersView.xaml @@ -32,7 +32,7 @@ - - - + + + @@ -104,7 +104,7 @@ - + @@ -144,7 +144,7 @@ - + diff --git a/Source/NETworkManager/Views/LookupOUILookupView.xaml b/Source/NETworkManager/Views/LookupOUILookupView.xaml index 4351ae1f4f..89daeb9e99 100644 --- a/Source/NETworkManager/Views/LookupOUILookupView.xaml +++ b/Source/NETworkManager/Views/LookupOUILookupView.xaml @@ -40,8 +40,8 @@ - - + + @@ -78,20 +78,20 @@ - + - + - - + + diff --git a/Source/NETworkManager/Views/LookupPortLookupView.xaml b/Source/NETworkManager/Views/LookupPortLookupView.xaml index 3bdc57f78f..88976ffcdb 100644 --- a/Source/NETworkManager/Views/LookupPortLookupView.xaml +++ b/Source/NETworkManager/Views/LookupPortLookupView.xaml @@ -39,8 +39,8 @@ - - + + @@ -77,20 +77,20 @@ - + - + - - - - + + + + diff --git a/Source/NETworkManager/Views/NetworkInterfaceView.xaml b/Source/NETworkManager/Views/NetworkInterfaceView.xaml index a8212c69de..6b31be36ce 100644 --- a/Source/NETworkManager/Views/NetworkInterfaceView.xaml +++ b/Source/NETworkManager/Views/NetworkInterfaceView.xaml @@ -211,43 +211,43 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -262,7 +262,7 @@ - + - - + - - + + @@ -444,8 +444,8 @@ - - + + @@ -455,8 +455,8 @@ - - + + @@ -481,8 +481,8 @@ - - + + @@ -493,8 +493,8 @@ - - + + @@ -516,8 +516,8 @@ - - + + @@ -526,8 +526,8 @@ - - + + @@ -571,7 +571,7 @@ - + @@ -587,7 +587,7 @@ - + @@ -633,7 +633,7 @@ - + @@ -642,7 +642,7 @@ - + @@ -651,7 +651,7 @@ - + @@ -660,7 +660,7 @@ - + @@ -690,7 +690,7 @@ - diff --git a/Source/NETworkManager/Views/PingHostView.xaml b/Source/NETworkManager/Views/PingHostView.xaml index 7118444abe..2157a9a7d9 100644 --- a/Source/NETworkManager/Views/PingHostView.xaml +++ b/Source/NETworkManager/Views/PingHostView.xaml @@ -30,7 +30,7 @@ - - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -153,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/PingSettingsView.xaml b/Source/NETworkManager/Views/PingSettingsView.xaml index 74d6d2949b..b479d9838d 100644 --- a/Source/NETworkManager/Views/PingSettingsView.xaml +++ b/Source/NETworkManager/Views/PingSettingsView.xaml @@ -9,24 +9,24 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PingSettingsViewModel}"> - + - + - + - + - - + + - + - - - + + + - + diff --git a/Source/NETworkManager/Views/PingView.xaml b/Source/NETworkManager/Views/PingView.xaml index d692370912..4decc46331 100644 --- a/Source/NETworkManager/Views/PingView.xaml +++ b/Source/NETworkManager/Views/PingView.xaml @@ -46,8 +46,8 @@ - - + + @@ -96,10 +96,10 @@ @@ -127,7 +127,7 @@ - + - + - + - + - + @@ -271,7 +271,7 @@ - + @@ -280,11 +280,11 @@ - + - + - + diff --git a/Source/NETworkManager/Views/PortScannerHostView.xaml b/Source/NETworkManager/Views/PortScannerHostView.xaml index 63fa290b53..74f92db0bd 100644 --- a/Source/NETworkManager/Views/PortScannerHostView.xaml +++ b/Source/NETworkManager/Views/PortScannerHostView.xaml @@ -30,7 +30,7 @@ - - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -153,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml b/Source/NETworkManager/Views/PortScannerSettingsView.xaml index 5bbc76139c..7a0316f9b8 100644 --- a/Source/NETworkManager/Views/PortScannerSettingsView.xaml +++ b/Source/NETworkManager/Views/PortScannerSettingsView.xaml @@ -9,18 +9,18 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerSettingsViewModel}"> - + - + - + - - - + + + - + diff --git a/Source/NETworkManager/Views/PortScannerView.xaml b/Source/NETworkManager/Views/PortScannerView.xaml index 138e9c3782..2ac491d3e9 100644 --- a/Source/NETworkManager/Views/PortScannerView.xaml +++ b/Source/NETworkManager/Views/PortScannerView.xaml @@ -48,8 +48,8 @@ - - + + @@ -59,8 +59,8 @@ - - + + @@ -113,10 +113,10 @@ @@ -180,7 +180,7 @@ - - - - - - - + + + + + + + @@ -320,13 +320,13 @@ - + - + - + - + @@ -335,7 +335,7 @@ - + diff --git a/Source/NETworkManager/Views/ProfileDialog.xaml b/Source/NETworkManager/Views/ProfileDialog.xaml index 03d168e0fb..6b82c92e0d 100644 --- a/Source/NETworkManager/Views/ProfileDialog.xaml +++ b/Source/NETworkManager/Views/ProfileDialog.xaml @@ -51,8 +51,8 @@ - - + + @@ -61,8 +61,8 @@ - - + + @@ -72,7 +72,7 @@ - + @@ -92,8 +92,8 @@ - - + + @@ -102,20 +102,20 @@ - + - - - - - + + + + + - + - + @@ -611,7 +611,7 @@ - + @@ -624,16 +624,16 @@ - + @@ -643,7 +643,7 @@ - + @@ -653,8 +653,8 @@ - - + + @@ -663,7 +663,7 @@ - + @@ -673,7 +673,7 @@ - + @@ -697,7 +697,7 @@ - + @@ -720,8 +720,8 @@ - - + + @@ -731,8 +731,8 @@ - - + + @@ -742,8 +742,8 @@ - - + + @@ -760,8 +760,8 @@ - - + @@ -115,7 +115,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -181,7 +181,7 @@ - @@ -308,7 +308,7 @@ - + - + diff --git a/Source/NETworkManager/Views/PuTTYSettingsView.xaml b/Source/NETworkManager/Views/PuTTYSettingsView.xaml index 84244b9b51..ad105970ef 100644 --- a/Source/NETworkManager/Views/PuTTYSettingsView.xaml +++ b/Source/NETworkManager/Views/PuTTYSettingsView.xaml @@ -12,7 +12,7 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PuTTYSettingsViewModel}"> - + @@ -22,11 +22,11 @@ - - + @@ -115,7 +115,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -151,7 +151,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -190,7 +190,7 @@ - @@ -317,7 +317,7 @@ - + @@ -347,11 +347,11 @@ - + - + diff --git a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml index 4fbf863c37..3781d80896 100644 --- a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml +++ b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml @@ -10,16 +10,16 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:RemoteDesktopSettingsViewModel}"> - - - + + + - + - + @@ -32,7 +32,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -56,11 +56,11 @@ - + - - + + @@ -71,8 +71,8 @@ - - + + @@ -82,14 +82,14 @@ - + - - - - - - + + + + + + diff --git a/Source/NETworkManager/Views/SNMPHostView.xaml b/Source/NETworkManager/Views/SNMPHostView.xaml index 483c712068..99d46d26ba 100644 --- a/Source/NETworkManager/Views/SNMPHostView.xaml +++ b/Source/NETworkManager/Views/SNMPHostView.xaml @@ -18,7 +18,7 @@ - - + diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml b/Source/NETworkManager/Views/SNMPSettingsView.xaml index 67440014da..d5ff561822 100644 --- a/Source/NETworkManager/Views/SNMPSettingsView.xaml +++ b/Source/NETworkManager/Views/SNMPSettingsView.xaml @@ -10,12 +10,12 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SNMPSettingsViewModel}"> - + - + - - + + @@ -26,10 +26,10 @@ - - - + + + - + \ No newline at end of file diff --git a/Source/NETworkManager/Views/SNMPView.xaml b/Source/NETworkManager/Views/SNMPView.xaml index 9af780a1bb..52f55283f8 100644 --- a/Source/NETworkManager/Views/SNMPView.xaml +++ b/Source/NETworkManager/Views/SNMPView.xaml @@ -57,8 +57,8 @@ - - + + @@ -67,12 +67,12 @@ - + - + - - + + @@ -82,7 +82,7 @@ - + - + - + - + @@ -494,7 +494,7 @@ - - + + @@ -590,13 +590,13 @@ - + - + - + - + - + @@ -105,13 +105,13 @@ - + - - + + - - + @@ -97,7 +97,7 @@ - + diff --git a/Source/NETworkManager/Views/SettingsSettingsView.xaml b/Source/NETworkManager/Views/SettingsSettingsView.xaml index 1126ce08d9..6a9f06f0de 100644 --- a/Source/NETworkManager/Views/SettingsSettingsView.xaml +++ b/Source/NETworkManager/Views/SettingsSettingsView.xaml @@ -23,7 +23,7 @@ - + @@ -51,7 +51,7 @@ - - - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -153,7 +153,7 @@ - diff --git a/Source/NETworkManager/Views/TracerouteSettingsView.xaml b/Source/NETworkManager/Views/TracerouteSettingsView.xaml index a1c062f1ab..1b545a9577 100644 --- a/Source/NETworkManager/Views/TracerouteSettingsView.xaml +++ b/Source/NETworkManager/Views/TracerouteSettingsView.xaml @@ -9,19 +9,19 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TracerouteSettingsViewModel}"> - + - + - + - - - - + + + + - + diff --git a/Source/NETworkManager/Views/TracerouteView.xaml b/Source/NETworkManager/Views/TracerouteView.xaml index 0155d4deab..f85822f6e4 100644 --- a/Source/NETworkManager/Views/TracerouteView.xaml +++ b/Source/NETworkManager/Views/TracerouteView.xaml @@ -46,8 +46,8 @@ - - + + @@ -96,10 +96,10 @@ @@ -118,7 +118,7 @@ - - + + @@ -284,7 +284,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -300,8 +300,8 @@ - - + + @@ -329,13 +329,13 @@ - + - + - + - + diff --git a/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml b/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml index a8c1b2449b..156221eb4d 100644 --- a/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml +++ b/Source/NETworkManager/Views/WakeOnLANSettingsView.xaml @@ -10,8 +10,8 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:WakeOnLANSettingsViewModel}"> - - + + diff --git a/Source/NETworkManager/Views/WakeOnLANView.xaml b/Source/NETworkManager/Views/WakeOnLANView.xaml index 30a29dad44..ca5666ba0a 100644 --- a/Source/NETworkManager/Views/WakeOnLANView.xaml +++ b/Source/NETworkManager/Views/WakeOnLANView.xaml @@ -48,8 +48,8 @@ - - + + @@ -62,8 +62,8 @@ - - + + @@ -76,8 +76,8 @@ - - + + @@ -102,7 +102,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -212,7 +212,7 @@ - From b324e2d45d320e6d68e84083d1046673c7da07c4 Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Tue, 31 Jul 2018 22:32:53 +0200 Subject: [PATCH 15/24] Update --- .../NETworkManager/Resources/Localization/Strings.Designer.cs | 2 +- Source/NETworkManager/Resources/Localization/Strings.resx | 2 +- Source/NETworkManager/Views/DNSLookupSettingsView.xaml | 2 +- Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml | 2 +- Source/NETworkManager/Views/IPScannerSettingsView.xaml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs index 529d6272c2..352966c975 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -4687,7 +4687,7 @@ public static string StartTime { } /// - /// Looks up a localized string similar to Start with Windows. + /// Looks up a localized string similar to Start with Windows (current user). /// public static string StartWithWindows { get { diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx index 585a6ebf44..c20ef98921 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -598,7 +598,7 @@ Start minimized in tray - Start with Windows + Start with Windows (current user) Static IPv4 address diff --git a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml index 42f41a0c82..011ff56bb2 100644 --- a/Source/NETworkManager/Views/DNSLookupSettingsView.xaml +++ b/Source/NETworkManager/Views/DNSLookupSettingsView.xaml @@ -70,7 +70,7 @@ - + diff --git a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml index 26dc143f69..5b3dcf72ed 100644 --- a/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml +++ b/Source/NETworkManager/Views/HTTPHeadersSettingsView.xaml @@ -9,7 +9,7 @@ mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:HTTPHeadersSettingsViewModel}"> - + diff --git a/Source/NETworkManager/Views/IPScannerSettingsView.xaml b/Source/NETworkManager/Views/IPScannerSettingsView.xaml index 461b581425..9f057ea468 100644 --- a/Source/NETworkManager/Views/IPScannerSettingsView.xaml +++ b/Source/NETworkManager/Views/IPScannerSettingsView.xaml @@ -15,7 +15,7 @@ - + @@ -52,7 +52,7 @@ - + From 30173b9e30d1e0c76b1e9ff5d518dd3f89cb99d7 Mon Sep 17 00:00:00 2001 From: BornToBeRoot Date: Tue, 31 Jul 2018 23:17:37 +0200 Subject: [PATCH 16/24] Update --- .../Localization/Strings.Designer.cs | 25 ++++++------------- .../Resources/Localization/Strings.resx | 17 ++++++------- .../NETworkManager/Views/PuTTYHostView.xaml | 2 +- .../Views/RemoteDesktopHostView.xaml | 2 +- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs index 352966c975..069d53ba74 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.Designer.cs +++ b/Source/NETworkManager/Resources/Localization/Strings.Designer.cs @@ -79,7 +79,7 @@ public static string Accent { } /// - /// Looks up a localized string similar to add. + /// Looks up a localized string similar to Add. /// public static string Add { get { @@ -1213,7 +1213,7 @@ public static string DHCPServer { } /// - /// Looks up a localized string similar to Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use PuTTY. + /// Looks up a localized string similar to Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use PuTTY.. /// public static string DisableTransparencyInTheSettingsToUsePuTTY { get { @@ -1222,7 +1222,7 @@ public static string DisableTransparencyInTheSettingsToUsePuTTY { } /// - /// Looks up a localized string similar to Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use Remote Desktop. + /// Looks up a localized string similar to Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use Remote Desktop.. /// public static string DisableTransparencyInTheSettingsToUseRemoteDesktop { get { @@ -2149,7 +2149,7 @@ public static string FilterDots { } /// - /// Looks up a localized string similar to First usable IP Address. + /// Looks up a localized string similar to First usable IP address. /// public static string FirstUsableIPAddress { get { @@ -2635,7 +2635,7 @@ public static string Language { } /// - /// Looks up a localized string similar to Last usable IP Address. + /// Looks up a localized string similar to Last usable IP address. /// public static string LastUsableIPAddress { get { @@ -2950,11 +2950,11 @@ public static string NetworkLocationCannotBeReachedMessage { } /// - /// Looks up a localized string similar to New profile.... + /// Looks up a localized string similar to New connections.... /// - public static string NewProfileDots { + public static string NewConnectionDots { get { - return ResourceManager.GetString("NewProfileDots", resourceCulture); + return ResourceManager.GetString("NewConnectionDots", resourceCulture); } } @@ -2985,15 +2985,6 @@ public static string No { } } - /// - /// Looks up a localized string similar to No clients found! Create one.... - /// - public static string NoClientsFoundCreateOne { - get { - return ResourceManager.GetString("NoClientsFoundCreateOne", resourceCulture); - } - } - /// /// Looks up a localized string similar to No DNS record found for "{0}"! Check your input and the settings.. /// diff --git a/Source/NETworkManager/Resources/Localization/Strings.resx b/Source/NETworkManager/Resources/Localization/Strings.resx index c20ef98921..dda8be7868 100644 --- a/Source/NETworkManager/Resources/Localization/Strings.resx +++ b/Source/NETworkManager/Resources/Localization/Strings.resx @@ -655,7 +655,7 @@ Yes - add + Add Add a tab to open a new connection... @@ -829,10 +829,10 @@ Selected profiles will be deleted permanently. - Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use PuTTY + Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use PuTTY. - Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use Remote Desktop + Disable the transparency in the settings (General/Appearance) and restart the application afterwards to use Remote Desktop. DNS autconfiguration @@ -892,7 +892,7 @@ Expand - First usable IP Address + First usable IP address Fixed screen size: @@ -931,7 +931,7 @@ IP range - Last usable IP Address + Last usable IP address Local IP address @@ -963,11 +963,8 @@ The network address cannot be reached. Check if your computer is connected to the network. For information about network troubleshooting, see Windows Help. - - New profile... - - - No clients found! Create one... + + New connections... No DNS record found for "{0}"! Check your input and the settings. diff --git a/Source/NETworkManager/Views/PuTTYHostView.xaml b/Source/NETworkManager/Views/PuTTYHostView.xaml index d1b0904e49..bc9a161003 100644 --- a/Source/NETworkManager/Views/PuTTYHostView.xaml +++ b/Source/NETworkManager/Views/PuTTYHostView.xaml @@ -81,7 +81,7 @@ -