merged develop into pr/1332

CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - #1767: Turned about window into a simple popup form
 - #1766: Converted components check page into options page
 - #1690: Replaced GeckoFX (Firefox) with CefSharp (Chromium)
+- #1325: Language resource files cleanup
 ### Fixed
 - #1773: Connection issue with mysql - Missing fields in tblCons
 - #1720: Show configuration file name in title of password prompt form

mRemoteV1/App/CompatibilityChecker.cs

@@ -29,16 +29,16 @@ namespace mRemoteNG.App
             messageCollector.AddMessage(MessageClass.InformationMsg, "Checking FIPS Policy...", true);
             if (!FipsPolicyEnabledForServer2003() && !FipsPolicyEnabledForServer2008AndNewer()) return;
 
-            var errorText = string.Format(Language.strErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
+            var errorText = string.Format(Language.ErrorFipsPolicyIncompatible, GeneralAppInfo.ProductName);
             messageCollector.AddMessage(MessageClass.ErrorMsg, errorText, true);
 
             //About to pop up a message, let's not block it...
             FrmSplashScreen.getInstance().Close();
 
             var ShouldIStayOrShouldIGo = CTaskDialog.MessageBox(Application.ProductName,
-                                                                Language.strCompatibilityProblemDetected, errorText, "",
+                                                                Language.CompatibilityProblemDetected, errorText, "",
                                                                 "",
-                                                                Language.strCheckboxDoNotShowThisMessageAgain,
+                                                                Language.CheckboxDoNotShowThisMessageAgain,
                                                                 ETaskDialogButtons.OkCancel, ESysIcons.Warning,
                                                                 ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked && ShouldIStayOrShouldIGo == DialogResult.OK)
@@ -87,10 +87,10 @@ namespace mRemoteNG.App
             }
 
             if (proccesses.Length <= 0) return;
-            CTaskDialog.MessageBox(Application.ProductName, Language.strCompatibilityProblemDetected,
-                                   string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected,
+            CTaskDialog.MessageBox(Application.ProductName, Language.CompatibilityProblemDetected,
+                                   string.Format(Language.CompatibilityLenovoAutoScrollUtilityDetected,
                                                  Application.ProductName), "",
-                                   "", Language.strCheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok,
+                                   "", Language.CheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.Ok,
                                    ESysIcons.Warning,
                                    ESysIcons.Warning);
             if (CTaskDialog.VerificationChecked)

mRemoteV1/App/Import.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
@@ -23,13 +23,13 @@ namespace mRemoteNG.App
                     openFileDialog.Multiselect = true;
 
                     var fileTypes = new List<string>();
-                    fileTypes.AddRange(new[] {Language.strFilterAllImportable, "*.xml;*.rdp;*.rdg;*.dat;*.csv"});
-                    fileTypes.AddRange(new[] {Language.strFiltermRemoteXML, "*.xml"});
-                    fileTypes.AddRange(new[] {Language.strFiltermRemoteCSV, "*.csv"});
-                    fileTypes.AddRange(new[] {Language.strFilterRDP, "*.rdp"});
-                    fileTypes.AddRange(new[] {Language.strFilterRdgFiles, "*.rdg"});
-                    fileTypes.AddRange(new[] {Language.strFilterPuttyConnectionManager, "*.dat"});
-                    fileTypes.AddRange(new[] {Language.strFilterAll, "*.*"});
+                    fileTypes.AddRange(new[] {Language.FilterAllImportable, "*.xml;*.rdp;*.rdg;*.dat;*.csv"});
+                    fileTypes.AddRange(new[] {Language.FiltermRemoteXML, "*.xml"});
+                    fileTypes.AddRange(new[] {Language.FiltermRemoteCSV, "*.csv"});
+                    fileTypes.AddRange(new[] {Language.FilterRDP, "*.rdp"});
+                    fileTypes.AddRange(new[] {Language.FilterRdgFiles, "*.rdg"});
+                    fileTypes.AddRange(new[] {Language.FilterPuttyConnectionManager, "*.dat"});
+                    fileTypes.AddRange(new[] {Language.FilterAll, "*.*"});
 
                     openFileDialog.Filter = string.Join("|", fileTypes.ToArray());
 
@@ -40,7 +40,7 @@ namespace mRemoteNG.App
 						openFileDialog.FileNames, 
 						importDestinationContainer, 
 						Runtime.ConnectionsService,
-						fileName => MessageBox.Show(string.Format(Language.strImportFileFailedContent, fileName), Language.strImportFileFailedMainInstruction,
+						fileName => MessageBox.Show(string.Format(Language.ImportFileFailedContent, fileName), Language.AskUpdatesMainInstruction,
 							MessageBoxButtons.OK, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1));
                 }
             }

mRemoteV1/App/Initialization/StartupDataLogger.cs

@@ -96,7 +96,7 @@ namespace mRemoteNG.App.Initialization
         {
             var data = $"{Application.ProductName} {Application.ProductVersion}";
             if (Runtime.IsPortableEdition)
-                data += $" {Language.strLabelPortableEdition}";
+                data += $" {Language.PortableEdition}";
             data += " starting.";
             _messageCollector.AddMessage(MessageClass.InformationMsg, data, true);
         }

mRemoteV1/App/Runtime.cs

@@ -1,4 +1,4 @@
-using mRemoteNG.App.Info;
+using mRemoteNG.App.Info;
 using mRemoteNG.Config.Putty;
 using mRemoteNG.Connection;
 using mRemoteNG.Credential;
@@ -111,13 +111,13 @@ namespace mRemoteNG.App
 
                 if (Settings.Default.UseSQLServer)
                 {
-                    MessageCollector.AddExceptionMessage(Language.strLoadFromSqlFailed, ex);
-                    var commandButtons = string.Join("|", Language.strCommandTryAgain,
-                                                     Language.strCommandOpenConnectionFile,
-                                                     string.Format(Language.strCommandExitProgram,
+                    MessageCollector.AddExceptionMessage(Language.LoadFromSqlFailed, ex);
+                    var commandButtons = string.Join("|", Language._TryAgain,
+                                                     Language.CommandOpenConnectionFile,
+                                                     string.Format(Language.CommandExitProgram,
                                                                    Application.ProductName));
-                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.strLoadFromSqlFailed,
-                                               Language.strLoadFromSqlFailedContent,
+                    CTaskDialog.ShowCommandBox(Application.ProductName, Language.LoadFromSqlFailed,
+                                               Language.LoadFromSqlFailedContent,
                                                MiscTools.GetExceptionMessageRecursive(ex), "", "",
                                                commandButtons, false, ESysIcons.Error, ESysIcons.Error);
                     switch (CTaskDialog.CommandButtonResult)
@@ -138,7 +138,7 @@ namespace mRemoteNG.App
                 if (ex is FileNotFoundException && !withDialog)
                 {
                     MessageCollector.AddExceptionMessage(
-                                                         string.Format(Language.strConnectionsFileCouldNotBeLoadedNew,
+                                                         string.Format(Language.ConnectionsFileCouldNotBeLoadedNew,
                                                                        connectionFileName), ex,
                                                          MessageClass.InformationMsg);
 
@@ -147,7 +147,7 @@ namespace mRemoteNG.App
                         Language.ConfigurationCreateNew,
                         Language.ConfigurationCustomPath,
                         Language.ConfigurationImportFile,
-                        Language.strMenuExit
+                        Language.Exit
                     };
 
                     var answered = false;
@@ -189,7 +189,7 @@ namespace mRemoteNG.App
                         {
                             MessageCollector.AddExceptionMessage(
                                                                  string
-                                                                     .Format(Language.strConnectionsFileCouldNotBeLoadedNew,
+                                                                     .Format(Language.ConnectionsFileCouldNotBeLoadedNew,
                                                                              connectionFileName), exc,
                                                                  MessageClass.InformationMsg);
                         }
@@ -199,7 +199,7 @@ namespace mRemoteNG.App
                 }
 
                 MessageCollector.AddExceptionStackTrace(
-                                                        string.Format(Language.strConnectionsFileCouldNotBeLoaded,
+                                                        string.Format(Language.ConnectionsFileCouldNotBeLoaded,
                                                                       connectionFileName), ex);
                 if (connectionFileName != ConnectionsService.GetStartupConnectionFileName())
                 {
@@ -208,7 +208,7 @@ namespace mRemoteNG.App
                 else
                 {
                     MessageBox.Show(FrmMain.Default,
-                                    string.Format(Language.strErrorStartupConnectionFileLoad, Environment.NewLine,
+                                    string.Format(Language.ErrorStartupConnectionFileLoad, Environment.NewLine,
                                                   Application.ProductName,
                                                   ConnectionsService.GetStartupConnectionFileName(),
                                                   MiscTools.GetExceptionMessageRecursive(ex)),

mRemoteV1/App/Shutdown.cs

@@ -41,7 +41,7 @@ namespace mRemoteNG.App
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strSettingsCouldNotBeSavedOrTrayDispose, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.SettingsCouldNotBeSavedOrTrayDispose, ex);
             }
         }
 

mRemoteV1/Config/Connections/SqlConnectionsSaver.cs

@@ -68,7 +68,7 @@ namespace mRemoteNG.Config.Connections
                 if (!databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion))
                 {
                     Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                        Language.strErrorConnectionListSaveFailed);
+                                                        Language.ErrorConnectionListSaveFailed);
                     return;
                 }
 

mRemoteV1/Config/DataProviders/FileBackupCreator.cs

@@ -20,7 +20,7 @@ namespace mRemoteNG.Config.DataProviders
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strConnectionsFileBackupFailed, ex,
+                Runtime.MessageCollector.AddExceptionMessage(Language.ConnectionsFileBackupFailed, ex,
                                                              MessageClass.WarningMsg);
                 throw;
             }

mRemoteV1/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs

@@ -87,7 +87,7 @@ namespace mRemoteNG.Config.Serializers.Xml
             catch (Exception ex)
             {
                 Runtime.ConnectionsService.IsConnectionsFileLoaded = false;
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strLoadFromXmlFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.LoadFromXmlFailed, ex);
                 throw;
             }
         }
@@ -108,7 +108,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                     Convert.ToDouble(_xmlDocument.DocumentElement.Attributes["ConfVersion"].Value.Replace(",", "."),
                                      CultureInfo.InvariantCulture);
             else
-                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, Language.strOldConffile);
+                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, Language.OldConffile);
 
             if (!(_confVersion > MaxSupportedConfVersion)) return;
             ShowIncompatibleVersionDialogBox();
@@ -197,7 +197,7 @@ namespace mRemoteNG.Config.Serializers.Xml
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strAddNodeFromXmlFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.AddNodeFromXmlFailed, ex);
                 throw;
             }
         }
@@ -390,7 +390,7 @@ namespace mRemoteNG.Config.Serializers.Xml
                     if (xmlnode.GetAttributeAsBool("Inherit"))
                         connectionInfo.Inheritance.TurnOnInheritanceCompletely();
                     connectionInfo.Icon = xmlnode.GetAttributeAsString("Icon").Replace(".ico", "");
-                    connectionInfo.Panel = Language.strGeneral;
+                    connectionInfo.Panel = Language.General;
                 }
 
                 if (_confVersion >= 1.5)
@@ -566,7 +566,7 @@ namespace mRemoteNG.Config.Serializers.Xml
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                    string.Format(Language.strGetConnectionInfoFromXmlFailed,
+                    string.Format(Language.GetConnectionInfoFromXmlFailed,
                         connectionInfo.Name, ConnectionFileName, ex.Message));
             }
 

mRemoteV1/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs

@@ -38,7 +38,7 @@ namespace mRemoteNG.Config.Serializers
         private void ImportContainers(string ldapPath, ContainerInfo parentContainer)
         {
             var match = Regex.Match(ldapPath, "ou=([^,]*)", RegexOptions.IgnoreCase);
-            var name = match.Success ? match.Groups[1].Captures[0].Value : Language.strActiveDirectory;
+            var name = match.Success ? match.Groups[1].Captures[0].Value : Language.ActiveDirectory;
 
             var newContainer = new ContainerInfo {Name = name};
             parentContainer.AddChild(newContainer);

mRemoteV1/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs

@@ -118,7 +118,7 @@ namespace mRemoteNG.Config.Serializers
                 // Program Version 2.7 wraps these properties
                 containerPropertiesNode = containerPropertiesNode.SelectSingleNode("./properties");
             }
-            newContainer.Name = containerPropertiesNode?.SelectSingleNode("./name")?.InnerText ?? Language.strNewFolder;
+            newContainer.Name = containerPropertiesNode?.SelectSingleNode("./name")?.InnerText ?? Language.NewFolder;
             if (bool.TryParse(containerPropertiesNode?.SelectSingleNode("./expanded")?.InnerText, out var expanded))
 				newContainer.IsExpanded = expanded;
             parentContainer.AddChild(newContainer);

mRemoteV1/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs

@@ -54,14 +54,14 @@ namespace mRemoteNG.Config.Serializers.Versioning
 
                 if (isVerified == false)
                     Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                                                        string.Format(Language.strErrorBadDatabaseVersion,
+                                                        string.Format(Language.ErrorBadDatabaseVersion,
                                                                       databaseVersion,
                                                                       GeneralAppInfo.ProductName));
             }
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    string.Format(Language.strErrorVerifyDatabaseVersionFailed,
+                                                    string.Format(Language.ErrorVerifyDatabaseVersionFailed,
                                                                   ex.Message));
             }
 

mRemoteV1/Connection/AbstractConnectionRecord.cs

@@ -98,37 +98,37 @@ namespace mRemoteNG.Connection
 
         #region Display
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameName)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionName))]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Name)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionName))]
         public virtual string Name
         {
             get => _name;
             set => SetField(ref _name, value, "Name");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDescription)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDescription))]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Description)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDescription))]
         public virtual string Description
         {
             get => GetPropertyValue("Description", _description);
             set => SetField(ref _description, value, "Description");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
          TypeConverter(typeof(ConnectionIcon)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameIcon)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionIcon))]
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Icon)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionIcon))]
         public virtual string Icon
         {
             get => GetPropertyValue("Icon", _icon);
             set => SetField(ref _icon, value, "Icon");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePanel)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPanel))]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Panel)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPanel))]
         public virtual string Panel
         {
             get => GetPropertyValue("Panel", _panel);
@@ -139,9 +139,9 @@ namespace mRemoteNG.Connection
 
         #region Connection
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAddress)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAddress)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.HostnameIp)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionHostnameIp)),
          UsedInAllProtocolsExcept()]
         public virtual string Hostname
         {
@@ -149,9 +149,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _hostname, value?.Trim(), "Hostname");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePort)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPort)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Port)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPort)),
          UsedInAllProtocolsExcept(ProtocolType.ICA)]
         public virtual int Port
         {
@@ -159,9 +159,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _port, value, "Port");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUsername)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUsername)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Username)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUsername)),
          UsedInAllProtocolsExcept(ProtocolType.VNC, ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)]
         public virtual string Username
         {
@@ -169,9 +169,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _username, Settings.Default.DoNotTrimUsername ? value : value?.Trim(), "Username");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePassword)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPassword)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Password)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPassword)),
          PasswordPropertyText(true),
          UsedInAllProtocolsExcept(ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)]
         public virtual string Password
@@ -180,9 +180,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _password, value, "Password");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDomain)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDomain)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Domain)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDomain)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA, ProtocolType.IntApp, ProtocolType.PowerShell)]
         public string Domain
         {
@@ -190,9 +190,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _domain, value?.Trim(), "Domain");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVmId)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVmId)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.VmId)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVmId)),
          UsedInProtocol(ProtocolType.RDP)]
         public string VmId
         {
@@ -200,9 +200,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vmId, value?.Trim(), "VmId");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameSSHTunnelConnection)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionSSHTunnelConnection)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshTunnel)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshTunnel)),
          TypeConverter(typeof(SshTunnelTypeConverter)),
          UsedInAllProtocolsExcept()]
         public string SSHTunnelConnectionName
@@ -214,9 +214,9 @@ namespace mRemoteNG.Connection
 
         #region Protocol
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameProtocol)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionProtocol)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Protocol)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionProtocol)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public virtual ProtocolType Protocol
         {
@@ -224,9 +224,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _protocol, value, "Protocol");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRdpVersion)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRdpVersion)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpVersion)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpVersion)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public virtual RdpVersion RdpVersion
@@ -235,9 +235,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdpProtocolVersion, value, nameof(RdpVersion));
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameExternalTool)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionExternalTool)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalTool)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalTool)),
          TypeConverter(typeof(ExternalToolsTypeConverter)),
          UsedInProtocol(ProtocolType.IntApp)]
         public string ExtApp
@@ -246,9 +246,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _extApp, value, "ExtApp");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePuttySession)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPuttySession)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.PuttySession)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPuttySession)),
          TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList)),
          UsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2, ProtocolType.Telnet,
             ProtocolType.RAW, ProtocolType.Rlogin)]
@@ -258,9 +258,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _puttySession, value, "PuttySession");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameSSHOptions)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionSSHOptions)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SshOptions)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSshOptions)),
          UsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2)]
         public virtual string SSHOptions
         {
@@ -268,9 +268,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _sshOptions, value, "SSHOptions");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEncryptionStrength)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEncryptionStrength)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.EncryptionStrength)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEncryptionStrength)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.ICA)]
         public IcaProtocol.EncryptionStrength ICAEncryptionStrength
@@ -279,9 +279,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _icaEncryption, value, "ICAEncryptionStrength");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseConsoleSession)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseConsoleSession)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseConsoleSession)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseConsoleSession)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseConsoleSession
@@ -290,9 +290,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _useConsoleSession, value, "UseConsoleSession");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAuthenticationLevel)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAuthenticationLevel)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationLevel)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationLevel)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public AuthenticationLevel RDPAuthenticationLevel
@@ -301,9 +301,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDPMinutesToIdleTimeout)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDPMinutesToIdleTimeout)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPMinutesToIdleTimeout)),
          UsedInProtocol(ProtocolType.RDP)]
         public virtual int RDPMinutesToIdleTimeout
         {
@@ -318,9 +318,9 @@ namespace mRemoteNG.Connection
             }
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDPAlertIdleTimeout)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDPAlertIdleTimeout)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.MinutesToIdleTimeout)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDPAlertIdleTimeout)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RDPAlertIdleTimeout
         {
@@ -328,9 +328,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameLoadBalanceInfo)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionLoadBalanceInfo)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.LoadBalanceInfo)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionLoadBalanceInfo)),
          UsedInProtocol(ProtocolType.RDP)]
         public string LoadBalanceInfo
         {
@@ -338,9 +338,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRenderingEngine)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRenderingEngine)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RenderingEngine)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRenderingEngine)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.HTTP, ProtocolType.HTTPS)]
         public HTTPBase.RenderingEngine RenderingEngine
@@ -349,9 +349,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _renderingEngine, value, "RenderingEngine");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseCredSsp)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseCredSsp)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseCredSsp)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseCredSsp)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseCredSsp
@@ -360,9 +360,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _useCredSsp, value, "UseCredSsp");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseVmId)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseVmId)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseVmId)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseVmId)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseVmId
@@ -371,9 +371,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _useVmId, value, "UseVmId");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseEnhancedMode)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseEnhancedMode)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UseEnhancedMode)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUseEnhancedMode)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseEnhancedMode
@@ -385,9 +385,9 @@ namespace mRemoteNG.Connection
 
         #region RD Gateway
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayUsageMethod)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayUsageMethod)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsageMethod)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayUsageMethod)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDGatewayUsageMethod RDGatewayUsageMethod
@@ -396,9 +396,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayHostname)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayHostname)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayHostname)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayHostname)),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayHostname
         {
@@ -406,9 +406,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayUseConnectionCredentials)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayUseConnectionCredentials)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUseConnectionCredentials)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUseConnectionCredentials)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
@@ -417,9 +417,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayUsername)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayUsername)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayUsername)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayUsername)),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayUsername
         {
@@ -427,9 +427,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayPassword)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyNameRDGatewayPassword)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayPassword)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRdpGatewayPassword)),
          PasswordPropertyText(true),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayPassword
@@ -438,9 +438,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayDomain)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayDomain)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RdpGatewayDomain)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRDGatewayDomain)),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayDomain
         {
@@ -452,9 +452,9 @@ namespace mRemoteNG.Connection
 
         #region Appearance
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameResolution)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionResolution)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Resolution)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionResolution)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
         public RDPResolutions Resolution
@@ -463,9 +463,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _resolution, value, "Resolution");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAutomaticResize)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAutomaticResize)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AutomaticResize)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAutomaticResize)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool AutomaticResize
@@ -474,9 +474,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _automaticResize, value, "AutomaticResize");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameColors)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionColors)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
         public RDPColors Colors
@@ -485,9 +485,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _colors, value, "Colors");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameCacheBitmaps)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionCacheBitmaps)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.CacheBitmaps)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCacheBitmaps)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
         public bool CacheBitmaps
@@ -496,9 +496,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _cacheBitmaps, value, "CacheBitmaps");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisplayWallpaper)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisplayWallpaper)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayWallpaper)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayWallpaper)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisplayWallpaper
@@ -507,9 +507,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _displayWallpaper, value, "DisplayWallpaper");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisplayThemes)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisplayThemes)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisplayThemes)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisplayThemes)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisplayThemes
@@ -518,9 +518,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _displayThemes, value, "DisplayThemes");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEnableFontSmoothing)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEnableFontSmoothing)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.FontSmoothing)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableFontSmoothing)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool EnableFontSmoothing
@@ -529,9 +529,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEnableDesktopComposition)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEnableDesktopComposition)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.EnableDesktopComposition)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEnableDesktopComposition)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool EnableDesktopComposition
@@ -540,9 +540,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _enableDesktopComposition, value, "EnableDesktopComposition");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableFullWindowDrag)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableFullWindowDrag)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableFullWindowDrag)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableFullWindowDrag)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisableFullWindowDrag
@@ -551,9 +551,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _disableFullWindowDrag, value, "DisableFullWindowDrag");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableMenuAnimations)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableMenuAnimations)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableMenuAnimations)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableMenuAnimations)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisableMenuAnimations
@@ -562,9 +562,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _disableMenuAnimations, value, "DisableMenuAnimations");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableCursorShadow)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableCursorShadow)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisableCursorShadow
@@ -573,9 +573,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _disableCursorShadow, value, "DisableCursorShadow");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableCursorShadow)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableCursorShadow)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.DisableCursorShadow)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionDisableCursorShadow)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisableCursorBlinking
@@ -587,9 +587,9 @@ namespace mRemoteNG.Connection
 
         #region Redirect
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectKeys)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectKeys)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.RedirectKeys)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectKeys)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectKeys
@@ -598,9 +598,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectKeys, value, "RedirectKeys");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectDrives)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectDrives)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Redirect)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectDrives)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectDiskDrives
@@ -609,9 +609,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectPrinters)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectPrinters)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Printers)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPrinters)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectPrinters
@@ -620,9 +620,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectPrinters, value, "RedirectPrinters");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectClipboard)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectClipboard)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Clipboard)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectClipboard)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectClipboard
@@ -632,9 +632,9 @@ namespace mRemoteNG.Connection
         }
 
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectPorts)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectPorts)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Ports)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectPorts)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectPorts
@@ -643,9 +643,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectPorts, value, "RedirectPorts");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectSmartCards)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectSmartCards)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Redirect)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSmartCards)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectSmartCards
@@ -654,9 +654,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectSounds)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectSounds)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Sounds)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectSounds)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDPSounds RedirectSound
@@ -665,9 +665,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectSound, value, "RedirectSound");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameSoundQuality)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionSoundQuality)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SoundQuality)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSoundQuality)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDPSoundQuality SoundQuality
@@ -676,9 +676,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _soundQuality, value, "SoundQuality");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectAudioCapture)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectAudioCapture)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AudioCapture)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionRedirectAudioCapture)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectAudioCapture
@@ -693,9 +693,9 @@ namespace mRemoteNG.Connection
 
         [Browsable(false)] public string ConstantID { get; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameExternalToolBefore)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionExternalToolBefore)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolBefore)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolBefore)),
          TypeConverter(typeof(ExternalToolsTypeConverter))]
         public virtual string PreExtApp
         {
@@ -703,9 +703,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _preExtApp, value, "PreExtApp");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameExternalToolAfter)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionExternalToolAfter)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ExternalToolAfter)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionExternalToolAfter)),
          TypeConverter(typeof(ExternalToolsTypeConverter))]
         public virtual string PostExtApp
         {
@@ -713,27 +713,27 @@ namespace mRemoteNG.Connection
             set => SetField(ref _postExtApp, value, "PostExtApp");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameMACAddress)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionMACAddress))]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.MacAddress)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionMACAddress))]
         public virtual string MacAddress
         {
             get => GetPropertyValue("MacAddress", _macAddress);
             set => SetField(ref _macAddress, value, "MacAddress");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUser1)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUser1))]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.UserField)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionUser1))]
         public virtual string UserField
         {
             get => GetPropertyValue("UserField", _userField);
             set => SetField(ref _userField, value, "UserField");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameFavorite)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionFavorite)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.Favorite)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionFavorite)),
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public virtual bool Favorite
         {
@@ -745,9 +745,9 @@ namespace mRemoteNG.Connection
         #region VNC
         // TODO: it seems all these VNC properties were added and serialized but
         // never hooked up to the VNC protocol or shown to the user
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameCompression)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionCompression)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Compression)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionCompression)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -757,9 +757,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncCompression, value, "VNCCompression");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEncoding)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEncoding)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Encoding)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionEncoding)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -769,9 +769,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncEncoding, value, "VNCEncoding");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAuthenticationMode)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAuthenticationMode)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.AuthenticationMode)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionAuthenticationMode)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -781,9 +781,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncAuthMode, value, "VNCAuthMode");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyType)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyType)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyType)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyType)),
             TypeConverter(typeof(MiscTools.EnumTypeConverter)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
@@ -793,9 +793,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyType, value, "VNCProxyType");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyAddress)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyAddress)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyAddress)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyAddress)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
         public string VNCProxyIP
@@ -804,9 +804,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyIp, value, "VNCProxyIP");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyPort)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyPort)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPort)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPort)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
         public int VNCProxyPort
@@ -815,9 +815,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyPort, value, "VNCProxyPort");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyUsername)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyUsername)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyUsername)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyUsername)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
         public string VNCProxyUsername
@@ -826,9 +826,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
-            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyPassword)),
-            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyPassword)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.ProxyPassword)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionVNCProxyPassword)),
             PasswordPropertyText(true),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
@@ -838,9 +838,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyPassword, value, "VNCProxyPassword");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameColors)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionColors)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Colors)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionColors)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -850,9 +850,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncColors, value, "VNCColors");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameSmartSizeMode)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionSmartSizeMode)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.SmartSizeMode)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionSmartSizeMode)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC)]
         public ProtocolVNC.SmartSizeMode VNCSmartSizeMode
@@ -861,9 +861,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode");
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameViewOnly)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionViewOnly)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.ViewOnly)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionViewOnly)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.VNC)]
         public bool VNCViewOnly

mRemoteV1/Connection/ConnectionInfo.cs

@@ -276,17 +276,17 @@ namespace mRemoteNG.Connection
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strConnectionSetDefaultPortFailed, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.ConnectionSetDefaultPortFailed, ex);
                 return 0;
             }
         }
 
         private void SetTreeDisplayDefaults()
         {
-            Name = Language.strNewConnection;
+            Name = Language.NewConnection;
             Description = Settings.Default.ConDefaultDescription;
             Icon = Settings.Default.ConDefaultIcon;
-            Panel = Language.strGeneral;
+            Panel = Language.General;
         }
 
         private void SetConnectionDefaults()

mRemoteV1/Connection/ConnectionInfoInheritance.cs

@@ -14,9 +14,9 @@ namespace mRemoteNG.Connection
 
         #region General
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGeneral)),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAll)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAll)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.General)),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.All)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAll)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EverythingInherited
         {
@@ -28,21 +28,21 @@ namespace mRemoteNG.Connection
 
         #region Display
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay), 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDescription)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDescription)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display), 2),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Description)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDescription)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Description { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay), 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameIcon)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionIcon)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display), 2),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Icon)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionIcon)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Icon { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay), 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePanel)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPanel)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display), 2),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Panel)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPanel)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Panel { get; set; }
 
@@ -50,43 +50,43 @@ namespace mRemoteNG.Connection
 
         #region Connection
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUsername)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUsername)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Username)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUsername)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Username { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVmId)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVmId)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.VmId)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVmId)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool VmId { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePassword)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPassword)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Password)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPassword)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Password { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDomain)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDomain)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Domain)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDomain)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Domain { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePort)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPort)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Port)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPort)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Port { get; set; }
         
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
-         LocalizedAttributes.LocalizedDisplayNameInheritAttribute(nameof(Language.strPropertyNameSSHTunnelConnection)),
-         LocalizedAttributes.LocalizedDescriptionInheritAttribute(nameof(Language.strPropertyDescriptionSSHTunnelConnection)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInheritAttribute(nameof(Language.SshTunnel)),
+         LocalizedAttributes.LocalizedDescriptionInheritAttribute(nameof(Language.PropertyDescriptionSshTunnel)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool SSHTunnelConnectionName { get; set; }
@@ -95,93 +95,93 @@ namespace mRemoteNG.Connection
 
         #region Protocol
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameProtocol)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionProtocol)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Protocol)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionProtocol)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Protocol { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRdpVersion)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRdpVersion)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpVersion)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRdpVersion)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RdpVersion { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameExternalTool)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionExternalTool)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ExternalTool)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionExternalTool)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool ExtApp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePuttySession)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPuttySession)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.PuttySession)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionPuttySession)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PuttySession { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameSSHOptions)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionSSHOptions)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.SshOptions)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionSshOptions)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool SSHOptions { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEncryptionStrength)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEncryptionStrength)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.EncryptionStrength)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEncryptionStrength)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool ICAEncryptionStrength { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAuthenticationLevel)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAuthenticationLevel)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AuthenticationLevel)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAuthenticationLevel)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPAuthenticationLevel { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDPMinutesToIdleTimeout)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDPMinutesToIdleTimeout)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.MinutesToIdleTimeout)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDPMinutesToIdleTimeout)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPMinutesToIdleTimeout { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDPAlertIdleTimeout)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDPAlertIdleTimeout)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.MinutesToIdleTimeout)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDPAlertIdleTimeout)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPAlertIdleTimeout { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameLoadBalanceInfo)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionLoadBalanceInfo)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.LoadBalanceInfo)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionLoadBalanceInfo)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool LoadBalanceInfo { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRenderingEngine)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRenderingEngine)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RenderingEngine)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRenderingEngine)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RenderingEngine { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseConsoleSession)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseConsoleSession)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseConsoleSession)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseConsoleSession)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseConsoleSession { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseCredSsp)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseCredSsp)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseCredSsp)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseCredSsp)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseCredSsp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseVmId)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseVmId)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseVmId)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseVmId)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseVmId { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseEnhancedMode)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseEnhancedMode)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Protocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UseEnhancedMode)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUseEnhancedMode)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseEnhancedMode { get; set; }
 
@@ -189,39 +189,39 @@ namespace mRemoteNG.Connection
 
         #region RD Gateway
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayUsageMethod)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayUsageMethod)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayUsageMethod)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRdpGatewayUsageMethod)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUsageMethod { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayHostname)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayHostname)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayHostname)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayHostname)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayHostname { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayUseConnectionCredentials)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayUseConnectionCredentials)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayUseConnectionCredentials)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayUseConnectionCredentials)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUseConnectionCredentials { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayUsername)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayUsername)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayUsername)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayUsername)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUsername { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayPassword)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayPassword)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayPassword)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRdpGatewayPassword)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayPassword { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayDomain)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayDomain)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Gateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RdpGatewayDomain)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRDGatewayDomain)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayDomain { get; set; }
 
@@ -229,75 +229,75 @@ namespace mRemoteNG.Connection
 
         #region Appearance
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameResolution)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionResolution)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Resolution)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionResolution)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Resolution { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAutomaticResize)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAutomaticResize)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AutomaticResize)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAutomaticResize)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool AutomaticResize { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameColors)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionColors)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Colors)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionColors)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Colors { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameCacheBitmaps)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionCacheBitmaps)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.CacheBitmaps)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionCacheBitmaps)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool CacheBitmaps { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisplayWallpaper)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisplayWallpaper)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisplayWallpaper)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisplayWallpaper)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayWallpaper { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisplayThemes)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisplayThemes)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisplayThemes)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisplayThemes)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayThemes { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEnableFontSmoothing)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEnableFontSmoothing)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.FontSmoothing)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEnableFontSmoothing)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableFontSmoothing { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEnableDesktopComposition)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEnableDesktopComposition)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.EnableDesktopComposition)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEnableDesktopComposition)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableDesktopComposition { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisableFullWindowDrag)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisableFullWindowDrag)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableFullWindowDrag)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableFullWindowDrag)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisableFullWindowDrag { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisableMenuAnimations)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisableMenuAnimations)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableMenuAnimations)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableMenuAnimations)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisableMenuAnimations { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisableCursorShadow)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisableCursorShadow)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableCursorShadow)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableCursorShadow)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisableCursorShadow { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisableCursorBlinking)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisableCursorBlinking)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DisableCursorBlinking)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionDisableCursorBlinking)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisableCursorBlinking { get; set; }
 
@@ -305,57 +305,57 @@ namespace mRemoteNG.Connection
 
         #region Redirect
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectKeys)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectKeys)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.RedirectKeys)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectKeys)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectKeys { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectDrives)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectDrives)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.DiskDrives)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectDrives)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectDiskDrives { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectPrinters)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectPrinters)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Printers)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectPrinters)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPrinters { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectClipboard)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectClipboard)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Clipboard)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectClipboard)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectClipboard { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectPorts)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectPorts)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Redirect)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectPorts)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPorts { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectSmartCards)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectSmartCards)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Redirect)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectSmartCards)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSmartCards { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectSounds)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectSounds)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Sounds)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectSounds)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSound { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameSoundQuality)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionSoundQuality)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.SoundQuality)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionSoundQuality)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool SoundQuality { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectAudioCapture)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectAudioCapture)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Redirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AudioCapture)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionRedirectAudioCapture)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectAudioCapture { get; set; }
 
@@ -363,91 +363,91 @@ namespace mRemoteNG.Connection
 
         #region Misc
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameExternalToolBefore)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionExternalToolBefore)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ExternalToolBefore)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionExternalToolBefore)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PreExtApp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameExternalToolAfter)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionExternalToolAfter)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ExternalToolAfter)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionExternalToolAfter)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PostExtApp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameMACAddress)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionMACAddress)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.MacAddress)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionMACAddress)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool MacAddress { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUser1)),
-         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUser1)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.UserField)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionUser1)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UserField { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
-        LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameFavorite)),
-        LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionFavorite)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous), 8),
+        LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Favorite)),
+        LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionFavorite)),
         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Favorite { get; set; }
         #endregion
 
         #region VNC
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameCompression)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionCompression)), 
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Compression)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionCompression)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCCompression {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEncoding)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEncoding)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Encoding)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionEncoding)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCEncoding {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAuthenticationMode)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAuthenticationMode)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Connection), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.AuthenticationMode)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionAuthenticationMode)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCAuthMode {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyType)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyType)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyType)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyType)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyType {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyAddress)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyAddress)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyAddress)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyAddress)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyIP {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyPort)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyPort)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyPort)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyPort)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPort {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyUsername)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyUsername)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyUsername)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyUsername)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyUsername {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyPassword)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyPassword)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Proxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ProxyPassword)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionVNCProxyPassword)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPassword {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameColors)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionColors)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.Colors)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionColors)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCColors {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameSmartSizeMode)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionSmartSizeMode)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.SmartSizeMode)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionSmartSizeMode)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCSmartSizeMode {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameViewOnly)), 
-		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionViewOnly)), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.Appearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.ViewOnly)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.PropertyDescriptionViewOnly)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCViewOnly {get; set;}
         #endregion
 

mRemoteV1/Connection/ConnectionInitiator.cs

@@ -65,7 +65,7 @@ namespace mRemoteNG.Connection
                 if (connectionInfo.Hostname == "" && connectionInfo.Protocol != ProtocolType.IntApp)
                 {
                     Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                                                        Language.strConnectionOpenFailedNoHostname);
+                                                        Language.ConnectionOpenFailedNoHostname);
                     return;
                 }
 
@@ -95,7 +95,7 @@ namespace mRemoteNG.Connection
                     if (connectionInfoSshTunnel == null)
                     {
                         Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                            string.Format(Language.strSSHTunnelConfigProblem, connectionInfoOriginal.Name, connectionInfoOriginal.SSHTunnelConnectionName));
+                            string.Format(Language.SshTunnelConfigProblem, connectionInfoOriginal.Name, connectionInfoOriginal.SSHTunnelConnectionName));
                         return;
                     }
                     Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg,
@@ -123,7 +123,7 @@ namespace mRemoteNG.Connection
                     if (!(protocolSshTunnel is PuttyBase puttyBaseSshTunnel))
                     {
                         Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                            string.Format(Language.strSSHTunnelIsNotPutty, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
+                            string.Format(Language.SshTunnelIsNotPutty, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
                         return;
                     }
 
@@ -137,7 +137,7 @@ namespace mRemoteNG.Connection
                     {
                         protocolSshTunnel.Close();
                         Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                            string.Format(Language.strSSHTunnelNotInitialized, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
+                            string.Format(Language.SshTunnelNotInitialized, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
                         return;
                     }
 
@@ -145,7 +145,7 @@ namespace mRemoteNG.Connection
                     {
                         protocolSshTunnel.Close();
                         Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                            string.Format(Language.strSSHTunnelNotConnected, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
+                            string.Format(Language.SshTunnelNotConnected, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
                         return;
                     }
 
@@ -166,7 +166,7 @@ namespace mRemoteNG.Connection
                         {
                             protocolSshTunnel.Close();
                             Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                                string.Format(Language.strSSHTunnelFailed, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
+                                string.Format(Language.SshTunnelFailed, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
                             return;
                         }
 
@@ -186,7 +186,7 @@ namespace mRemoteNG.Connection
                     {
                         protocolSshTunnel.Close();
                         Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                            string.Format(Language.strSSHTunnelPortNotReadyInTime, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
+                            string.Format(Language.SshTunnelPortNotReadyInTime, connectionInfoOriginal.Name, connectionInfoSshTunnel.Name));
                         return;
                     }
 
@@ -230,7 +230,7 @@ namespace mRemoteNG.Connection
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strConnectionOpenFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.ConnectionOpenFailed, ex);
             }
         }
 
@@ -372,14 +372,14 @@ namespace mRemoteNG.Connection
                 }
                 Runtime.MessageCollector.AddMessage(msgClass,
                                                     string.Format(
-                                                                  Language.strProtocolEventDisconnected,
+                                                                  Language.ProtocolEventDisconnected,
                                                                   disconnectedMessage,
                                                                   strHostname,
                                                                   prot.InterfaceControl.Info.Protocol.ToString()));
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strProtocolEventDisconnectFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.ProtocolEventDisconnectFailed, ex);
             }
         }
 
@@ -388,7 +388,7 @@ namespace mRemoteNG.Connection
             try
             {
                 var prot = (ProtocolBase)sender;
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnenctionCloseEvent,
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.ConnenctionCloseEvent,
                                                     true);
                 string connDetail;
                 if (prot.InterfaceControl.OriginalInfo.Hostname == "" &&
@@ -400,7 +400,7 @@ namespace mRemoteNG.Connection
                     connDetail = "UNKNOWN";
 
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                    string.Format(Language.strConnenctionClosedByUser, connDetail,
+                                                    string.Format(Language.ConnenctionClosedByUser, connDetail,
                                                                   prot.InterfaceControl.Info.Protocol,
                                                                   Environment.UserName));
                 prot.InterfaceControl.OriginalInfo.OpenConnections.Remove(prot);
@@ -413,17 +413,17 @@ namespace mRemoteNG.Connection
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strConnenctionCloseEventFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.ConnenctionCloseEventFailed, ex);
             }
         }
 
         private static void Prot_Event_Connected(object sender)
         {
             var prot = (ProtocolBase)sender;
-            Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventConnected,
+            Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.ConnectionEventConnected,
                                                 true);
             Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                string.Format(Language.strConnectionEventConnectedDetail,
+                                                string.Format(Language.ConnectionEventConnectedDetail,
                                                               prot.InterfaceControl.OriginalInfo.Hostname,
                                                               prot.InterfaceControl.Info.Protocol, Environment.UserName,
                                                               prot.InterfaceControl.Info.Description,
@@ -437,7 +437,7 @@ namespace mRemoteNG.Connection
                 var prot = (ProtocolBase)sender;
 
                 var msg = string.Format(
-                                        Language.strConnectionEventErrorOccured,
+                                        Language.ConnectionEventErrorOccured,
                                         errorMessage,
                                         prot.InterfaceControl.OriginalInfo.Hostname,
                                         errorCode?.ToString() ?? "-");

mRemoteV1/Connection/ConnectionsService.cs

@@ -62,7 +62,7 @@ namespace mRemoteNG.Connection
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strCouldNotCreateNewConnectionsFile, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.CouldNotCreateNewConnectionsFile, ex);
             }
         }
 
@@ -78,7 +78,7 @@ namespace mRemoteNG.Connection
                 newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance);
 
                 newConnectionInfo.Name = Settings.Default.IdentifyQuickConnectTabs
-                    ? string.Format(Language.strQuick, uriBuilder.Host)
+                    ? string.Format(Language.Quick, uriBuilder.Host)
                     : uriBuilder.Host;
 
                 newConnectionInfo.Protocol = protocol;
@@ -93,7 +93,7 @@ namespace mRemoteNG.Connection
                 }
 
                 if (string.IsNullOrEmpty(newConnectionInfo.Panel))
-                    newConnectionInfo.Panel = Language.strGeneral;
+                    newConnectionInfo.Panel = Language.General;
 
                 newConnectionInfo.IsQuickConnect = true;
 
@@ -101,7 +101,7 @@ namespace mRemoteNG.Connection
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strQuickConnectFailed, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.QuickConnectFailed, ex);
                 return null;
             }
         }
@@ -260,7 +260,7 @@ namespace mRemoteNG.Connection
             catch (Exception ex)
             {
                 Runtime.MessageCollector?.AddExceptionMessage(
-                                                              string.Format(Language.strConnectionsFileCouldNotSaveAs,
+                                                              string.Format(Language.ConnectionsFileCouldNotSaveAs,
                                                                             connectionFileName), ex, logOnly: false);
             }
             finally

mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs

@@ -42,7 +42,7 @@ namespace mRemoteNG.Connection.Protocol.Http
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strHttpConnectionFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpConnectionFailed, ex);
             }
         }
 
@@ -93,7 +93,7 @@ namespace mRemoteNG.Connection.Protocol.Http
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strHttpSetPropsFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpSetPropsFailed, ex);
                 return false;
             }
         }
@@ -120,7 +120,7 @@ namespace mRemoteNG.Connection.Protocol.Http
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strHttpConnectFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpConnectFailed, ex);
                 return false;
             }
         }
@@ -164,7 +164,7 @@ namespace mRemoteNG.Connection.Protocol.Http
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strHTTPFailedURLBuild, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpFailedUrlBuild, ex);
                 return string.Empty;
             }
         }
@@ -241,7 +241,7 @@ namespace mRemoteNG.Connection.Protocol.Http
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strHttpDocumentTileChangeFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpDocumentTileChangeFailed, ex);
             }
         }
 
@@ -273,7 +273,7 @@ namespace mRemoteNG.Connection.Protocol.Http
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strHttpDocumentTileChangeFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpDocumentTileChangeFailed, ex);
             }
         }
 
@@ -283,10 +283,10 @@ namespace mRemoteNG.Connection.Protocol.Http
 
         public enum RenderingEngine
         {
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strHttpInternetExplorer))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.HttpInternetExplorer))]
             IE = 1,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strHttpCEF))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.HttpCEF))]
             CEF = 2
         }
 

mRemoteV1/Connection/Protocol/ICA/IcaProtocol.cs

@@ -30,7 +30,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strIcaControlFailed + Environment.NewLine + ex.Message,
+                                                    Language.IcaControlFailed + Environment.NewLine + ex.Message,
                                                     true);
             }
         }
@@ -88,7 +88,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strIcaSetPropsFailed + Environment.NewLine + ex.Message,
+                                                    Language.IcaSetPropsFailed + Environment.NewLine + ex.Message,
                                                     true);
                 return false;
             }
@@ -107,7 +107,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strIcaConnectionFailed + Environment.NewLine + ex.Message);
+                                                    Language.IcaConnectionFailed + Environment.NewLine + ex.Message);
                 return false;
             }
         }
@@ -182,7 +182,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strIcaSetCredentialsFailed + Environment.NewLine +
+                                                    Language.IcaSetCredentialsFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -228,7 +228,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strIcaSetResolutionFailed + Environment.NewLine +
+                                                    Language.IcaSetResolutionFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -289,7 +289,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strIcaSetEventHandlersFailed + Environment.NewLine +
+                                                    Language.IcaSetEventHandlersFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -361,19 +361,19 @@ namespace mRemoteNG.Connection.Protocol.ICA
 
         public enum EncryptionStrength
         {
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strEncBasic))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Basic))]
             EncrBasic = 1,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strEnc128BitLogonOnly))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Enc128BitLogonOnly))]
             Encr128BitLogonOnly = 127,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strEnc40Bit))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Enc40Bit))]
             Encr40Bit = 40,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strEnc56Bit))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Enc56Bit))]
             Encr56Bit = 56,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strEnc128Bit))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Enc128Bit))]
             Encr128Bit = 128
         }
 

mRemoteV1/Connection/Protocol/IntegratedProgram.cs

@@ -97,14 +97,14 @@ namespace mRemoteNG.Connection.Protocol
                 }
 
                 NativeMethods.SetParent(_handle, InterfaceControl.Handle);
-                Runtime.MessageCollector?.AddMessage(MessageClass.InformationMsg, Language.strIntAppStuff, true);
+                Runtime.MessageCollector?.AddMessage(MessageClass.InformationMsg, Language.IntAppStuff, true);
                 Runtime.MessageCollector?.AddMessage(MessageClass.InformationMsg,
-                                                     string.Format(Language.strIntAppHandle, _handle), true);
+                                                     string.Format(Language.IntAppHandle, _handle), true);
                 Runtime.MessageCollector?.AddMessage(MessageClass.InformationMsg,
-                                                     string.Format(Language.strIntAppTitle, _process.MainWindowTitle),
+                                                     string.Format(Language.IntAppTitle, _process.MainWindowTitle),
                                                      true);
                 Runtime.MessageCollector?.AddMessage(MessageClass.InformationMsg,
-                                                     string.Format(Language.strIntAppParentHandle,
+                                                     string.Format(Language.PanelHandle,
                                                                    InterfaceControl.Parent.Handle), true);
 
                 Resize(this, new EventArgs());
@@ -126,7 +126,7 @@ namespace mRemoteNG.Connection.Protocol
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strIntAppFocusFailed, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.IntAppFocusFailed, ex);
             }
         }
 
@@ -143,7 +143,7 @@ namespace mRemoteNG.Connection.Protocol
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strIntAppResizeFailed, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.IntAppResizeFailed, ex);
             }
         }
 
@@ -164,7 +164,7 @@ namespace mRemoteNG.Connection.Protocol
                 }
                 catch (Exception ex)
                 {
-                    Runtime.MessageCollector.AddExceptionMessage(Language.strIntAppKillFailed, ex);
+                    Runtime.MessageCollector.AddExceptionMessage(Language.IntAppKillFailed, ex);
                 }
 
                 try
@@ -176,7 +176,7 @@ namespace mRemoteNG.Connection.Protocol
                 }
                 catch (Exception ex)
                 {
-                    Runtime.MessageCollector.AddExceptionMessage(Language.strIntAppDisposeFailed, ex);
+                    Runtime.MessageCollector.AddExceptionMessage(Language.IntAppDisposeFailed, ex);
                 }
             }
 

mRemoteV1/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs

@@ -65,7 +65,7 @@ namespace mRemoteNG.Connection.Protocol.PowerShell
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strIntAppFocusFailed, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.IntAppFocusFailed, ex);
             }
         }
 
@@ -82,7 +82,7 @@ namespace mRemoteNG.Connection.Protocol.PowerShell
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strIntAppResizeFailed, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.IntAppResizeFailed, ex);
             }
         }
 

mRemoteV1/Connection/Protocol/ProtocolFactory.cs

@@ -49,7 +49,7 @@ namespace mRemoteNG.Connection.Protocol
                 case ProtocolType.IntApp:
                     if (connectionInfo.ExtApp == "")
                     {
-                        throw (new Exception(Language.strNoExtAppDefined));
+                        throw (new Exception(Language.NoExtAppDefined));
                     }
                     return new IntegratedProgram();
             }

mRemoteV1/Connection/Protocol/ProtocolType.cs

@@ -4,40 +4,40 @@ namespace mRemoteNG.Connection.Protocol
 {
     public enum ProtocolType
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDP))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Rdp))]
         RDP = 0,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strVnc))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Vnc))]
         VNC = 1,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strSsh1))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.SshV1))]
         SSH1 = 2,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strSsh2))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.SshV2))]
         SSH2 = 3,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strTelnet))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Telnet))]
         Telnet = 4,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRlogin))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Rlogin))]
         Rlogin = 5,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRAW))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Raw))]
         RAW = 6,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strHttp))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Http))]
         HTTP = 7,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strHttps))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Https))]
         HTTPS = 8,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strICA))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.ICA))]
         ICA = 9,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strPowerShell))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.PowerShell))]
         PowerShell = 10,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strExtApp))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.ExternalTool))]
         IntApp = 20
     }
 }

mRemoteV1/Connection/Protocol/PuttyBase.cs

@@ -179,14 +179,14 @@ namespace mRemoteNG.Connection.Protocol
                     NativeMethods.SetParent(PuttyHandle, InterfaceControl.Handle);
                 }
 
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strPuttyStuff, true);
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.PuttyStuff, true);
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                    string.Format(Language.strPuttyHandle, PuttyHandle), true);
+                                                    string.Format(Language.PuttyHandle, PuttyHandle), true);
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                    string.Format(Language.strPuttyTitle, PuttyProcess.MainWindowTitle),
+                                                    string.Format(Language.PuttyTitle, PuttyProcess.MainWindowTitle),
                                                     true);
                 Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                    string.Format(Language.strPuttyParentHandle,
+                                                    string.Format(Language.PanelHandle,
                                                                   InterfaceControl.Parent.Handle), true);
 
                 Resize(this, new EventArgs());
@@ -211,7 +211,7 @@ namespace mRemoteNG.Connection.Protocol
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strPuttyFocusFailed + Environment.NewLine + ex.Message,
+                                                    Language.PuttyFocusFailed + Environment.NewLine + ex.Message,
                                                     true);
             }
         }
@@ -244,7 +244,7 @@ namespace mRemoteNG.Connection.Protocol
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strPuttyResizeFailed + Environment.NewLine + ex.Message,
+                                                    Language.PuttyResizeFailed + Environment.NewLine + ex.Message,
                                                     true);
             }
         }
@@ -261,7 +261,7 @@ namespace mRemoteNG.Connection.Protocol
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strPuttyKillFailed + Environment.NewLine + ex.Message,
+                                                    Language.PuttyKillFailed + Environment.NewLine + ex.Message,
                                                     true);
             }
 
@@ -272,7 +272,7 @@ namespace mRemoteNG.Connection.Protocol
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strPuttyDisposeFailed + Environment.NewLine + ex.Message,
+                                                    Language.PuttyDisposeFailed + Environment.NewLine + ex.Message,
                                                     true);
             }
 
@@ -289,7 +289,7 @@ namespace mRemoteNG.Connection.Protocol
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strPuttyShowSettingsDialogFailed + Environment.NewLine +
+                                                    Language.PuttyShowSettingsDialogFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }

mRemoteV1/Connection/Protocol/RDP/AuthenticationLevel.cs

@@ -4,13 +4,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
 {
     public enum AuthenticationLevel
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strAlwaysConnectEvenIfAuthFails))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.AlwaysConnectEvenIfAuthFails))]
         NoAuth = 0,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strDontConnectWhenAuthFails))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.DontConnectWhenAuthFails))]
         AuthRequired = 1,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strWarnIfAuthFails))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.WarnIfAuthFails))]
         WarnOnFailedAuth = 2
     }
 }

mRemoteV1/Connection/Protocol/RDP/RDGatewayUsageMethod.cs

@@ -4,13 +4,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
 {
     public enum RDGatewayUsageMethod
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strNever))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Never))]
         Never = 0, // TSC_PROXY_MODE_NONE_DIRECT
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strAlways))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Always))]
         Always = 1, // TSC_PROXY_MODE_DIRECT
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strDetect))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Detect))]
         Detect = 2 // TSC_PROXY_MODE_DETECT
     }
 }

mRemoteV1/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs

@@ -4,13 +4,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
 {
     public enum RDGatewayUseConnectionCredentials
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strUseDifferentUsernameAndPassword))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.UseDifferentUsernameAndPassword))]
         No = 0,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strUseSameUsernameAndPassword))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.UseSameUsernameAndPassword))]
         Yes = 1,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strUseSmartCard))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.UseSmartCard))]
         SmartCard = 2
     }
 }

mRemoteV1/Connection/Protocol/RDP/RDPColors.cs

@@ -4,19 +4,19 @@ namespace mRemoteNG.Connection.Protocol.RDP
 {
     public enum RDPColors
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDP256Colors))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Rdp256Colors))]
         Colors256 = 8,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDP32768Colors))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Rdp32768Colors))]
         Colors15Bit = 15,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDP65536Colors))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Rdp65536Colors))]
         Colors16Bit = 16,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDP16777216Colors))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Rdp16777216Colors))]
         Colors24Bit = 24,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDP4294967296Colors))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Rdp4294967296Colors))]
         Colors32Bit = 32
     }
 }

mRemoteV1/Connection/Protocol/RDP/RDPResolutions.cs

@@ -5,13 +5,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
 {
     public enum RDPResolutions
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPFitToPanel))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.FitToPanel))]
         FitToWindow,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strFullscreen))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Fullscreen))]
         Fullscreen,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPSmartSize))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.SmartSize))]
         SmartSize,
         [Description("800x600")] Res800x600,
         [Description("1024x768")] Res1024x768,

mRemoteV1/Connection/Protocol/RDP/RDPSoundQuality.cs

@@ -4,13 +4,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
 {
     public enum RDPSoundQuality
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPSoundQualityDynamic))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Dynamic))]
         Dynamic = 0,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPSoundQualityMedium))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Medium))]
         Medium = 1,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPSoundQualityHigh))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.High))]
         High = 2
     }
 }

mRemoteV1/Connection/Protocol/RDP/RDPSounds.cs

@@ -4,13 +4,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
 {
     public enum RDPSounds
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPSoundBringToThisComputer))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.RdpSoundBringToThisComputer))]
         BringToThisComputer = 0,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPSoundLeaveAtRemoteComputer))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.RdpSoundLeaveAtRemoteComputer))]
         LeaveAtRemoteComputer = 1,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strRDPSoundDoNotPlay))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.DoNotPlay))]
         DoNotPlay = 2
     }
 }

mRemoteV1/Connection/Protocol/RDP/RdpErrorCodes.cs

@@ -12,15 +12,15 @@ namespace mRemoteNG.Connection.Protocol.RDP
         {
             _description = new Hashtable
             {
-                {"0", nameof(Language.strRdpErrorUnknown)},
-                {"1", nameof(Language.strRdpErrorCode1)},
-                {"2", nameof(Language.strRdpErrorOutOfMemory)},
-                {"3", nameof(Language.strRdpErrorWindowCreation)},
-                {"4", nameof(Language.strRdpErrorCode2)},
-                {"5", nameof(Language.strRdpErrorCode3)},
-                {"6", nameof(Language.strRdpErrorCode4)},
-                {"7", nameof(Language.strRdpErrorConnection)},
-                {"100", nameof(Language.strRdpErrorWinsock)}
+                {"0", nameof(Language.RdpErrorUnknown)},
+                {"1", nameof(Language.RdpErrorCode1)},
+                {"2", nameof(Language.RdpErrorOutOfMemory)},
+                {"3", nameof(Language.RdpErrorWindowCreation)},
+                {"4", nameof(Language.RdpErrorCode2)},
+                {"5", nameof(Language.RdpErrorCode3)},
+                {"6", nameof(Language.RdpErrorCode4)},
+                {"7", nameof(Language.RdpErrorConnection)},
+                {"100", nameof(Language.RdpErrorWinsock)}
             };
         }
 
@@ -35,8 +35,8 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpErrorGetFailure, ex);
-                return string.Format(Language.strRdpErrorUnknown, id);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpErrorGetFailure, ex);
+                return string.Format(Language.RdpErrorUnknown, id);
             }
         }
     }

mRemoteV1/Connection/Protocol/RDP/RdpProtocol6.cs

@@ -80,7 +80,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 }
                 catch (Exception ex)
                 {
-                    Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetRedirectKeysFailed, ex);
+                    Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetRedirectKeysFailed, ex);
                 }
             }
         }
@@ -131,7 +131,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetPropsFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetPropsFailed, ex);
                 return false;
             }
         }
@@ -161,7 +161,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 }
                 else
                 {
-                    Runtime.MessageCollector.AddExceptionMessage(Language.strRdpControlCreationFailed, ex);
+                    Runtime.MessageCollector.AddExceptionMessage(Language.RdpControlCreationFailed, ex);
                 }
                 Control.Dispose();
                 return false;
@@ -182,7 +182,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strConnectionOpenFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.ConnectionOpenFailed, ex);
             }
 
             return false;
@@ -196,7 +196,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpDisconnectFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpDisconnectFailed, ex);
                 Close();
             }
         }
@@ -209,7 +209,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpToggleFullscreenFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpToggleFullscreenFailed, ex);
             }
         }
 
@@ -221,7 +221,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpToggleSmartSizeFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpToggleSmartSizeFailed, ex);
             }
         }
 
@@ -252,7 +252,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpFocusFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpFocusFailed, ex);
             }
         }
 
@@ -320,7 +320,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
 
             SetPerformanceFlags();
 
-            _rdpClient.ConnectingText = Language.strConnecting;
+            _rdpClient.ConnectingText = Language.Connecting;
         }
 
         protected object GetExtendedProperty(string property)
@@ -358,12 +358,12 @@ namespace mRemoteNG.Connection.Protocol.RDP
             {
                 if (_rdpClient.TransportSettings.GatewayIsSupported == 0)
                 {
-                    Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strRdpGatewayNotSupported,
+                    Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.RdpGatewayNotSupported,
                                                         true);
                     return;
                 }
 
-                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strRdpGatewayIsSupported,
+                Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.RdpGatewayIsSupported,
                                                     true);
 
                 if (connectionInfo.RDGatewayUsageMethod != RDGatewayUsageMethod.Never)
@@ -402,7 +402,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetGatewayFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetGatewayFailed, ex);
             }
         }
 
@@ -428,14 +428,14 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 if (_rdpVersion >= Versions.RDC61)
                 {
                     Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                        string.Format(Language.strRdpSetConsoleSwitch, _rdpVersion),
+                                                        string.Format(Language.RdpSetConsoleSwitch, _rdpVersion),
                                                         true);
                     _rdpClient.AdvancedSettings7.ConnectToAdministerServer = value;
                 }
                 else
                 {
                     Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg,
-                                                        string.Format(Language.strRdpSetConsoleSwitch, _rdpVersion) +
+                                                        string.Format(Language.RdpSetConsoleSwitch, _rdpVersion) +
                                                         Environment.NewLine +
                                                         "No longer supported in this RDP version. Reference: https://msdn.microsoft.com/en-us/library/aa380863(v=vs.85).aspx",
                                                         true);
@@ -446,7 +446,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetConsoleSessionFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetConsoleSessionFailed, ex);
             }
         }
 
@@ -514,7 +514,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetCredentialsFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetCredentialsFailed, ex);
             }
         }
 
@@ -561,7 +561,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetResolutionFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetResolutionFailed, ex);
             }
         }
 
@@ -576,7 +576,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetPortFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetPortFailed, ex);
             }
         }
 
@@ -593,7 +593,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetRedirectionFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetRedirectionFailed, ex);
             }
         }
 
@@ -630,7 +630,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetPerformanceFlagsFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetPerformanceFlagsFailed, ex);
             }
         }
 
@@ -642,7 +642,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetAuthenticationLevelFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetAuthenticationLevelFailed, ex);
             }
         }
 
@@ -679,7 +679,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetEventHandlersFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetEventHandlersFailed, ex);
             }
         }
 

mRemoteV1/Connection/Protocol/RDP/RdpProtocol7.cs

@@ -35,7 +35,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strRdpSetPropsFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.RdpSetPropsFailed, ex);
                 return false;
             }
 

mRemoteV1/Connection/Protocol/VNC/Connection.Protocol.VNC.cs

@@ -61,7 +61,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strVncSetPropsFailed + Environment.NewLine + ex.Message,
+                                                    Language.VncSetPropsFailed + Environment.NewLine + ex.Message,
                                                     true);
                 return false;
             }
@@ -78,7 +78,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strConnectionOpenFailed + Environment.NewLine +
+                                                    Language.ConnectionOpenFailed + Environment.NewLine +
                                                     ex.Message);
                 return false;
             }
@@ -95,7 +95,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strVncConnectionDisconnectFailed + Environment.NewLine +
+                                                    Language.VncConnectionDisconnectFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -118,7 +118,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strVncSendSpecialKeysFailed + Environment.NewLine +
+                                                    Language.VncSendSpecialKeysFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -133,7 +133,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strVncToggleSmartSizeFailed + Environment.NewLine +
+                                                    Language.VncToggleSmartSizeFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -147,7 +147,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strVncToggleViewOnlyFailed + Environment.NewLine +
+                                                    Language.VncToggleViewOnlyFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -172,7 +172,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strVncRefreshFailed + Environment.NewLine + ex.Message,
+                                                    Language.VncRefreshFailed + Environment.NewLine + ex.Message,
                                                     true);
             }
         }
@@ -196,7 +196,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                                                    Language.strVncSetEventHandlersFailed + Environment.NewLine +
+                                                    Language.VncSetEventHandlersFailed + Environment.NewLine +
                                                     ex.Message, true);
             }
         }
@@ -288,7 +288,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
 
         public enum Compression
         {
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strNoCompression))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.NoCompression))]
             CompNone = 99,
             [Description("0")] Comp0 = 0,
             [Description("1")] Comp1 = 1,
@@ -316,44 +316,44 @@ namespace mRemoteNG.Connection.Protocol.VNC
 
         public enum AuthMode
         {
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strVnc))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Vnc))]
             AuthVNC,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strWindows))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Windows))]
             AuthWin
         }
 
         public enum ProxyType
         {
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strNone))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.None))]
             ProxyNone,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strHttp))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Http))]
             ProxyHTTP,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strSocks5))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Socks5))]
             ProxySocks5,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strUltraVncRepeater))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.UltraVncRepeater))]
             ProxyUltra
         }
 
         public enum Colors
         {
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strNormal))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Normal))]
             ColNormal,
             [Description("8-bit")] Col8Bit
         }
 
         public enum SmartSizeMode
         {
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strNoSmartSize))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.NoSmartSize))]
             SmartSNo,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strFree))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Free))]
             SmartSFree,
 
-            [LocalizedAttributes.LocalizedDescription(nameof(Language.strAspect))]
+            [LocalizedAttributes.LocalizedDescription(nameof(Language.Aspect))]
             SmartSAspect
         }
 

mRemoteV1/Connection/Protocol/VNC/VNCEnum.cs

@@ -16,7 +16,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
 
     public enum Compression
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strNoCompression))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.NoCompression))]
         CompNone = 99,
         [Description("0")] Comp0 = 0,
         [Description("1")] Comp1 = 1,
@@ -44,44 +44,44 @@ namespace mRemoteNG.Connection.Protocol.VNC
 
     public enum AuthMode
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strVnc))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Vnc))]
         AuthVNC,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strWindows))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Windows))]
         AuthWin
     }
 
     public enum ProxyType
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strNone))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.None))]
         ProxyNone,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strHttp))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Http))]
         ProxyHTTP,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strSocks5))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Socks5))]
         ProxySocks5,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strUltraVncRepeater))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.UltraVncRepeater))]
         ProxyUltra
     }
 
     public enum Colors
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strNormal))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Normal))]
         ColNormal,
         [Description("8-bit")] Col8Bit
     }
 
     public enum SmartSizeMode
     {
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strNoSmartSize))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.NoSmartSize))]
         SmartSNo,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strFree))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Free))]
         SmartSFree,
 
-        [LocalizedAttributes.LocalizedDescription(nameof(Language.strAspect))]
+        [LocalizedAttributes.LocalizedDescription(nameof(Language.Aspect))]
         SmartSAspect
     }
 }

mRemoteV1/Connection/PuttySessionInfo.cs

@@ -78,7 +78,7 @@ namespace mRemoteNG.Connection
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    Language.strErrorCouldNotLaunchPutty + Environment.NewLine +
+                                                    Language.ErrorCouldNotLaunchPutty + Environment.NewLine +
                                                     ex.Message);
             }
         }

mRemoteV1/Connection/WebHelper.cs

@@ -14,7 +14,7 @@ namespace mRemoteNG.Connection
             connectionInfo.Protocol = url.StartsWith("https:") ? ProtocolType.HTTPS : ProtocolType.HTTP;
             connectionInfo.SetDefaultPort();
             if (string.IsNullOrEmpty(connectionInfo.Panel))
-                connectionInfo.Panel = Language.strGeneral;
+                connectionInfo.Panel = Language.General;
             connectionInfo.IsQuickConnect = true;
             var connectionInitiator = new ConnectionInitiator();
             connectionInitiator.OpenConnection(connectionInfo, ConnectionInfo.Force.DoNotJump);

mRemoteV1/Credential/CredentialDeletionMsgBoxConfirmer.cs

@@ -31,7 +31,7 @@ namespace mRemoteNG.Credential
                                                 targetsArray.Length));
             return PromptUser(
                               string.Format(
-                                            Language.strConfirmDeleteCredentialRecord,
+                                            Language.ConfirmDeleteCredentialRecord,
                                             targetsArray.First().Title));
         }
 

mRemoteV1/Messages/MessageWriters/PopupMessageWriter.cs

@@ -10,19 +10,19 @@ namespace mRemoteNG.Messages.MessageWriters
             switch (message.Class)
             {
                 case MessageClass.DebugMsg:
-                    MessageBox.Show(message.Text, string.Format(Language.strTitleInformation, message.Date),
+                    MessageBox.Show(message.Text, string.Format(Language.TitleInformation, message.Date),
                                     MessageBoxButtons.OK, MessageBoxIcon.Information);
                     break;
                 case MessageClass.InformationMsg:
-                    MessageBox.Show(message.Text, string.Format(Language.strTitleInformation, message.Date),
+                    MessageBox.Show(message.Text, string.Format(Language.TitleInformation, message.Date),
                                     MessageBoxButtons.OK, MessageBoxIcon.Information);
                     break;
                 case MessageClass.WarningMsg:
-                    MessageBox.Show(message.Text, string.Format(Language.strTitleWarning, message.Date),
+                    MessageBox.Show(message.Text, string.Format(Language.TitleWarning, message.Date),
                                     MessageBoxButtons.OK, MessageBoxIcon.Warning);
                     break;
                 case MessageClass.ErrorMsg:
-                    MessageBox.Show(message.Text, string.Format(Language.strTitleError, message.Date),
+                    MessageBox.Show(message.Text, string.Format(Language.TitleError, message.Date),
                                     MessageBoxButtons.OK, MessageBoxIcon.Error);
                     break;
                 default:

mRemoteV1/Resources/Language/Language.el.resx

@@ -117,226 +117,172 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="strAbout" xml:space="preserve">
+  <data name="About" xml:space="preserve">
     <value>Σχετικά με</value>
   </data>
-  <data name="strActive" xml:space="preserve">
-    <value>Ενεργό</value>
-  </data>
-  <data name="strActivity" xml:space="preserve">
-    <value>Δραστηριότητα</value>
-  </data>
-  <data name="strAddConnection" xml:space="preserve">
-    <value>Νέα σύνδεση</value>
-  </data>
-  <data name="strAddFolder" xml:space="preserve">
-    <value>Νέος φάκελος</value>
-  </data>
-  <data name="strAddNodeFromXmlFailed" xml:space="preserve">
+  <data name="AddNodeFromXmlFailed" xml:space="preserve">
     <value>AddNodeFromXML απέτυχε!</value>
   </data>
-  <data name="strAddNodesFromSqlFailed" xml:space="preserve">
-    <value>AddNodesFromSQL απέτυχε!</value>
-  </data>
-  <data name="strAllowOnlySingleInstance" xml:space="preserve">
+  <data name="AllowOnlySingleInstance" xml:space="preserve">
     <value>Επιτρέπετε μόνο ένα μόνο παράδειγμα της εφαρμογής (απαιτείται επανεκκίνηση του mRemoteNG)</value>
   </data>
-  <data name="strAlways" xml:space="preserve">
+  <data name="Always" xml:space="preserve">
     <value>Πάντα</value>
   </data>
-  <data name="strAlwaysConnectEvenIfAuthFails" xml:space="preserve">
+  <data name="AlwaysConnectEvenIfAuthFails" xml:space="preserve">
     <value>Πάντοτε να συνδεθεί, ακόμη και αν ο έλεγχος ταυτότητας αποτυγχάνει</value>
   </data>
-  <data name="strAlwaysShowPanelSelection" xml:space="preserve">
+  <data name="AlwaysShowPanelSelection" xml:space="preserve">
     <value>Πάντα Εμφάνιση πίνακα διαλόγου επιλογής κατά το άνοιγμα συνδέσεων</value>
   </data>
-  <data name="strAlwaysShowSysTrayIcon" xml:space="preserve">
+  <data name="AlwaysShowSysTrayIcon" xml:space="preserve">
     <value>Να εμφανίζονται πάντα γνωστοποίησης περιοχων εικόνας</value>
   </data>
-  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+  <data name="AskUpdatesCommandAskLater" xml:space="preserve">
     <value>Ρωτήστε με ξανά αργότερα</value>
   </data>
-  <data name="strAskUpdatesCommandCustom" xml:space="preserve">
+  <data name="AskUpdatesCommandCustom" xml:space="preserve">
     <value>Προσαρμογή των ρυθμίσεων τώρα</value>
   </data>
-  <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
+  <data name="AskUpdatesCommandRecommended" xml:space="preserve">
     <value>Χρήση των προτεινόμενων ρυθμίσεων</value>
   </data>
-  <data name="strAskUpdatesContent" xml:space="preserve">
+  <data name="AskUpdatesContent" xml:space="preserve">
     <value>{0} μπορεί να ελέγχει αυτόματα ενημερώσεις που μπορούν να παρέχουν νέα χαρακτηριστικά και διορθώσεις σφαλμάτων. Συνιστάται να επιτρέψετε {0} να ελέγξει για ενημερώσεις σε εβδομαδιαία βάση.</value>
   </data>
-  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+  <data name="AskUpdatesMainInstruction" xml:space="preserve">
     <value>Ρυθμίσεις αυτόματης ενημέρωσης</value>
   </data>
-  <data name="strAspect" xml:space="preserve">
+  <data name="Aspect" xml:space="preserve">
     <value>Πτυχή</value>
   </data>
-  <data name="strAutomaticallyGetSessionInfo" xml:space="preserve">
-    <value>Αυτόματη λήψη πληροφοριών περιόδου</value>
-  </data>
-  <data name="strAutoSaveEvery" xml:space="preserve">
+  <data name="AutoSaveEvery" xml:space="preserve">
     <value>Αυτόματη αποθήκευση κάθε:</value>
   </data>
-  <data name="strAutoSaveMins" xml:space="preserve">
-    <value>Λεπτά (0 σημαίνει απενεργοποιημένο)</value>
-  </data>
-  <data name="strAvailableVersion" xml:space="preserve">
+  <data name="AvailableVersion" xml:space="preserve">
     <value>Τρέχουσα έκδοση</value>
   </data>
-  <data name="strButtonBrowse" xml:space="preserve">
+  <data name="_Browse" xml:space="preserve">
     <value>&amp;Αναζήτηση...</value>
   </data>
-  <data name="strButtonCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>&amp;Ακύρωση</value>
   </data>
-  <data name="strButtonChange" xml:space="preserve">
+  <data name="Change" xml:space="preserve">
     <value>Αλλαγή</value>
   </data>
-  <data name="strButtonClose" xml:space="preserve">
+  <data name="_Close" xml:space="preserve">
     <value>&amp;Κλείσιμο</value>
   </data>
-  <data name="strButtonDefaultInheritance" xml:space="preserve">
+  <data name="ButtonDefaultInheritance" xml:space="preserve">
     <value>Προεπιλογή κληρονομικότητας</value>
   </data>
-  <data name="strButtonDefaultProperties" xml:space="preserve">
+  <data name="ButtonDefaultProperties" xml:space="preserve">
     <value>Προεπιλεγμένες ιδιότητες</value>
   </data>
-  <data name="strButtonDisconnect" xml:space="preserve">
+  <data name="Disconnect" xml:space="preserve">
     <value>Αποσύνδεση</value>
   </data>
-  <data name="strButtonIcon" xml:space="preserve">
+  <data name="Icon" xml:space="preserve">
     <value>Εικονίδιο</value>
   </data>
-  <data name="strButtonImport" xml:space="preserve">
+  <data name="_Import" xml:space="preserve">
     <value>&amp;Εισαγωγή</value>
   </data>
-  <data name="strButtonInheritance" xml:space="preserve">
+  <data name="Inheritance" xml:space="preserve">
     <value>Κληρονομιά</value>
   </data>
-  <data name="strButtonLaunchPutty" xml:space="preserve">
+  <data name="ButtonLaunchPutty" xml:space="preserve">
     <value>Εκκίνηση του PuTTY</value>
   </data>
-  <data name="strButtonNew" xml:space="preserve">
-    <value>&amp; Νέο</value>
-  </data>
-  <data name="strButtonOK" xml:space="preserve">
+  <data name="_Ok" xml:space="preserve">
     <value>&amp;ΟΚ</value>
   </data>
-  <data name="strButtonProperties" xml:space="preserve">
+  <data name="Properties" xml:space="preserve">
     <value>Ιδιότητες</value>
   </data>
-  <data name="strButtonScan" xml:space="preserve">
+  <data name="_Scan" xml:space="preserve">
     <value>&amp;Σάρωση</value>
   </data>
-  <data name="strButtonStop" xml:space="preserve">
+  <data name="_Stop" xml:space="preserve">
     <value>&amp;Διακοπή</value>
   </data>
-  <data name="strButtonTestProxy" xml:space="preserve">
+  <data name="TestProxy" xml:space="preserve">
     <value>Δοκιμή διακομιστή μεσολάβησης</value>
   </data>
-  <data name="strCannotImportNormalSessionFile" xml:space="preserve">
-    <value>Δεν μπορείτε να εισαγάγετε ένα κανονικό αρχείο σύνδεσης.
-Παρακαλούμε χρησιμοποιήστε Αρχείο - Συνδέσεις φορτίου για τα κανονικά αρχεία σύνδεσης!</value>
-  </data>
-  <data name="strCannotStartPortScan" xml:space="preserve">
+  <data name="CannotStartPortScan" xml:space="preserve">
     <value>Δεν είναι δυνατή η εκκίνηση της σάρωσης υποδοχων, εσφαλμένη μορφή IP!</value>
   </data>
-  <data name="strCategoryAppearance" xml:space="preserve">
+  <data name="Appearance" xml:space="preserve">
     <value>Εμφάνιση</value>
   </data>
-  <data name="strCategoryConnection" xml:space="preserve">
+  <data name="Connection" xml:space="preserve">
     <value>Σύνδεση</value>
   </data>
-  <data name="strCategoryCredentials" xml:space="preserve">
-    <value>Πιστοποιήσεις</value>
-  </data>
-  <data name="strCategoryDisplay" xml:space="preserve">
+  <data name="Display" xml:space="preserve">
     <value>Οθόνη</value>
   </data>
-  <data name="strCategoryGateway" xml:space="preserve">
+  <data name="Gateway" xml:space="preserve">
     <value>Πύλη</value>
   </data>
-  <data name="strCategoryGeneral" xml:space="preserve">
-    <value>Γενική</value>
-  </data>
-  <data name="strCategoryMiscellaneous" xml:space="preserve">
+  <data name="Miscellaneous" xml:space="preserve">
     <value>Διάφορα</value>
   </data>
-  <data name="strCategoryProtocol" xml:space="preserve">
+  <data name="Protocol" xml:space="preserve">
     <value>Πρωτόκολλο</value>
   </data>
-  <data name="strCategoryRedirect" xml:space="preserve">
+  <data name="Redirect" xml:space="preserve">
     <value>Ανακατεύθυνση</value>
   </data>
-  <data name="strCcAlwaysShowScreen" xml:space="preserve">
-    <value>Πάντα εμφάνιση αυτής της οθόνης κατά την εκκίνηση</value>
-  </data>
-  <data name="strCcCheckAgain" xml:space="preserve">
-    <value>Ανανέωση</value>
-  </data>
-  <data name="strCcCheckFailed" xml:space="preserve">
+  <data name="CheckFailed" xml:space="preserve">
     <value>Ο ελέγχος απέτυχε!</value>
   </data>
-  <data name="strCcCheckSucceeded" xml:space="preserve">
+  <data name="CheckSucceeded" xml:space="preserve">
     <value>Ο ελεγχος πέτυχε!</value>
   </data>
-  <data name="strCcEOLFailed" xml:space="preserve">
-    <value>Η δυνατότητα (RDP) συνεδρίες προϋποθέτει ότι έχετε μια εγγεγραμμένο αντίγραφο του eolwtscom.dll στο σύστημά σας. mRemoteNG πλοία με αυτό το στοιχείο αλλά θα δεν εγγραφείτε αυτόματα εκτός αν η εκτέλεση του πακέτου εγκατάστασης. Να εγγραφείτε δεν με μη αυτόματο τρόπο αυτό: Ανοίξτε στο τρέχω διάλογος (έναρξη - Run) και πληκτρολογήστε τα παρακάτω: regsvr32 "c:\Program Files\mRemoteNG\eolwtscom.dll" (όπου c:\Program Files\mRemoteNG\ είναι η διαδρομή προς την εγκατάσταση mRemoteNG). Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή να χρησιμοποιήσετε τη δυνατότητα συνεδρίες (RDP) στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/</value>
-  </data>
-  <data name="strCcEOLOK" xml:space="preserve">
-    <value>Το EOLWTSCOM βρέθηκε και φαίνεται να έχει καταχωρηθεί σωστά.</value>
-  </data>
-  <data name="strCcICAFailed" xml:space="preserve">
+  <data name="CcICAFailed" xml:space="preserve">
     <value>ICA απαιτεί ότι είναι εγκατεστημένο το XenDesktop Online Plugin και ότι καταχωρείται η βιβλιοθήκη wfica.ocx. Μπορείτε να κατεβάσετε τον πελάτη εδώ: http://www.citrix.com/download/ αν έχετε το XenDesktop Online Plugin εγκατασταθεί και ο έλεγχος συνεχίσει να αποτυγχάνει, προσπαθήστε να εγγραφείτε wfica.ocx με μη αυτόματο τρόπο. Να κάνει αυτό ανοίγω πάνω στο τρέχω διάλογος (έναρξη - Run) και πληκτρολογήστε τα παρακάτω: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (όπου c:\Program Files\Citrix\ICA Client\ είναι η διαδρομή στην εγκατάσταση XenDesktop Online Plugin). Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή να χρησιμοποιήσετε ICA στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/"</value>
   </data>
-  <data name="strCcICAOK" xml:space="preserve">
+  <data name="CcICAOK" xml:space="preserve">
     <value>Όλα τα συστατικά ICA βρέθηκαν και φαίνεται να καταχωρηθηκαν σωστά. Πρόγραμμα-πελάτη Citrix ICA ελέγχου έκδοση {0}</value>
   </data>
-  <data name="strCcNotInstalledProperly" xml:space="preserve">
+  <data name="CcNotInstalledProperly" xml:space="preserve">
     <value>δεν έχει εγκατασταθεί σωστά</value>
   </data>
-  <data name="strConnectInFullscreen" xml:space="preserve">
+  <data name="ConnectInFullscreen" xml:space="preserve">
     <value>Σύνδεση σε λειτουργία πλήρους οθόνης</value>
   </data>
-  <data name="strConnecting" xml:space="preserve">
+  <data name="Connecting" xml:space="preserve">
     <value>Σύνδεση...</value>
   </data>
-  <data name="strConnectionEventConnected" xml:space="preserve">
+  <data name="ConnectionEventConnected" xml:space="preserve">
     <value>Πρωτόκολλο γεγονός που συνδέεται</value>
   </data>
-  <data name="strConnectionEventConnectedDetail" xml:space="preserve">
+  <data name="ConnectionEventConnectedDetail" xml:space="preserve">
     <value>Σύνδεση με "{0}" μέσω "{1}" από το χρήστη "{2}" (Περιγραφή: «{3}»? Χρήστη το πεδίο: «{4}")</value>
   </data>
   <data name="ConnectionFailed" xml:space="preserve">
     <value>Η συνδεση απέτυχε!</value>
   </data>
-  <data name="strConnectionEventErrorOccured" xml:space="preserve">
+  <data name="ConnectionEventErrorOccured" xml:space="preserve">
     <value>Πρωτόκολλο ErrorOccured εκδήλωση</value>
   </data>
-  <data name="strConnectionOpenFailed" xml:space="preserve">
+  <data name="ConnectionOpenFailed" xml:space="preserve">
     <value>Άνοιγμα σύνδεσης απέτυχε!</value>
   </data>
-  <data name="strConnectionOpenFailedNoHostname" xml:space="preserve">
+  <data name="ConnectionOpenFailedNoHostname" xml:space="preserve">
     <value>Δεν μπορεί να ανοίχθει η σύνδεση: Το όνομα του κεντρικού υπολογιστή δεν ειναι καθορισμένο!</value>
   </data>
-  <data name="strConnectionRdpErrorDetail" xml:space="preserve">
-    <value>RDP λάθος! 
-Κωδικός σφάλματος: {0} 
-Περιγραφή σφάλματος: {1}</value>
-  </data>
-  <data name="strConnections" xml:space="preserve">
+  <data name="Connections" xml:space="preserve">
     <value>Συνδέσεις</value>
   </data>
-  <data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
+  <data name="ConnectionSetDefaultPortFailed" xml:space="preserve">
     <value>Αδυναμία ορισμού προεπιλεγμένης θύρας!</value>
   </data>
-  <data name="strConnectionsFileBackupFailed" xml:space="preserve">
+  <data name="ConnectionsFileBackupFailed" xml:space="preserve">
     <value>Δεν ήταν δυνατή η δημιουργία αντιγράφων ασφαλείας των συνδέσεων αρχείου!</value>
   </data>
-  <data name="strConnectionsFileCouldNotBeImported" xml:space="preserve">
-    <value>Δεν ήταν δυνατή η εισαγωγή συνδέσεων αρχείου!</value>
-  </data>
-  <data name="strConnectionsFileCouldNotBeLoaded" xml:space="preserve">
+  <data name="ConnectionsFileCouldNotBeLoaded" xml:space="preserve">
     <value>Το αρχείο συνδέσεων "{0}" δεν μπορεί να φορτωθεί!</value>
   </data>
 </root>

mRemoteV1/Resources/Language/Language.en-US.resx

@@ -117,226 +117,25 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="PlaceSearchBarAboveConnectionTree" xml:space="preserve">
-    <value>Place search bar above connection tree</value>
-  </data>
-  <data name="strPropertyDescriptionColors" xml:space="preserve">
+  <data name="PropertyDescriptionColors" xml:space="preserve">
     <value>Select the color quality to be used.</value>
   </data>
-  <data name="strPropertyNameColors" xml:space="preserve">
+  <data name="Colors" xml:space="preserve">
     <value>Colors</value>
   </data>
-  <data name="strRDP16777216Colors" xml:space="preserve">
+  <data name="Rdp16777216Colors" xml:space="preserve">
     <value>16777216 Colors (24-bit)</value>
   </data>
-  <data name="strRDP256Colors" xml:space="preserve">
+  <data name="Rdp256Colors" xml:space="preserve">
     <value>256 Colors (8-bit)</value>
   </data>
-  <data name="strRDP32768Colors" xml:space="preserve">
+  <data name="Rdp32768Colors" xml:space="preserve">
     <value>32768 Colors (15-bit)</value>
   </data>
-  <data name="strRDP4294967296Colors" xml:space="preserve">
+  <data name="Rdp4294967296Colors" xml:space="preserve">
     <value>16777216 Colors (32-bit)</value>
   </data>
-  <data name="strRDP65536Colors" xml:space="preserve">
+  <data name="Rdp65536Colors" xml:space="preserve">
     <value>65536 Colors (16-bit)</value>
   </data>
-  <data name="strThemeDescriptionConfigPanelBackgroundColor" xml:space="preserve">
-    <value>The background color of the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelCategoryTextColor" xml:space="preserve">
-    <value>The color of the category text in the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelGridLineColor" xml:space="preserve">
-    <value>The color of the grid lines in the config panel</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelHelpBackgroundColor" xml:space="preserve">
-    <value>The background color of the help area of the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelHelpTextColor" xml:space="preserve">
-    <value>The color of the text in the help area of the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelTextColor" xml:space="preserve">
-    <value>The color of the text in the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConnectionsPanelBackgroundColor" xml:space="preserve">
-    <value>The background color of the connections panel.</value>
-  </data>
-  <data name="strThemeDescriptionConnectionsPanelTextColor" xml:space="preserve">
-    <value>The color of the text in the connections panel.</value>
-  </data>
-  <data name="strThemeDescriptionConnectionsPanelTreeLineColor" xml:space="preserve">
-    <value>The color of the tree lines in the connections panel.</value>
-  </data>
-  <data name="strThemeDescriptionMenuBackgroundColor" xml:space="preserve">
-    <value>The background color of the menus.</value>
-  </data>
-  <data name="strThemeDescriptionMenuTextColor" xml:space="preserve">
-    <value>The color of the text in the menus.</value>
-  </data>
-  <data name="strThemeDescriptionSearchBoxBackgroundColor" xml:space="preserve">
-    <value>The background color of the search box.</value>
-  </data>
-  <data name="strThemeDescriptionSearchBoxTextColor" xml:space="preserve">
-    <value>The color of the text in the search box.</value>
-  </data>
-  <data name="strThemeDescriptionSearchBoxTextPromptColor" xml:space="preserve">
-    <value>The color of the prompt text in the search box.</value>
-  </data>
-  <data name="strThemeDescriptionToolbarBackgroundColor" xml:space="preserve">
-    <value>The background color of the toolbars.</value>
-  </data>
-  <data name="strThemeDescriptionToolbarTextColor" xml:space="preserve">
-    <value>The color of the text in the toolbars.</value>
-  </data>
-  <data name="strThemeDescriptionWindowBackgroundColor" xml:space="preserve">
-    <value>The background color of the main window.</value>
-  </data>
-  <data name="strThemeNameConfigPanelBackgroundColor" xml:space="preserve">
-    <value>Config Panel Background Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelCategoryTextColor" xml:space="preserve">
-    <value>Config Panel Category Text Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelGridLineColor" xml:space="preserve">
-    <value>Config Panel Grid Line Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelHelpBackgroundColor" xml:space="preserve">
-    <value>Config Panel Help Background Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelHelpTextColor" xml:space="preserve">
-    <value>Config Panel Help Text Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelTextColor" xml:space="preserve">
-    <value>Config Panel Text Color</value>
-  </data>
-  <data name="strThemeNameConnectionsPanelBackgroundColor" xml:space="preserve">
-    <value>Connections Panel Background Color</value>
-  </data>
-  <data name="strThemeNameConnectionsPanelTextColor" xml:space="preserve">
-    <value>Connections Panel Text Color</value>
-  </data>
-  <data name="strThemeNameConnectionsPanelTreeLineColor" xml:space="preserve">
-    <value>Connections Panel Tree Line Color</value>
-  </data>
-  <data name="strThemeNameMenuBackgroundColor" xml:space="preserve">
-    <value>Menu Background Color</value>
-  </data>
-  <data name="strThemeNameMenuTextColor" xml:space="preserve">
-    <value>Menu Text Color</value>
-  </data>
-  <data name="strThemeNameSearchBoxBackgroundColor" xml:space="preserve">
-    <value>Search Box Background Color</value>
-  </data>
-  <data name="strThemeNameSearchBoxTextColor" xml:space="preserve">
-    <value>Search Box Text Color</value>
-  </data>
-  <data name="strThemeNameSearchBoxTextPromptColor" xml:space="preserve">
-    <value>Search Box Text Prompt Color</value>
-  </data>
-  <data name="strThemeNameToolbarBackgroundColor" xml:space="preserve">
-    <value>Toolbar Background Color</value>
-  </data>
-  <data name="strThemeNameToolbarTextColor" xml:space="preserve">
-    <value>Toolbar Text Color</value>
-  </data>
-  <data name="strThemeNameWindowBackgroundColor" xml:space="preserve">
-    <value>Window Background Color</value>
-  </data>
-  <data name="strActiveDirectory" xml:space="preserve">
-		<value>Active Directory</value>
-	</data>
-  <data name="strErrorFipsPolicyIncompatible" xml:space="preserve">
-		<value>The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. 
-
-See the Microsoft Support article at http://support.microsoft.com/kb/811833 for more information.
-
-{0} is not fully FIPS compliant. Click OK to proceed at your own discretion, or Cancel to Exit.</value>
-	</data>
-  <data name="strHttpInternetExplorer" xml:space="preserve">
-		<value>Internet Explorer</value>
-	</data>
-  <data name="strImportLocationCommandButtons" xml:space="preserve">
-		<value>Under the root{0}{1}|Under the selected folder{0}{2}</value>
-	</data>
-  <data name="strNoInformation" xml:space="preserve">
-		<value>None</value>
-	</data>
-  <data name="strNone" xml:space="preserve">
-		<value>None</value>
-	</data>
-  <data name="strPropertyDescriptionRedirectClipboard" xml:space="preserve">
-		<value>Select whether clipboard should be shared.</value>
-	</data>
-  <data name="strPropertyNameRedirectClipboard" xml:space="preserve">
-		<value>Clipboard</value>
-	</data>
-  <data name="strOptionsThemeChangeWarning" xml:space="preserve">
-		<value>Warning: Restart is required to commit any theme configuration change.</value>
-	</data>
-  <data name="strIPRange" xml:space="preserve">
-		<value>Must Be Between 0 and 255</value>
-	</data>
-  <data name="strOutOfRange" xml:space="preserve">
-		<value>Out Of Range</value>
-	</data>
-  <data name="strDelete" xml:space="preserve">
-		<value>Delete...</value>
-	</data>
-  <data name="strReconnectAllConnections" xml:space="preserve">
-		<value>Reconnect All Connections</value>
-	</data>
-  <data name="strUltraVNCSingleClick" xml:space="preserve">
-		<value>UltraVNC SingleClick</value>
-	</data>
-  <data name="strMenuDisconnectOthers" xml:space="preserve">
-		<value>Disconnect All But This</value>
-	</data>
-  <data name="AutomaticReconnectError" xml:space="preserve">
-		<value>An error occurred while trying to reconnect to RDP host '{0}'</value>
-	</data>
-  <data name="ChangeConnectionResolutionError" xml:space="preserve">
-		<value>An error occurred while trying to change the connection resolution to host '{0}'</value>
-	</data>
-  <data name="StackTrace" xml:space="preserve">
-		<value>Stack trace</value>
-	</data>
-  <data name="ExceptionMessage" xml:space="preserve">
-		<value>Exception Message</value>
-	</data>
-  <data name="mRemoteNGUnhandledException" xml:space="preserve">
-		<value>mRemoteNG Unhandled Exception</value>
-	</data>
-  <data name="UnhandledExceptionOccured" xml:space="preserve">
-		<value>An unhandled exception has occurred</value>
-	</data>
-  <data name="ExceptionForcesmRemoteNGToClose" xml:space="preserve">
-		<value>This exception will force mRemoteNG to close</value>
-	</data>
-  <data name="strMenuCopyHostname" xml:space="preserve">
-		<value>Copy Hostname</value>
-	</data>
-  <data name="strPortScanSinglePort" xml:space="preserve">
-		<value>To scan a single port, select the "First Port" only.</value>
-	</data>
-  <data name="strTrackActiveConnectionInConnectionTree" xml:space="preserve">
-		<value>Track active connection in the connection tree</value>
-	</data>
-  <data name="strAlwaysShowConnectionTabs" xml:space="preserve">
-		<value>Always show connection tabs</value>
-	</data>
-  <data name="strReleaseChannel" xml:space="preserve">
-		<value>Release Channel</value>
-	</data>
-  <data name="strReleaseChannelExplanation" xml:space="preserve">
-		<value>Stable channel includes final releases only.
-Beta channel includes Betas &amp; Release Candidates.
-Development Channel includes Alphas, Betas &amp; Release Candidates.</value>
-	</data>
-  <data name="strButtonApply" xml:space="preserve">
-		<value>Apply</value>
-	</data>
-  <data name="strCategoryProxy" xml:space="preserve">
-		<value>Proxy</value>
-	</data>
 </root>

mRemoteV1/Resources/Language/Language.es-AR.resx

@@ -117,269 +117,224 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="strActive" xml:space="preserve">
-    <value>Activo</value>
-  </data>
-  <data name="strActivity" xml:space="preserve">
-    <value>Actividad</value>
-  </data>
-  <data name="strButtonDefaultProperties" xml:space="preserve">
+  <data name="ButtonDefaultProperties" xml:space="preserve">
     <value>Propiedades por defecto</value>
   </data>
-  <data name="strButtonDisconnect" xml:space="preserve">
+  <data name="Disconnect" xml:space="preserve">
     <value>Desconectar</value>
   </data>
-  <data name="strButtonIcon" xml:space="preserve">
+  <data name="Icon" xml:space="preserve">
     <value>Icono</value>
   </data>
-  <data name="strButtonLaunchPutty" xml:space="preserve">
+  <data name="ButtonLaunchPutty" xml:space="preserve">
     <value>Ejecutar PuTTY</value>
   </data>
-  <data name="strButtonOK" xml:space="preserve">
+  <data name="_Ok" xml:space="preserve">
     <value>&amp; OK</value>
   </data>
-  <data name="strButtonProperties" xml:space="preserve">
+  <data name="Properties" xml:space="preserve">
     <value>Propiedades</value>
   </data>
-  <data name="strButtonScan" xml:space="preserve">
+  <data name="_Scan" xml:space="preserve">
     <value>&amp; Scanear</value>
   </data>
-  <data name="strButtonStop" xml:space="preserve">
+  <data name="_Stop" xml:space="preserve">
     <value>&amp; Parar</value>
   </data>
-  <data name="strButtonTestProxy" xml:space="preserve">
+  <data name="TestProxy" xml:space="preserve">
     <value>Probar Proxy</value>
   </data>
-  <data name="strCategoryCredentials" xml:space="preserve">
-    <value>Credenciales</value>
-  </data>
-  <data name="strCategoryMiscellaneous" xml:space="preserve">
+  <data name="Miscellaneous" xml:space="preserve">
     <value>Varios</value>
   </data>
-  <data name="strCcAlwaysShowScreen" xml:space="preserve">
-    <value>Siempre mostrar esta pantalla al inicio</value>
-  </data>
-  <data name="strCcNotInstalledProperly" xml:space="preserve">
+  <data name="CcNotInstalledProperly" xml:space="preserve">
     <value>no está correctamente instalado</value>
   </data>
-  <data name="strCcPuttyOK" xml:space="preserve">
+  <data name="CcPuttyOK" xml:space="preserve">
     <value>El ejecutable de PuTTY se encontró y debería estar listo para usarse.</value>
   </data>
-  <data name="strCcRDPOK" xml:space="preserve">
+  <data name="CcRDPOK" xml:space="preserve">
     <value>Todos los componentes RDP se encontraron y parecen estar registrados correctamente. Versión de escritorio remoto {0}</value>
   </data>
-  <data name="strCcVNCOK" xml:space="preserve">
+  <data name="CcVNCOK" xml:space="preserve">
     <value>Todos los componentes de VNC se encontraron y parecen estar registrados correctamente.
 VncSharp Control {0}</value>
   </data>
-  <data name="strCheckboxAutomaticReconnect" xml:space="preserve">
+  <data name="CheckboxAutomaticReconnect" xml:space="preserve">
     <value>Intentar reconectar automáticamente cuando se desconecte (solo para RDP &amp;&amp; ICA)</value>
   </data>
-  <data name="strCheckboxDomain" xml:space="preserve">
-    <value>Dominio</value>
-  </data>
-  <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
+  <data name="CheckboxDoNotShowThisMessageAgain" xml:space="preserve">
     <value>No mostrar este mensaje de nuevo.</value>
   </data>
-  <data name="strCheckboxInheritance" xml:space="preserve">
-    <value>Herencia</value>
-  </data>
-  <data name="strCheckboxPassword" xml:space="preserve">
-    <value>Contraseña</value>
-  </data>
-  <data name="strCheckboxProxyAuthentication" xml:space="preserve">
+  <data name="CheckboxProxyAuthentication" xml:space="preserve">
     <value>Este servidor proxy requiere autenticación</value>
   </data>
-  <data name="strCheckboxPuttyPath" xml:space="preserve">
+  <data name="CheckboxPuttyPath" xml:space="preserve">
     <value>Usar ruta de Putty personalizada:</value>
   </data>
-  <data name="strCheckboxReconnectWhenReady" xml:space="preserve">
+  <data name="CheckboxReconnectWhenReady" xml:space="preserve">
     <value>Vuelva a conectarse cuando esté listo</value>
   </data>
-  <data name="strCheckboxUpdateUseProxy" xml:space="preserve">
+  <data name="CheckboxUpdateUseProxy" xml:space="preserve">
     <value>Usar un servidor proxy para conectarse</value>
   </data>
-  <data name="strCheckboxUsername" xml:space="preserve">
+  <data name="Username" xml:space="preserve">
     <value>Usuario</value>
   </data>
-  <data name="strCheckboxWaitForExit" xml:space="preserve">
+  <data name="WaitForExit" xml:space="preserve">
     <value>Esperar a Salir</value>
   </data>
-  <data name="strCheckForUpdate" xml:space="preserve">
+  <data name="CheckAgain" xml:space="preserve">
     <value>Pruebe nuevamente</value>
   </data>
-  <data name="strCheckForUpdatesOnStartup" xml:space="preserve">
+  <data name="CheckForUpdatesOnStartup" xml:space="preserve">
     <value>Comprobar las actualizaciones y anuncios en el inicio</value>
   </data>
-  <data name="strCheckNow" xml:space="preserve">
+  <data name="CheckNow" xml:space="preserve">
     <value>Compruebe ahora</value>
   </data>
-  <data name="strCheckProperInstallationOfComponentsAtStartup" xml:space="preserve">
+  <data name="CheckProperInstallationOfComponentsAtStartup" xml:space="preserve">
     <value>Verifique la correcta instalación de los componentes en el inicio</value>
   </data>
-  <data name="strChoosePanelBeforeConnecting" xml:space="preserve">
+  <data name="ChoosePanelBeforeConnecting" xml:space="preserve">
     <value>Elija el panel antes de conectarse</value>
   </data>
-  <data name="strClosedPorts" xml:space="preserve">
+  <data name="ClosedPorts" xml:space="preserve">
     <value>Puertos Cerrados</value>
   </data>
-  <data name="strCollapseAllFolders" xml:space="preserve">
+  <data name="CollapseAllFolders" xml:space="preserve">
     <value>Contraer todas las carpetas</value>
   </data>
-  <data name="strComponentsCheck" xml:space="preserve">
+  <data name="ComponentsCheck" xml:space="preserve">
     <value>Comprobación de componentes</value>
   </data>
-  <data name="strConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
+  <data name="ConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
     <value>btnIcon_Click falló!</value>
   </data>
-  <data name="strConfirmCloseConnectionMainInstruction" xml:space="preserve">
-    <value>¿Desea cerrar la conexión:
-"{0}"?</value>
-  </data>
-  <data name="strConfirmCloseConnectionPanelMainInstruction" xml:space="preserve">
+  <data name="ConfirmCloseConnectionPanelMainInstruction" xml:space="preserve">
     <value>¿Está seguro que desea cerrar el panel, "{0}"? Cualquier conexión que contenga el panel también estará cerrada.</value>
   </data>
-  <data name="strConfirmDeleteNodeFolder" xml:space="preserve">
+  <data name="ConfirmDeleteNodeFolder" xml:space="preserve">
     <value>¿Está seguro que desea eliminar la carpeta vacía, "{0}"?</value>
   </data>
-  <data name="strConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
+  <data name="ConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
     <value>¿Está seguro que desea eliminar la carpeta "{0}"? También se eliminará cualquier carpetas o conexiones que contiene.</value>
   </data>
-  <data name="strConfirmExitMainInstruction" xml:space="preserve">
+  <data name="ConfirmExitMainInstruction" xml:space="preserve">
     <value>¿Desea cerrar todas las conexiones abiertas?</value>
   </data>
-  <data name="strConfirmResetLayout" xml:space="preserve">
+  <data name="ConfirmResetLayout" xml:space="preserve">
     <value>¿Estás seguro que deseas restablecer los paneles a su diseño predeterminado?</value>
   </data>
-  <data name="strConnect" xml:space="preserve">
+  <data name="Connect" xml:space="preserve">
     <value>Conectar</value>
   </data>
-  <data name="strConnecting" xml:space="preserve">
+  <data name="Connecting" xml:space="preserve">
     <value>Conectando...</value>
   </data>
-  <data name="strConnectionEventConnected" xml:space="preserve">
+  <data name="ConnectionEventConnected" xml:space="preserve">
     <value>Evento de protocolo conectado</value>
   </data>
   <data name="ConnectionFailed" xml:space="preserve">
     <value>¡Error de conexión!</value>
   </data>
-  <data name="strConnectionOpenFailed" xml:space="preserve">
+  <data name="ConnectionOpenFailed" xml:space="preserve">
     <value>No se pudo abrir la conexión!</value>
   </data>
-  <data name="strConnectionOpenFailedNoHostname" xml:space="preserve">
+  <data name="ConnectionOpenFailedNoHostname" xml:space="preserve">
     <value>No se puede abrir la conexión: ningún nombre de host especificado!</value>
   </data>
-  <data name="strConnectionRdpErrorDetail" xml:space="preserve">
-    <value>Error de RDP.
-Código de Error: {0} 
-Descripción del Error: {1}</value>
-  </data>
-  <data name="strConnections" xml:space="preserve">
+  <data name="Connections" xml:space="preserve">
     <value>Conexiones</value>
   </data>
-  <data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
+  <data name="ConnectionSetDefaultPortFailed" xml:space="preserve">
     <value>No se ha podido establecer el puerto predeterminado!</value>
   </data>
-  <data name="strConnectionsFileBackupFailed" xml:space="preserve">
+  <data name="ConnectionsFileBackupFailed" xml:space="preserve">
     <value>No se pudo crear copia de seguridad del archivo de conexiones!</value>
   </data>
-  <data name="strConnectionsFileCouldNotBeImported" xml:space="preserve">
-    <value>No se pudo importar archivo de conexiones!</value>
-  </data>
-  <data name="strConnectionsFileCouldNotBeLoaded" xml:space="preserve">
+  <data name="ConnectionsFileCouldNotBeLoaded" xml:space="preserve">
     <value>No se pudo cargar el archivo de conexiones "{0}"!</value>
   </data>
-  <data name="strConnectionsFileCouldNotBeSaved" xml:space="preserve">
-    <value>No se pudo guardar el archivo de conexiones!</value>
-  </data>
-  <data name="strConnectionsFileCouldNotSaveAs" xml:space="preserve">
+  <data name="ConnectionsFileCouldNotSaveAs" xml:space="preserve">
     <value>No se pudo guardar archivo de conexiones como "{0}"!</value>
   </data>
-  <data name="strConnectToConsoleSession" xml:space="preserve">
+  <data name="ConnectToConsoleSession" xml:space="preserve">
     <value>Conectar con la sesión de consola</value>
   </data>
-  <data name="strConnectWithOptions" xml:space="preserve">
+  <data name="ConnectWithOptions" xml:space="preserve">
     <value>Conectar (con opciones)</value>
   </data>
-  <data name="strConnenctionClosedByUser" xml:space="preserve">
+  <data name="ConnenctionClosedByUser" xml:space="preserve">
     <value>Conexión a {0} {1} vía cerrada por usuario {2}.</value>
   </data>
-  <data name="strConnenctionClosedByUserDetail" xml:space="preserve">
-    <value>Conexión a {0} {1} vía cerrada por usuario {2}.  (Descripción: "{3}"; Campo de usuario: "{4}")</value>
-  </data>
-  <data name="strConnenctionCloseEvent" xml:space="preserve">
+  <data name="ConnenctionCloseEvent" xml:space="preserve">
     <value>Evento de conexión cerrada</value>
   </data>
-  <data name="strConnenctionCloseEventFailed" xml:space="preserve">
+  <data name="ConnenctionCloseEventFailed" xml:space="preserve">
     <value>Evento de cerrar conexión falló!</value>
   </data>
-  <data name="strCouldNotCreateNewConnectionsFile" xml:space="preserve">
+  <data name="CouldNotCreateNewConnectionsFile" xml:space="preserve">
     <value>No se pudo crear el nuevo archivo de conexiones!</value>
   </data>
-  <data name="strCurrentVersion" xml:space="preserve">
+  <data name="InstalledVersion" xml:space="preserve">
     <value>Versión instalada</value>
   </data>
-  <data name="strDetect" xml:space="preserve">
+  <data name="Detect" xml:space="preserve">
     <value>Detectar</value>
   </data>
-  <data name="strDontConnectWhenAuthFails" xml:space="preserve">
+  <data name="DontConnectWhenAuthFails" xml:space="preserve">
     <value>No conectar si falla la autenticación</value>
   </data>
-  <data name="strDownloadAndInstall" xml:space="preserve">
+  <data name="DownloadAndInstall" xml:space="preserve">
     <value>Descargar e instalar</value>
   </data>
-  <data name="strDuplicate" xml:space="preserve">
+  <data name="Duplicate" xml:space="preserve">
     <value>Duplicar</value>
   </data>
-  <data name="strEmptyPasswordContinue" xml:space="preserve">
+  <data name="EmptyPasswordContinue" xml:space="preserve">
     <value>¿Desea continuar sin contraseña?</value>
   </data>
-  <data name="strEmptyUsernamePasswordDomainFields" xml:space="preserve">
+  <data name="EmptyUsernamePasswordDomainFields" xml:space="preserve">
     <value>Si desea Nombre de usuario, password o dominio vacio use:</value>
   </data>
-  <data name="strEnc128Bit" xml:space="preserve">
+  <data name="Enc128Bit" xml:space="preserve">
     <value>128-bit</value>
   </data>
-  <data name="strEnc128BitLogonOnly" xml:space="preserve">
+  <data name="Enc128BitLogonOnly" xml:space="preserve">
     <value>128-bit (iniciar sesión)</value>
   </data>
-  <data name="strEncBasic" xml:space="preserve">
+  <data name="Basic" xml:space="preserve">
     <value>Básica</value>
   </data>
-  <data name="strEncryptCompleteConnectionFile" xml:space="preserve">
+  <data name="EncryptCompleteConnectionFile" xml:space="preserve">
     <value>Encriptar completamente el archivo de conexiones</value>
   </data>
-  <data name="strEndIP" xml:space="preserve">
+  <data name="LastIp" xml:space="preserve">
     <value>Último IP</value>
   </data>
-  <data name="strEndPort" xml:space="preserve">
+  <data name="LastPort" xml:space="preserve">
     <value>Último puerto</value>
   </data>
-  <data name="strErrorAddExternalToolsToToolBarFailed" xml:space="preserve">
+  <data name="ErrorAddExternalToolsToToolBarFailed" xml:space="preserve">
     <value>BarraAgregarHerramientasExternas (frmMain) falló. {0}</value>
   </data>
-  <data name="strErrorBadDatabaseVersion" xml:space="preserve">
+  <data name="ErrorBadDatabaseVersion" xml:space="preserve">
     <value>La versión de la base de datos {0} no es compatible con esta versión de {1}.</value>
   </data>
-  <data name="strErrorCloneNodeFailed" xml:space="preserve">
-    <value>ClonarModulo (Tree.Node) falló. {0}</value>
-  </data>
-  <data name="strErrorCode" xml:space="preserve">
-    <value>Código de Error {0}.</value>
-  </data>
-  <data name="strErrorConnectionListSaveFailed" xml:space="preserve">
+  <data name="ErrorConnectionListSaveFailed" xml:space="preserve">
     <value>La lista de conexiones no pudo ser guardada.</value>
   </data>
-  <data name="strErrorDecryptionFailed" xml:space="preserve">
+  <data name="ErrorDecryptionFailed" xml:space="preserve">
     <value>La decriptación falló. {0}</value>
   </data>
-  <data name="strErrorEncryptionFailed" xml:space="preserve">
+  <data name="ErrorEncryptionFailed" xml:space="preserve">
     <value>La encriptación falló. {0}</value>
   </data>
-  <data name="strErrors" xml:space="preserve">
+  <data name="Errors" xml:space="preserve">
     <value>Errores</value>
   </data>
-  <data name="strErrorVerifyDatabaseVersionFailed" xml:space="preserve">
+  <data name="ErrorVerifyDatabaseVersionFailed" xml:space="preserve">
     <value>VerificarVersionBasedeDatos (Config.Connections.Save) falló. {0}</value>
   </data>
 </root>

mRemoteV1/Resources/Language/Language.hu.resx

@@ -117,322 +117,235 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="strAbout" xml:space="preserve">
+  <data name="About" xml:space="preserve">
     <value>Névjegy</value>
   </data>
-  <data name="strActive" xml:space="preserve">
-    <value>Aktív</value>
-  </data>
-  <data name="strActivity" xml:space="preserve">
-    <value>Tevékenység</value>
-  </data>
-  <data name="strAddConnection" xml:space="preserve">
-    <value>Új kapcsolat</value>
-  </data>
-  <data name="strAddFolder" xml:space="preserve">
-    <value>Új mappa</value>
-  </data>
-  <data name="strAlways" xml:space="preserve">
+  <data name="Always" xml:space="preserve">
     <value>Mindig</value>
   </data>
-  <data name="strAlwaysConnectEvenIfAuthFails" xml:space="preserve">
+  <data name="AlwaysConnectEvenIfAuthFails" xml:space="preserve">
     <value>Kapcsolódj mindig, sikertelen hitelesítés esetén is</value>
   </data>
-  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+  <data name="AskUpdatesCommandAskLater" xml:space="preserve">
     <value>Kérdezz rá később</value>
   </data>
-  <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
+  <data name="AskUpdatesCommandRecommended" xml:space="preserve">
     <value>Javasolt beállítások használata</value>
   </data>
-  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+  <data name="AskUpdatesMainInstruction" xml:space="preserve">
     <value>Automatikus frissítés beállításai</value>
   </data>
-  <data name="strAutomaticallyGetSessionInfo" xml:space="preserve">
-    <value>Munkamenet információk automatikus megszerzése</value>
-  </data>
-  <data name="strAutoSaveEvery" xml:space="preserve">
+  <data name="AutoSaveEvery" xml:space="preserve">
     <value>Automatikus mentés minden:</value>
   </data>
-  <data name="strAutoSaveMins" xml:space="preserve">
-    <value>Perc (0 - kikapcsolva)</value>
-  </data>
-  <data name="strAvailableVersion" xml:space="preserve">
+  <data name="AvailableVersion" xml:space="preserve">
     <value>Aktuális verzió</value>
   </data>
-  <data name="strButtonBrowse" xml:space="preserve">
+  <data name="_Browse" xml:space="preserve">
     <value>&amp;Böngészés...</value>
   </data>
-  <data name="strButtonCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>&amp;Mégsem</value>
   </data>
-  <data name="strButtonChange" xml:space="preserve">
+  <data name="Change" xml:space="preserve">
     <value>Módosít</value>
   </data>
-  <data name="strButtonClose" xml:space="preserve">
+  <data name="_Close" xml:space="preserve">
     <value>Be&amp;zár</value>
   </data>
-  <data name="strButtonDisconnect" xml:space="preserve">
+  <data name="Disconnect" xml:space="preserve">
     <value>Kapcsolat bontása</value>
   </data>
-  <data name="strButtonIcon" xml:space="preserve">
+  <data name="Icon" xml:space="preserve">
     <value>Ikon</value>
   </data>
-  <data name="strButtonImport" xml:space="preserve">
+  <data name="_Import" xml:space="preserve">
     <value>&amp;Improtálás</value>
   </data>
-  <data name="strButtonLaunchPutty" xml:space="preserve">
+  <data name="ButtonLaunchPutty" xml:space="preserve">
     <value>PuTTY indítása</value>
   </data>
-  <data name="strButtonNew" xml:space="preserve">
-    <value>&amp;Új</value>
-  </data>
-  <data name="strButtonOK" xml:space="preserve">
+  <data name="_Ok" xml:space="preserve">
     <value>&amp;OK</value>
   </data>
-  <data name="strButtonProperties" xml:space="preserve">
+  <data name="Properties" xml:space="preserve">
     <value>Tulajdonságok</value>
   </data>
-  <data name="strCannotStartPortScan" xml:space="preserve">
+  <data name="CannotStartPortScan" xml:space="preserve">
     <value>Helytelen IP cím, a port szkennelés nem indítható!</value>
   </data>
-  <data name="strCategoryAppearance" xml:space="preserve">
+  <data name="Appearance" xml:space="preserve">
     <value>Megjelenés</value>
   </data>
-  <data name="strCategoryConnection" xml:space="preserve">
+  <data name="Connection" xml:space="preserve">
     <value>Kapcsolat</value>
   </data>
-  <data name="strCategoryCredentials" xml:space="preserve">
-    <value>Hitelesítés</value>
-  </data>
-  <data name="strCategoryDisplay" xml:space="preserve">
+  <data name="Display" xml:space="preserve">
     <value>Képernyő</value>
   </data>
-  <data name="strCategoryGateway" xml:space="preserve">
+  <data name="Gateway" xml:space="preserve">
     <value>Átjáró</value>
   </data>
-  <data name="strCategoryGeneral" xml:space="preserve">
-    <value>Általános</value>
-  </data>
-  <data name="strCategoryMiscellaneous" xml:space="preserve">
+  <data name="Miscellaneous" xml:space="preserve">
     <value>Egyéb</value>
   </data>
-  <data name="strCategoryProtocol" xml:space="preserve">
+  <data name="Protocol" xml:space="preserve">
     <value>Protokoll</value>
   </data>
-  <data name="strCategoryRedirect" xml:space="preserve">
+  <data name="Redirect" xml:space="preserve">
     <value>Átirányítás</value>
   </data>
-  <data name="strCcCheckFailed" xml:space="preserve">
+  <data name="CheckFailed" xml:space="preserve">
     <value>Az ellenőrzés sikertelen!</value>
   </data>
-  <data name="strCcCheckSucceeded" xml:space="preserve">
+  <data name="CheckSucceeded" xml:space="preserve">
     <value>Az ellenőrzés sikeres!</value>
   </data>
-  <data name="strCheckboxDomain" xml:space="preserve">
-    <value>Tartomány</value>
-  </data>
-  <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
+  <data name="CheckboxDoNotShowThisMessageAgain" xml:space="preserve">
     <value>Többé ne mutasd ezt az üzenetet.</value>
   </data>
-  <data name="strColumnFilename" xml:space="preserve">
+  <data name="Filename" xml:space="preserve">
     <value>Fájlnév</value>
   </data>
-  <data name="strColumnHostnameIP" xml:space="preserve">
-    <value>Kiszolgálónév/IP cím</value>
-  </data>
-  <data name="strColumnMessage" xml:space="preserve">
+  <data name="Message" xml:space="preserve">
     <value>Üzenet</value>
   </data>
-  <data name="strColumnUsername" xml:space="preserve">
-    <value>Felhasználónév</value>
-  </data>
-  <data name="strCommandLineArgsCouldNotBeParsed" xml:space="preserve">
+  <data name="CommandLineArgsCouldNotBeParsed" xml:space="preserve">
     <value>Nem értelmezhető parancssori argumentum!</value>
   </data>
-  <data name="strConnecting" xml:space="preserve">
+  <data name="Connecting" xml:space="preserve">
     <value>Kapcsolódás...</value>
   </data>
   <data name="ConnectionFailed" xml:space="preserve">
     <value>Sikertelen kapcsolódás!</value>
   </data>
-  <data name="strConnections" xml:space="preserve">
+  <data name="Connections" xml:space="preserve">
     <value>Kapcsolatok</value>
   </data>
-  <data name="strCurrentVersion" xml:space="preserve">
+  <data name="InstalledVersion" xml:space="preserve">
     <value>Telepített verzió</value>
   </data>
-  <data name="strDontConnectWhenAuthFails" xml:space="preserve">
+  <data name="DontConnectWhenAuthFails" xml:space="preserve">
     <value>Ne kapcsolódj sikertelen hitelesítéskor</value>
   </data>
-  <data name="strDoubleClickTabClosesIt" xml:space="preserve">
+  <data name="DoubleClickTabClosesIt" xml:space="preserve">
     <value>Duplaklikk a fülön bezárja azt</value>
   </data>
-  <data name="strExperimental" xml:space="preserve">
+  <data name="Experimental" xml:space="preserve">
     <value>Kísérleti</value>
   </data>
-  <data name="strFullscreen" xml:space="preserve">
+  <data name="Fullscreen" xml:space="preserve">
     <value>Teljes képernyő</value>
   </data>
-  <data name="strGeneral" xml:space="preserve">
+  <data name="General" xml:space="preserve">
     <value>Általános</value>
   </data>
-  <data name="strGroupboxFiles" xml:space="preserve">
+  <data name="Files" xml:space="preserve">
     <value>Fájlok</value>
   </data>
-  <data name="strHttpConnectFailed" xml:space="preserve">
+  <data name="HttpConnectFailed" xml:space="preserve">
     <value>A HTTP csatlakozás nem sikerült!</value>
   </data>
-  <data name="strImportExport" xml:space="preserve">
-    <value>Importálás/Exportálás</value>
-  </data>
-  <data name="strKeysCtrlAltDel" xml:space="preserve">
-    <value>CTRL-ALT-DEL</value>
-  </data>
-  <data name="strKeysCtrlEsc" xml:space="preserve">
-    <value>CONTROL-ESC</value>
-  </data>
-  <data name="strLabelAddress" xml:space="preserve">
+  <data name="Address" xml:space="preserve">
     <value>Cím:</value>
   </data>
-  <data name="strLabelDisplayName" xml:space="preserve">
+  <data name="DisplayName" xml:space="preserve">
     <value>Megjelenítendő név</value>
   </data>
-  <data name="strLabelDomain" xml:space="preserve">
-    <value>Tartomány:</value>
+  <data name="Domain" xml:space="preserve">
+    <value>Tartomány</value>
   </data>
-  <data name="strLabelFilename" xml:space="preserve">
-    <value>Fájlnév:</value>
-  </data>
-  <data name="strLabelHostname" xml:space="preserve">
+  <data name="Hostname" xml:space="preserve">
     <value>Hosztnév:</value>
   </data>
-  <data name="strLabelOptions" xml:space="preserve">
-    <value>Opciók:</value>
-  </data>
-  <data name="strLabelPassword" xml:space="preserve">
-    <value>Jelszó:</value>
-  </data>
-  <data name="strLabelPort" xml:space="preserve">
-    <value>Port:</value>
-  </data>
-  <data name="strLabelPortableEdition" xml:space="preserve">
+  <data name="PortableEdition" xml:space="preserve">
     <value>Hordozható kiadás</value>
   </data>
-  <data name="strLabelProtocol" xml:space="preserve">
-    <value>Protokoll:</value>
-  </data>
-  <data name="strLabelServerStatus" xml:space="preserve">
+  <data name="ServerStatus" xml:space="preserve">
     <value>Szerver állapot:</value>
   </data>
-  <data name="strLabelSQLDatabaseName" xml:space="preserve">
+  <data name="Database" xml:space="preserve">
     <value>Adatbázis:</value>
   </data>
-  <data name="strLabelSQLServerDatabaseName" xml:space="preserve">
-    <value>Adatbázis:</value>
-  </data>
-  <data name="strLabelUsername" xml:space="preserve">
-    <value>Felhasználónév:</value>
-  </data>
-  <data name="strLabelVerify" xml:space="preserve">
+  <data name="Verify" xml:space="preserve">
     <value>Ellenőrzés:</value>
   </data>
-  <data name="strLanguage" xml:space="preserve">
+  <data name="LanguageString" xml:space="preserve">
     <value>Nyelv</value>
   </data>
-  <data name="strLanguageDefault" xml:space="preserve">
+  <data name="LanguageDefault" xml:space="preserve">
     <value>(Automatikus észlelés)</value>
   </data>
-  <data name="strMenuAbout" xml:space="preserve">
-    <value>Névjegy</value>
-  </data>
-  <data name="strMenuCheckForUpdates" xml:space="preserve">
+  <data name="CheckForUpdates" xml:space="preserve">
     <value>Frissítés keresése</value>
   </data>
-  <data name="strMenuJumpTo" xml:space="preserve">
+  <data name="JumpTo" xml:space="preserve">
     <value>Ugrás</value>
   </data>
-  <data name="strMenuLaunchExternalTool" xml:space="preserve">
+  <data name="LaunchExternalTool" xml:space="preserve">
     <value>Külső eszköz indítása</value>
   </data>
-  <data name="strMenuNewConnectionFile" xml:space="preserve">
+  <data name="NewConnectionFile" xml:space="preserve">
     <value>Új kapcsolatfájl</value>
   </data>
-  <data name="strMenuNewExternalTool" xml:space="preserve">
+  <data name="NewExternalTool" xml:space="preserve">
     <value>Új külső eszköz</value>
   </data>
-  <data name="strMenuNotifications" xml:space="preserve">
+  <data name="Notifications" xml:space="preserve">
     <value>Értesítések</value>
   </data>
-  <data name="strMenuOpenConnectionFile" xml:space="preserve">
+  <data name="OpenConnectionFile" xml:space="preserve">
     <value>Kapcsolatfájl megnyitása...</value>
   </data>
-  <data name="strMenuOptions" xml:space="preserve">
+  <data name="Options" xml:space="preserve">
     <value>Opciók</value>
   </data>
-  <data name="strMenuReconnect" xml:space="preserve">
+  <data name="Reconnect" xml:space="preserve">
     <value>Újrakapcsolódás</value>
   </data>
-  <data name="strMenuRename" xml:space="preserve">
-    <value>Átnevezés</value>
-  </data>
-  <data name="strMenuRenameConnection" xml:space="preserve">
+  <data name="RenameConnection" xml:space="preserve">
     <value>Kapcsolat átnevezése</value>
   </data>
-  <data name="strMenuRenameFolder" xml:space="preserve">
+  <data name="RenameFolder" xml:space="preserve">
     <value>Könyvtár átnevezése</value>
   </data>
-  <data name="strMenuRenameTab" xml:space="preserve">
+  <data name="RenameTab" xml:space="preserve">
     <value>Fül átnevezése</value>
   </data>
-  <data name="strMenuReportBug" xml:space="preserve">
+  <data name="ReportBug" xml:space="preserve">
     <value>Hibabejelentés</value>
   </data>
-  <data name="strMenuResetLayout" xml:space="preserve">
+  <data name="ResetLayout" xml:space="preserve">
     <value>Elrendezés alaphelyzetbe állítása</value>
   </data>
-  <data name="strMenuSaveConnectionFile" xml:space="preserve">
+  <data name="SaveConnectionFile" xml:space="preserve">
     <value>Kapcsolatfájl mentése</value>
   </data>
-  <data name="strMenuSaveConnectionFileAs" xml:space="preserve">
+  <data name="SaveConnectionFileAs" xml:space="preserve">
     <value>Kapcsolatfájl mentése, mint...</value>
   </data>
-  <data name="strMenuScreenshot" xml:space="preserve">
-    <value>Képernyőmentés</value>
-  </data>
-  <data name="strMenuScreenshotManager" xml:space="preserve">
-    <value>Képernyőmentés kezelő</value>
-  </data>
-  <data name="strMenuSessions" xml:space="preserve">
-    <value>Munkamenetek</value>
-  </data>
-  <data name="strMenuSessionsAndScreenshots" xml:space="preserve">
-    <value>Munkamanetek és képernyőmentések</value>
-  </data>
-  <data name="strMenuWebsite" xml:space="preserve">
+  <data name="Website" xml:space="preserve">
     <value>Honlap</value>
   </data>
-  <data name="strNever" xml:space="preserve">
+  <data name="Never" xml:space="preserve">
     <value>Soha</value>
   </data>
-  <data name="strNewConnection" xml:space="preserve">
+  <data name="NewConnection" xml:space="preserve">
     <value>Új kapcsolat</value>
   </data>
-  <data name="strNewFolder" xml:space="preserve">
+  <data name="NewFolder" xml:space="preserve">
     <value>Új mappa</value>
   </data>
-  <data name="strNewPanel" xml:space="preserve">
+  <data name="NewPanel" xml:space="preserve">
     <value>Új panel</value>
   </data>
-  <data name="strNewRoot" xml:space="preserve">
-    <value>Új gyökérelem</value>
-  </data>
-  <data name="strNewTitle" xml:space="preserve">
+  <data name="NewTitle" xml:space="preserve">
     <value>Új cím</value>
   </data>
-  <data name="strNo" xml:space="preserve">
+  <data name="No" xml:space="preserve">
     <value>Nem</value>
   </data>
-  <data name="strUseSQLServer" xml:space="preserve">
+  <data name="UseSQLServer" xml:space="preserve">
     <value>SQL szerver használata a kapcsolatok kezelésére</value>
   </data>
 </root>

mRemoteV1/Resources/Language/Language.lt.resx

@@ -120,176 +120,68 @@
   <data name="PlaceSearchBarAboveConnectionTree" xml:space="preserve">
     <value>Place search bar above connection tree</value>
   </data>
-  <data name="strPropertyDescriptionColors" xml:space="preserve">
+  <data name="PropertyDescriptionColors" xml:space="preserve">
     <value>Select the color quality to be used.</value>
   </data>
-  <data name="strPropertyNameColors" xml:space="preserve">
+  <data name="Colors" xml:space="preserve">
     <value>Colors</value>
   </data>
-  <data name="strRDP16777216Colors" xml:space="preserve">
+  <data name="Rdp16777216Colors" xml:space="preserve">
     <value>16777216 Colors (24-bit)</value>
   </data>
-  <data name="strRDP256Colors" xml:space="preserve">
+  <data name="Rdp256Colors" xml:space="preserve">
     <value>256 Colors (8-bit)</value>
   </data>
-  <data name="strRDP32768Colors" xml:space="preserve">
+  <data name="Rdp32768Colors" xml:space="preserve">
     <value>32768 Colors (15-bit)</value>
   </data>
-  <data name="strRDP4294967296Colors" xml:space="preserve">
+  <data name="Rdp4294967296Colors" xml:space="preserve">
     <value>16777216 Colors (32-bit)</value>
   </data>
-  <data name="strRDP65536Colors" xml:space="preserve">
+  <data name="Rdp65536Colors" xml:space="preserve">
     <value>65536 Colors (16-bit)</value>
   </data>
-  <data name="strThemeDescriptionConfigPanelBackgroundColor" xml:space="preserve">
-    <value>The background color of the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelCategoryTextColor" xml:space="preserve">
-    <value>The color of the category text in the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelGridLineColor" xml:space="preserve">
-    <value>The color of the grid lines in the config panel</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelHelpBackgroundColor" xml:space="preserve">
-    <value>The background color of the help area of the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelHelpTextColor" xml:space="preserve">
-    <value>The color of the text in the help area of the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConfigPanelTextColor" xml:space="preserve">
-    <value>The color of the text in the config panel.</value>
-  </data>
-  <data name="strThemeDescriptionConnectionsPanelBackgroundColor" xml:space="preserve">
-    <value>The background color of the connections panel.</value>
-  </data>
-  <data name="strThemeDescriptionConnectionsPanelTextColor" xml:space="preserve">
-    <value>The color of the text in the connections panel.</value>
-  </data>
-  <data name="strThemeDescriptionConnectionsPanelTreeLineColor" xml:space="preserve">
-    <value>The color of the tree lines in the connections panel.</value>
-  </data>
-  <data name="strThemeDescriptionMenuBackgroundColor" xml:space="preserve">
-    <value>The background color of the menus.</value>
-  </data>
-  <data name="strThemeDescriptionMenuTextColor" xml:space="preserve">
-    <value>The color of the text in the menus.</value>
-  </data>
-  <data name="strThemeDescriptionSearchBoxBackgroundColor" xml:space="preserve">
-    <value>The background color of the search box.</value>
-  </data>
-  <data name="strThemeDescriptionSearchBoxTextColor" xml:space="preserve">
-    <value>The color of the text in the search box.</value>
-  </data>
-  <data name="strThemeDescriptionSearchBoxTextPromptColor" xml:space="preserve">
-    <value>The color of the prompt text in the search box.</value>
-  </data>
-  <data name="strThemeDescriptionToolbarBackgroundColor" xml:space="preserve">
-    <value>The background color of the toolbars.</value>
-  </data>
-  <data name="strThemeDescriptionToolbarTextColor" xml:space="preserve">
-    <value>The color of the text in the toolbars.</value>
-  </data>
-  <data name="strThemeDescriptionWindowBackgroundColor" xml:space="preserve">
-    <value>The background color of the main window.</value>
-  </data>
-  <data name="strThemeNameConfigPanelBackgroundColor" xml:space="preserve">
-    <value>Config Panel Background Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelCategoryTextColor" xml:space="preserve">
-    <value>Config Panel Category Text Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelGridLineColor" xml:space="preserve">
-    <value>Config Panel Grid Line Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelHelpBackgroundColor" xml:space="preserve">
-    <value>Config Panel Help Background Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelHelpTextColor" xml:space="preserve">
-    <value>Config Panel Help Text Color</value>
-  </data>
-  <data name="strThemeNameConfigPanelTextColor" xml:space="preserve">
-    <value>Config Panel Text Color</value>
-  </data>
-  <data name="strThemeNameConnectionsPanelBackgroundColor" xml:space="preserve">
-    <value>Connections Panel Background Color</value>
-  </data>
-  <data name="strThemeNameConnectionsPanelTextColor" xml:space="preserve">
-    <value>Connections Panel Text Color</value>
-  </data>
-  <data name="strThemeNameConnectionsPanelTreeLineColor" xml:space="preserve">
-    <value>Connections Panel Tree Line Color</value>
-  </data>
-  <data name="strThemeNameMenuBackgroundColor" xml:space="preserve">
-    <value>Menu Background Color</value>
-  </data>
-  <data name="strThemeNameMenuTextColor" xml:space="preserve">
-    <value>Menu Text Color</value>
-  </data>
-  <data name="strThemeNameSearchBoxBackgroundColor" xml:space="preserve">
-    <value>Search Box Background Color</value>
-  </data>
-  <data name="strThemeNameSearchBoxTextColor" xml:space="preserve">
-    <value>Search Box Text Color</value>
-  </data>
-  <data name="strThemeNameSearchBoxTextPromptColor" xml:space="preserve">
-    <value>Search Box Text Prompt Color</value>
-  </data>
-  <data name="strThemeNameToolbarBackgroundColor" xml:space="preserve">
-    <value>Toolbar Background Color</value>
-  </data>
-  <data name="strThemeNameToolbarTextColor" xml:space="preserve">
-    <value>Toolbar Text Color</value>
-  </data>
-  <data name="strThemeNameWindowBackgroundColor" xml:space="preserve">
-    <value>Window Background Color</value>
-  </data>
-  <data name="strActiveDirectory" xml:space="preserve">
+  <data name="ActiveDirectory" xml:space="preserve">
 		<value>Active Directory</value>
 	</data>
-  <data name="strErrorFipsPolicyIncompatible" xml:space="preserve">
+  <data name="ErrorFipsPolicyIncompatible" xml:space="preserve">
 		<value>The Windows security setting, "System cryptography: Use FIPS compliant algorithms for encryption, hashing, and signing", is enabled. 
 
 See the Microsoft Support article at http://support.microsoft.com/kb/811833 for more information.
 
 {0} is not fully FIPS compliant. Click OK to proceed at your own discretion, or Cancel to Exit.</value>
 	</data>
-  <data name="strHttpInternetExplorer" xml:space="preserve">
+  <data name="HttpInternetExplorer" xml:space="preserve">
 		<value>Internet Explorer</value>
 	</data>
-  <data name="strImportLocationCommandButtons" xml:space="preserve">
-		<value>Under the root{0}{1}|Under the selected folder{0}{2}</value>
-	</data>
-  <data name="strNoInformation" xml:space="preserve">
+  <data name="None" xml:space="preserve">
 		<value>None</value>
 	</data>
-  <data name="strNone" xml:space="preserve">
-		<value>None</value>
-	</data>
-  <data name="strPropertyDescriptionRedirectClipboard" xml:space="preserve">
+  <data name="PropertyDescriptionRedirectClipboard" xml:space="preserve">
 		<value>Select whether clipboard should be shared.</value>
 	</data>
-  <data name="strPropertyNameRedirectClipboard" xml:space="preserve">
+  <data name="Clipboard" xml:space="preserve">
 		<value>Clipboard</value>
 	</data>
-  <data name="strOptionsThemeChangeWarning" xml:space="preserve">
+  <data name="OptionsThemeChangeWarning" xml:space="preserve">
 		<value>Warning: Restart is required to commit any theme configuration change.</value>
 	</data>
-  <data name="strIPRange" xml:space="preserve">
+  <data name="MustBeBetween0And255" xml:space="preserve">
 		<value>Must Be Between 0 and 255</value>
 	</data>
-  <data name="strOutOfRange" xml:space="preserve">
+  <data name="OutOfRange" xml:space="preserve">
 		<value>Out Of Range</value>
 	</data>
-  <data name="strDelete" xml:space="preserve">
+  <data name="Delete" xml:space="preserve">
 		<value>Delete...</value>
 	</data>
-  <data name="strReconnectAllConnections" xml:space="preserve">
+  <data name="ReconnectAllConnections" xml:space="preserve">
 		<value>Reconnect All Connections</value>
 	</data>
-  <data name="strUltraVNCSingleClick" xml:space="preserve">
+  <data name="UltraVNCSingleClick" xml:space="preserve">
 		<value>UltraVNC SingleClick</value>
 	</data>
-  <data name="strMenuDisconnectOthers" xml:space="preserve">
+  <data name="DisconnectOthers" xml:space="preserve">
 		<value>Disconnect All But This</value>
 	</data>
   <data name="AutomaticReconnectError" xml:space="preserve">
@@ -313,30 +205,27 @@ See the Microsoft Support article at http://support.microsoft.com/kb/811833 for
   <data name="ExceptionForcesmRemoteNGToClose" xml:space="preserve">
 		<value>This exception will force mRemoteNG to close</value>
 	</data>
-  <data name="strMenuCopyHostname" xml:space="preserve">
+  <data name="CopyHostname" xml:space="preserve">
 		<value>Copy Hostname</value>
 	</data>
-  <data name="strPortScanSinglePort" xml:space="preserve">
-		<value>To scan a single port, select the "First Port" only.</value>
-	</data>
-  <data name="strTrackActiveConnectionInConnectionTree" xml:space="preserve">
+  <data name="TrackActiveConnectionInConnectionTree" xml:space="preserve">
 		<value>Track active connection in the connection tree</value>
 	</data>
-  <data name="strAlwaysShowConnectionTabs" xml:space="preserve">
+  <data name="AlwaysShowConnectionTabs" xml:space="preserve">
 		<value>Always show connection tabs</value>
 	</data>
-  <data name="strReleaseChannel" xml:space="preserve">
+  <data name="ReleaseChannel" xml:space="preserve">
 		<value>Release Channel</value>
 	</data>
-  <data name="strReleaseChannelExplanation" xml:space="preserve">
+  <data name="ReleaseChannelExplanation" xml:space="preserve">
 		<value>Stable channel includes final releases only.
 Beta channel includes Betas &amp; Release Candidates.
 Development Channel includes Alphas, Betas &amp; Release Candidates.</value>
 	</data>
-  <data name="strButtonApply" xml:space="preserve">
+  <data name="Apply" xml:space="preserve">
 		<value>Apply</value>
 	</data>
-  <data name="strCategoryProxy" xml:space="preserve">
+  <data name="Proxy" xml:space="preserve">
 		<value>Proxy</value>
 	</data>
 </root>

mRemoteV1/Resources/Language/Language.pt-BR.resx

@@ -117,365 +117,281 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="strAbout" xml:space="preserve">
+  <data name="About" xml:space="preserve">
     <value>Sobre</value>
   </data>
-  <data name="strActive" xml:space="preserve">
-    <value>Ativo</value>
-  </data>
-  <data name="strActivity" xml:space="preserve">
-    <value>Atividade</value>
-  </data>
-  <data name="strAddConnection" xml:space="preserve">
-    <value>Nova conexão</value>
-  </data>
-  <data name="strAddFolder" xml:space="preserve">
-    <value>Nova pasta</value>
-  </data>
-  <data name="strAddNodeFromXmlFailed" xml:space="preserve">
+  <data name="AddNodeFromXmlFailed" xml:space="preserve">
     <value>AddNodeFromXML falhou!</value>
   </data>
-  <data name="strAddNodesFromSqlFailed" xml:space="preserve">
-    <value>AddNodesFromSQL falhou!</value>
-  </data>
-  <data name="strAllowOnlySingleInstance" xml:space="preserve">
+  <data name="AllowOnlySingleInstance" xml:space="preserve">
     <value>Permitir apenas uma única instância do aplicativo (É necessário reiniciar o mRemoteNG)</value>
   </data>
-  <data name="strAlways" xml:space="preserve">
+  <data name="Always" xml:space="preserve">
     <value>Sempre</value>
   </data>
-  <data name="strAlwaysConnectEvenIfAuthFails" xml:space="preserve">
+  <data name="AlwaysConnectEvenIfAuthFails" xml:space="preserve">
     <value>Conectar sempre, mesmo se a autenticação falhar</value>
   </data>
-  <data name="strAlwaysShowPanelSelection" xml:space="preserve">
+  <data name="AlwaysShowPanelSelection" xml:space="preserve">
     <value>Sempre mostrar a caixa de diálogo de seleção de painel ao abrir conexões</value>
   </data>
-  <data name="strAlwaysShowSysTrayIcon" xml:space="preserve">
+  <data name="AlwaysShowSysTrayIcon" xml:space="preserve">
     <value>Sempre mostrar ícone da área de notificação</value>
   </data>
-  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+  <data name="AskUpdatesCommandAskLater" xml:space="preserve">
     <value>Me pergunte novamente mais tarde</value>
   </data>
-  <data name="strAskUpdatesCommandCustom" xml:space="preserve">
+  <data name="AskUpdatesCommandCustom" xml:space="preserve">
     <value>Personalizar as configurações agora</value>
   </data>
-  <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
+  <data name="AskUpdatesCommandRecommended" xml:space="preserve">
     <value>Usar as configurações recomendadas</value>
   </data>
-  <data name="strAskUpdatesContent" xml:space="preserve">
+  <data name="AskUpdatesContent" xml:space="preserve">
     <value>{0} pode verificar automaticamente as atualizações que podem fornecer novas funcionalidades e correções de bugs. É recomendável que você permita {0} verificar atualizações semanais.</value>
   </data>
-  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+  <data name="AskUpdatesMainInstruction" xml:space="preserve">
     <value>Configurações de atualização automática</value>
   </data>
-  <data name="strAspect" xml:space="preserve">
+  <data name="Aspect" xml:space="preserve">
     <value>Aspecto</value>
   </data>
-  <data name="strAutomaticallyGetSessionInfo" xml:space="preserve">
-    <value>Obter automaticamente informações de sessão</value>
-  </data>
-  <data name="strAutoSaveEvery" xml:space="preserve">
+  <data name="AutoSaveEvery" xml:space="preserve">
     <value>Salvar automaticamente a cada:</value>
   </data>
-  <data name="strAutoSaveMins" xml:space="preserve">
-    <value>Minutos (0 significa desativado)</value>
-  </data>
-  <data name="strAvailableVersion" xml:space="preserve">
+  <data name="AvailableVersion" xml:space="preserve">
     <value>Versão atual</value>
   </data>
-  <data name="strButtonBrowse" xml:space="preserve">
+  <data name="_Browse" xml:space="preserve">
     <value>&amp; Procurar...</value>
   </data>
-  <data name="strButtonCancel" xml:space="preserve">
+  <data name="_Cancel" xml:space="preserve">
     <value>&amp; Cancelar</value>
   </data>
-  <data name="strButtonChange" xml:space="preserve">
+  <data name="Change" xml:space="preserve">
     <value>Alterar</value>
   </data>
-  <data name="strButtonClose" xml:space="preserve">
+  <data name="_Close" xml:space="preserve">
     <value>&amp; Fechar</value>
   </data>
-  <data name="strButtonDefaultInheritance" xml:space="preserve">
+  <data name="ButtonDefaultInheritance" xml:space="preserve">
     <value>Herança padrão</value>
   </data>
-  <data name="strButtonDefaultProperties" xml:space="preserve">
+  <data name="ButtonDefaultProperties" xml:space="preserve">
     <value>Propriedades padrões</value>
   </data>
-  <data name="strButtonDisconnect" xml:space="preserve">
+  <data name="Disconnect" xml:space="preserve">
     <value>Desconectar</value>
   </data>
-  <data name="strButtonIcon" xml:space="preserve">
+  <data name="Icon" xml:space="preserve">
     <value>Ícone</value>
   </data>
-  <data name="strButtonImport" xml:space="preserve">
+  <data name="_Import" xml:space="preserve">
     <value>&amp; Importar</value>
   </data>
-  <data name="strButtonInheritance" xml:space="preserve">
+  <data name="Inheritance" xml:space="preserve">
     <value>Herança</value>
   </data>
-  <data name="strButtonLaunchPutty" xml:space="preserve">
+  <data name="ButtonLaunchPutty" xml:space="preserve">
     <value>Executar o PuTTY</value>
   </data>
-  <data name="strButtonNew" xml:space="preserve">
-    <value>&amp; Novo</value>
-  </data>
-  <data name="strButtonOK" xml:space="preserve">
+  <data name="_Ok" xml:space="preserve">
     <value>&amp; OK</value>
   </data>
-  <data name="strButtonProperties" xml:space="preserve">
+  <data name="Properties" xml:space="preserve">
     <value>Propriedades</value>
   </data>
-  <data name="strButtonScan" xml:space="preserve">
+  <data name="_Scan" xml:space="preserve">
     <value>&amp; Scanear</value>
   </data>
-  <data name="strButtonStop" xml:space="preserve">
+  <data name="_Stop" xml:space="preserve">
     <value>&amp; Parar</value>
   </data>
-  <data name="strButtonTestProxy" xml:space="preserve">
+  <data name="TestProxy" xml:space="preserve">
     <value>Testar Proxy</value>
   </data>
-  <data name="strCannotImportNormalSessionFile" xml:space="preserve">
-    <value>Você não pode importar um arquivo de conexão normal. Por favor, use Arquivo - Carregar Conexões para os arquivos de conexão normal!</value>
-  </data>
-  <data name="strCannotStartPortScan" xml:space="preserve">
+  <data name="CannotStartPortScan" xml:space="preserve">
     <value>Não é possível iniciar a varredura de portas, formato IP incorreto!</value>
   </data>
-  <data name="strCategoryAppearance" xml:space="preserve">
+  <data name="Appearance" xml:space="preserve">
     <value>Aparência</value>
   </data>
-  <data name="strCategoryConnection" xml:space="preserve">
+  <data name="Connection" xml:space="preserve">
     <value>Conexão</value>
   </data>
-  <data name="strCategoryCredentials" xml:space="preserve">
-    <value>Credenciais</value>
-  </data>
-  <data name="strCategoryDisplay" xml:space="preserve">
+  <data name="Display" xml:space="preserve">
     <value>Mostrar</value>
   </data>
-  <data name="strCategoryGateway" xml:space="preserve">
+  <data name="Gateway" xml:space="preserve">
     <value>Gateway</value>
   </data>
-  <data name="strCategoryGeneral" xml:space="preserve">
-    <value>Geral</value>
-  </data>
-  <data name="strCategoryMiscellaneous" xml:space="preserve">
+  <data name="Miscellaneous" xml:space="preserve">
     <value>Diversos</value>
   </data>
-  <data name="strCategoryProtocol" xml:space="preserve">
+  <data name="Protocol" xml:space="preserve">
     <value>Protocolo</value>
   </data>
-  <data name="strCategoryRedirect" xml:space="preserve">
+  <data name="Redirect" xml:space="preserve">
     <value>Redirecionar</value>
   </data>
-  <data name="strCcAlwaysShowScreen" xml:space="preserve">
-    <value>Sempre mostrar esta tela na inicialização</value>
-  </data>
-  <data name="strCcCheckAgain" xml:space="preserve">
-    <value>Atualizar</value>
-  </data>
-  <data name="strCcCheckFailed" xml:space="preserve">
+  <data name="CheckFailed" xml:space="preserve">
     <value>Falha na verificação!</value>
   </data>
-  <data name="strCcCheckSucceeded" xml:space="preserve">
+  <data name="CheckSucceeded" xml:space="preserve">
     <value>Verificação com sucesso!</value>
   </data>
-  <data name="strCcEOLFailed" xml:space="preserve">
-    <value>O recurso de sessões (RDP) requer que você tenha uma cópia registrada do eolwtscom.dll no seu sistema. 
-mRemoteNG vem com este componente mas não o registra automaticamente a menos que você instale o pacote. 
-Para registrá-lo manualmente faça isso: Abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\Program Files\mRemoteNG\eolwtscom.dll" (onde c:\Program Files\mRemoteNG\ é o caminho para a instalação de mRemoteNG). 
-Se você ainda não conseguir passar por esta verificação ou não conseguir usar o recurso de sessões (RDP) no mRemoteNG, por favor, consulte o fórum de mRemoteNG em http://forum.mremoteng.org/</value>
-  </data>
-  <data name="strCcEOLOK" xml:space="preserve">
-    <value>EOLWTSCOM foi encontrada e parece ser registrado corretamente.</value>
-  </data>
-  <data name="strCcICAFailed" xml:space="preserve">
+  <data name="CcICAFailed" xml:space="preserve">
     <value>ICA requer que o XenDesktop Online Plugin esteja instalado e a biblioteca wfica.ocs registrada. Você pode baixar o cliente aqui: http://www.citrix.com/download/ 
 Se você tiver o Plugin Online XenDesktop instalado e a verificação ainda falhar, tente registrar manualmente o wfica.ocx 
 Para fazer isso abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (onde c:\Program Files\Citrix\ICA Client\ é o caminho para a instalação do Plugin Online do XenDesktop). 
 Se você ainda não puder passar por esta verificação ou usar ICA em mRemoteNG, por favor, consulte o fórum de mRemoteNG no http://forum.mremoteng.org/"</value>
   </data>
-  <data name="strCcICAOK" xml:space="preserve">
+  <data name="CcICAOK" xml:space="preserve">
     <value>Todos os componentes de ICA, foram encontrados e parecem ser registrado corretamente. Citrix ICA cliente controle versão {0}</value>
   </data>
-  <data name="strCcNotInstalledProperly" xml:space="preserve">
+  <data name="CcNotInstalledProperly" xml:space="preserve">
     <value>não instalado corretamente</value>
   </data>
-  <data name="strCcPuttyFailed" xml:space="preserve">
+  <data name="CcPuttyFailed" xml:space="preserve">
     <value>O SSH, Telnet, Rlogin e protocolos RAW precisam PuTTY para trabalhar. PuTTY vem com cada pacote de mRemoteNG e está localizado no caminho de instalação. 
 Por favor, certifique-se de que você tem o Putty.exe em seu diretório mRemoteNG (padrão: c:\Program Files\mRemoteNG\) ou que você tenha especificado um caminho válido para seu executável PuTTY nas opções (ferramentas - opções - avançadas - caminho personalizado PuTTY)</value>
   </data>
-  <data name="strCcPuttyOK" xml:space="preserve">
+  <data name="CcPuttyOK" xml:space="preserve">
     <value>O executável PuTTY foi encontrado e está pronto para usar.</value>
   </data>
-  <data name="strCheckboxDomain" xml:space="preserve">
-    <value>Domínio</value>
-  </data>
-  <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
+  <data name="CheckboxDoNotShowThisMessageAgain" xml:space="preserve">
     <value>Não mostre esta mensagem novamente.</value>
   </data>
-  <data name="strCheckboxInheritance" xml:space="preserve">
-    <value>Herança</value>
-  </data>
-  <data name="strCheckboxPassword" xml:space="preserve">
-    <value>Senha</value>
-  </data>
-  <data name="strCheckboxProxyAuthentication" xml:space="preserve">
+  <data name="CheckboxProxyAuthentication" xml:space="preserve">
     <value>Este servidor proxy requer autenticação</value>
   </data>
-  <data name="strCheckboxPuttyPath" xml:space="preserve">
+  <data name="CheckboxPuttyPath" xml:space="preserve">
     <value>Use o caminho personalizado para o PuTTY:</value>
   </data>
-  <data name="strCheckboxReconnectWhenReady" xml:space="preserve">
+  <data name="CheckboxReconnectWhenReady" xml:space="preserve">
     <value>Reconectar quando estiver pronto</value>
   </data>
-  <data name="strCheckboxUpdateUseProxy" xml:space="preserve">
+  <data name="CheckboxUpdateUseProxy" xml:space="preserve">
     <value>Usar um servidor proxy para se conectar</value>
   </data>
-  <data name="strCheckboxUsername" xml:space="preserve">
+  <data name="Username" xml:space="preserve">
     <value>Nome de usuário</value>
   </data>
-  <data name="strCheckboxWaitForExit" xml:space="preserve">
+  <data name="WaitForExit" xml:space="preserve">
     <value>Esperar para sair</value>
   </data>
-  <data name="strCheckForUpdate" xml:space="preserve">
+  <data name="CheckAgain" xml:space="preserve">
     <value>Verificar novamente</value>
   </data>
-  <data name="strCheckForUpdatesOnStartup" xml:space="preserve">
+  <data name="CheckForUpdatesOnStartup" xml:space="preserve">
     <value>Verificar se há atualizações e anúncios na inicialização</value>
   </data>
-  <data name="strCheckNow" xml:space="preserve">
+  <data name="CheckNow" xml:space="preserve">
     <value>Verificar agora</value>
   </data>
-  <data name="strClosedPorts" xml:space="preserve">
+  <data name="ClosedPorts" xml:space="preserve">
     <value>Portas fechadas</value>
   </data>
-  <data name="strCollapseAllFolders" xml:space="preserve">
+  <data name="CollapseAllFolders" xml:space="preserve">
     <value>Recolher todas as pastas</value>
   </data>
-  <data name="strColumnArguments" xml:space="preserve">
+  <data name="Arguments" xml:space="preserve">
     <value>Argumentos</value>
   </data>
-  <data name="strColumnDisplayName" xml:space="preserve">
-    <value>Nome de exibição</value>
-  </data>
-  <data name="strColumnFilename" xml:space="preserve">
+  <data name="Filename" xml:space="preserve">
     <value>Nome do arquivo</value>
   </data>
-  <data name="strColumnHostnameIP" xml:space="preserve">
-    <value>HostName/IP</value>
-  </data>
-  <data name="strColumnMessage" xml:space="preserve">
+  <data name="Message" xml:space="preserve">
     <value>Mensagem</value>
   </data>
-  <data name="strColumnUsername" xml:space="preserve">
-    <value>Nome de usuário</value>
-  </data>
-  <data name="strColumnWaitForExit" xml:space="preserve">
-    <value>Esperar para sair</value>
-  </data>
-  <data name="strComponentsCheck" xml:space="preserve">
+  <data name="ComponentsCheck" xml:space="preserve">
     <value>Validação de componentes</value>
   </data>
-  <data name="strConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
+  <data name="ConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
     <value>btnIcon_Click falhou!</value>
   </data>
-  <data name="strConfigPropertyGridHideItemsFailed" xml:space="preserve">
+  <data name="ConfigPropertyGridHideItemsFailed" xml:space="preserve">
     <value>ShowHideGridItems falhou!</value>
   </data>
-  <data name="strConfigPropertyGridMenuClickFailed" xml:space="preserve">
+  <data name="ConfigPropertyGridMenuClickFailed" xml:space="preserve">
     <value>IconMenu_Click falhou!</value>
   </data>
-  <data name="strConfigPropertyGridObjectFailed" xml:space="preserve">
+  <data name="ConfigPropertyGridObjectFailed" xml:space="preserve">
     <value>Propriedade do Objeto de grade falhou!</value>
   </data>
-  <data name="strConfigPropertyGridSetHostStatusFailed" xml:space="preserve">
+  <data name="ConfigPropertyGridSetHostStatusFailed" xml:space="preserve">
     <value>SetHostStatus falhou!</value>
   </data>
-  <data name="strConfigPropertyGridValueFailed" xml:space="preserve">
+  <data name="ConfigPropertyGridValueFailed" xml:space="preserve">
     <value>pGrid_PopertyValueChanged falhou!</value>
   </data>
-  <data name="strConfigUiLoadFailed" xml:space="preserve">
+  <data name="ConfigUiLoadFailed" xml:space="preserve">
     <value>Config UI carregamento falhou!</value>
   </data>
-  <data name="strConfirmCloseConnectionMainInstruction" xml:space="preserve">
-    <value>Você quer fechar a conexão:
-"{0}"?</value>
-  </data>
-  <data name="strConfirmCloseConnectionPanelMainInstruction" xml:space="preserve">
+  <data name="ConfirmCloseConnectionPanelMainInstruction" xml:space="preserve">
     <value>Tem certeza que deseja fechar o painel, "{0}"? Todas as ligações ativas serão fechadas.</value>
   </data>
-  <data name="strConfirmDeleteExternalTool" xml:space="preserve">
+  <data name="ConfirmDeleteExternalTool" xml:space="preserve">
     <value>Tem certeza que deseja excluir a ferramenta externa, "{0}"?</value>
   </data>
-  <data name="strConfirmDeleteExternalToolMultiple" xml:space="preserve">
+  <data name="ConfirmDeleteExternalToolMultiple" xml:space="preserve">
     <value>Tem certeza que deseja excluir as ferramentas externas {0} selecionadas?</value>
   </data>
-  <data name="strConfirmDeleteNodeConnection" xml:space="preserve">
+  <data name="ConfirmDeleteNodeConnection" xml:space="preserve">
     <value>Tem certeza que deseja excluir a ligação, "{0}"?</value>
   </data>
-  <data name="strConfirmDeleteNodeFolder" xml:space="preserve">
+  <data name="ConfirmDeleteNodeFolder" xml:space="preserve">
     <value>Tem certeza que deseja excluir a pasta vazia, "{0}"?</value>
   </data>
-  <data name="strConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
+  <data name="ConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
     <value>Tem certeza que deseja excluir a pasta, "{0}"? Pastas ou ligações que ele contém também serão excluídas.</value>
   </data>
-  <data name="strConfirmExitMainInstruction" xml:space="preserve">
+  <data name="ConfirmExitMainInstruction" xml:space="preserve">
     <value>Você quer fechar todas as conexões abertas?</value>
   </data>
-  <data name="strConfirmResetLayout" xml:space="preserve">
+  <data name="ConfirmResetLayout" xml:space="preserve">
     <value>Tem certeza de que deseja redefinir os painéis para o layout padrão?</value>
   </data>
-  <data name="strConnect" xml:space="preserve">
+  <data name="Connect" xml:space="preserve">
     <value>Conectar-se</value>
   </data>
-  <data name="strConnectInFullscreen" xml:space="preserve">
+  <data name="ConnectInFullscreen" xml:space="preserve">
     <value>Se conectar em modo fullscreen</value>
   </data>
-  <data name="strConnecting" xml:space="preserve">
+  <data name="Connecting" xml:space="preserve">
     <value>Conectando...</value>
   </data>
-  <data name="strConnectionEventConnected" xml:space="preserve">
+  <data name="ConnectionEventConnected" xml:space="preserve">
     <value>Protocolo evento conectado</value>
   </data>
-  <data name="strConnectionEventConnectedDetail" xml:space="preserve">
+  <data name="ConnectionEventConnectedDetail" xml:space="preserve">
     <value>Conexão para "{0}" via "{1}" estabelecido pelo usuário "{2}" (Descrição: "{3}"; Campo usuário: "{4}")</value>
   </data>
   <data name="ConnectionFailed" xml:space="preserve">
     <value>Conexão falhou!</value>
   </data>
-  <data name="strConnectionEventErrorOccured" xml:space="preserve">
+  <data name="ConnectionEventErrorOccured" xml:space="preserve">
     <value>Erro no evento de protocolo</value>
   </data>
-  <data name="strConnectionOpenFailed" xml:space="preserve">
+  <data name="ConnectionOpenFailed" xml:space="preserve">
     <value>Abrir conexão falhou!</value>
   </data>
-  <data name="strConnectionOpenFailedNoHostname" xml:space="preserve">
+  <data name="ConnectionOpenFailedNoHostname" xml:space="preserve">
     <value>Não é possível abrir a conexão: nenhum nome de host especificado!</value>
   </data>
-  <data name="strConnectionRdpErrorDetail" xml:space="preserve">
-    <value>Erro RDP!
-Código de erro: {0}
-Descrição do erro: {1}</value>
-  </data>
-  <data name="strConnections" xml:space="preserve">
+  <data name="Connections" xml:space="preserve">
     <value>Conexões</value>
   </data>
-  <data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
+  <data name="ConnectionSetDefaultPortFailed" xml:space="preserve">
     <value>Impossível definir porta padrão!</value>
   </data>
-  <data name="strConnectionsFileBackupFailed" xml:space="preserve">
+  <data name="ConnectionsFileBackupFailed" xml:space="preserve">
     <value>Não foi possível criar o backup do arquivo de conexões!</value>
   </data>
-  <data name="strConnectionsFileCouldNotBeImported" xml:space="preserve">
-    <value>Falha na importação do arquivo de conexões!</value>
-  </data>
-  <data name="strConnectionsFileCouldNotBeLoaded" xml:space="preserve">
+  <data name="ConnectionsFileCouldNotBeLoaded" xml:space="preserve">
     <value>Arquivo de conexões "{0}" não pôde ser carregado!</value>
   </data>
-  <data name="strConnectionsFileCouldNotBeLoadedNew" xml:space="preserve">
+  <data name="ConnectionsFileCouldNotBeLoadedNew" xml:space="preserve">
     <value>Arquivo de conexões "{0}" não pôde ser carregado! Começando com o novo arquivo de conexões.</value>
   </data>
-  <data name="strConnectionsFileCouldNotBeSaved" xml:space="preserve">
-    <value>Não consegui salvar o arquivo de conexões!</value>
-  </data>
 </root>

mRemoteV1/Security/PasswordCreation/PasswordIncludesLowerCaseConstraint.cs

@@ -16,7 +16,7 @@ namespace mRemoteNG.Security.PasswordCreation
                 throw new ArgumentException($"{nameof(minimumCount)} must be a positive value");
 
             _minimumCount = minimumCount;
-            ConstraintHint = string.Format(Language.strPasswordContainsLowerCaseConstraintHint, _minimumCount);
+            ConstraintHint = string.Format(Language.PasswordContainsLowerCaseConstraintHint, _minimumCount);
         }
 
         public bool Validate(SecureString password)

mRemoteV1/Security/PasswordCreation/PasswordIncludesNumbersConstraint.cs

@@ -16,7 +16,7 @@ namespace mRemoteNG.Security.PasswordCreation
                 throw new ArgumentException($"{nameof(minimumCount)} must be a positive value");
 
             _minimumCount = minimumCount;
-            ConstraintHint = string.Format(Language.strPasswordContainsNumbersConstraint, _minimumCount);
+            ConstraintHint = string.Format(Language.PasswordContainsNumbersConstraint, _minimumCount);
         }
 
         public bool Validate(SecureString password)

mRemoteV1/Security/PasswordCreation/PasswordIncludesSpecialCharactersConstraint.cs

@@ -29,7 +29,7 @@ namespace mRemoteNG.Security.PasswordCreation
                 throw new ArgumentNullException(nameof(specialCharacters));
 
             SpecialCharacters = specialCharacters;
-            ConstraintHint = string.Format(Language.strPasswordConstainsSpecialCharactersConstraintHint, _minimumCount,
+            ConstraintHint = string.Format(Language.PasswordConstainsSpecialCharactersConstraintHint, _minimumCount,
                                            string.Concat(SpecialCharacters));
         }
 

mRemoteV1/Security/PasswordCreation/PasswordIncludesUpperCaseConstraint.cs

@@ -16,7 +16,7 @@ namespace mRemoteNG.Security.PasswordCreation
                 throw new ArgumentException($"{nameof(minimumCount)} must be a positive value");
 
             _minimumCount = minimumCount;
-            ConstraintHint = string.Format(Language.strPasswordContainsUpperCaseConstraintHint, _minimumCount);
+            ConstraintHint = string.Format(Language.PasswordContainsUpperCaseConstraintHint, _minimumCount);
         }
 
         public bool Validate(SecureString password)

mRemoteV1/Security/PasswordCreation/PasswordLengthConstraint.cs

@@ -23,7 +23,7 @@ namespace mRemoteNG.Security.PasswordCreation
 
             _minLength = minimumLength;
             _maxLength = maxLength;
-            ConstraintHint = string.Format(Language.strPasswordLengthConstraintHint, _minLength, _maxLength);
+            ConstraintHint = string.Format(Language.PasswordLengthConstraintHint, _minLength, _maxLength);
         }
 
         public bool Validate(SecureString password)

mRemoteV1/Security/SymmetricEncryption/AeadCryptographyProvider.cs

@@ -252,7 +252,7 @@ namespace mRemoteNG.Security.SymmetricEncryption
                 }
                 catch (InvalidCipherTextException e)
                 {
-                    throw new EncryptionException(Language.strErrorDecryptionFailed, e);
+                    throw new EncryptionException(Language.ErrorDecryptionFailed, e);
                 }
 
                 return plainText;

mRemoteV1/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs

@@ -60,7 +60,7 @@ namespace mRemoteNG.Security.SymmetricEncryption
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                                                    string.Format(Language.strErrorEncryptionFailed, ex.Message));
+                                                    string.Format(Language.ErrorEncryptionFailed, ex.Message));
             }
 
             return strToEncrypt;
@@ -103,8 +103,8 @@ namespace mRemoteNG.Security.SymmetricEncryption
             }
             catch (Exception ex)
             {
-                //Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, string.Format(Language.strErrorDecryptionFailed, ex.Message));
-                throw new EncryptionException(Language.strErrorDecryptionFailed, ex);
+                //Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, string.Format(Language.ErrorDecryptionFailed, ex.Message));
+                throw new EncryptionException(Language.ErrorDecryptionFailed, ex);
             }
         }
     }

mRemoteV1/Tools/Cmdline/StartupArgumentsInterpreter.cs

@@ -38,7 +38,7 @@ namespace mRemoteNG.Tools.Cmdline
             }
             catch (Exception ex)
             {
-                _messageCollector.AddExceptionMessage(Language.strCommandLineArgsCouldNotBeParsed, ex, logOnly: false);
+                _messageCollector.AddExceptionMessage(Language.CommandLineArgsCouldNotBeParsed, ex, logOnly: false);
             }
         }
 

mRemoteV1/Tools/ExternalTool.cs

@@ -197,7 +197,7 @@ namespace mRemoteNG.Tools
             newConnectionInfo.Protocol = ProtocolType.IntApp;
             newConnectionInfo.ExtApp = DisplayName;
             newConnectionInfo.Name = DisplayName;
-            newConnectionInfo.Panel = Language.strMenuExternalTools;
+            newConnectionInfo.Panel = Language._Tools;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;

mRemoteV1/Tools/MiscTools.cs

@@ -199,12 +199,12 @@ namespace mRemoteNG.Tools
             public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
             {
                 if (!(value is string)) return base.ConvertFrom(context, culture, value);
-                if (string.Equals(value.ToString(), Language.strYes, StringComparison.CurrentCultureIgnoreCase))
+                if (string.Equals(value.ToString(), Language.Yes, StringComparison.CurrentCultureIgnoreCase))
                 {
                     return true;
                 }
 
-                if (string.Equals(value.ToString(), Language.strNo, StringComparison.CurrentCultureIgnoreCase))
+                if (string.Equals(value.ToString(), Language.No, StringComparison.CurrentCultureIgnoreCase))
                 {
                     return false;
                 }
@@ -219,7 +219,7 @@ namespace mRemoteNG.Tools
             {
                 if (destinationType == typeof(string))
                 {
-                    return Convert.ToBoolean(value) ? Language.strYes : Language.strNo;
+                    return Convert.ToBoolean(value) ? Language.Yes : Language.No;
                 }
 
                 return base.ConvertTo(context, culture, value, destinationType);

mRemoteV1/Tools/NotificationAreaIcon.cs

@@ -25,13 +25,13 @@ namespace mRemoteNG.Tools
             {
                 _cMenCons = new ToolStripMenuItem
                 {
-                    Text = Language.strConnections,
+                    Text = Language.Connections,
                     Image = Resources.Root
                 };
 
                 var cMenSep1 = new ToolStripSeparator();
 
-                var cMenExit = new ToolStripMenuItem {Text = Language.strMenuExit};
+                var cMenExit = new ToolStripMenuItem {Text = Language.Exit};
                 cMenExit.Click += cMenExit_Click;
 
                 _cMen = new ContextMenuStrip

mRemoteV1/Tools/ReconnectGroup.Designer.cs

@@ -1,4 +1,4 @@
-namespace mRemoteNG.Tools
+namespace mRemoteNG.Tools
 {
     public partial class ReconnectGroup : System.Windows.Forms.UserControl
 	{
@@ -67,7 +67,7 @@ namespace mRemoteNG.Tools
             this.btnClose.Name = "btnClose";
             this.btnClose.Size = new System.Drawing.Size(159, 23);
             this.btnClose.TabIndex = 7;
-            this.btnClose.Text = global::mRemoteNG.Language.strButtonClose;
+            this.btnClose.Text = global::mRemoteNG.Language._Close;
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
@@ -89,7 +89,7 @@ namespace mRemoteNG.Tools
             this.chkReconnectWhenReady.Name = "chkReconnectWhenReady";
             this.chkReconnectWhenReady.Size = new System.Drawing.Size(140, 17);
             this.chkReconnectWhenReady.TabIndex = 6;
-            this.chkReconnectWhenReady.Text = global::mRemoteNG.Language.strCheckboxReconnectWhenReady;
+            this.chkReconnectWhenReady.Text = global::mRemoteNG.Language.CheckboxReconnectWhenReady;
             this.chkReconnectWhenReady.UseVisualStyleBackColor = true;
             this.chkReconnectWhenReady.CheckedChanged += new System.EventHandler(this.chkReconnectWhenReady_CheckedChanged);
             // 

mRemoteV1/Tools/ReconnectGroup.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Drawing;
 
 namespace mRemoteNG.Tools
@@ -127,10 +127,10 @@ namespace mRemoteNG.Tools
 
         private void ApplyLanguage()
         {
-            grpAutomaticReconnect.Text = Language.strGroupboxAutomaticReconnect;
-            btnClose.Text = Language.strButtonClose;
-            lblServerStatus.Text = Language.strLabelServerStatus;
-            chkReconnectWhenReady.Text = Language.strCheckboxReconnectWhenReady;
+            grpAutomaticReconnect.Text = Language.GroupboxAutomaticReconnect;
+            btnClose.Text = Language._Close;
+            lblServerStatus.Text = Language.ServerStatus;
+            chkReconnectWhenReady.Text = Language.CheckboxReconnectWhenReady;
         }
     }
 }

mRemoteV1/Tools/ScanHost.cs

@@ -152,7 +152,7 @@ namespace mRemoteNG.Tools
 
         private static string BoolToYesNo(bool value)
         {
-            return value ? Language.strYes : Language.strNo;
+            return value ? Language.Yes : Language.No;
         }
 
         public void SetAllProtocols(bool value)

mRemoteV1/Tools/SecureTransfer.cs

@@ -88,7 +88,7 @@ namespace mRemoteNG.Tools
                 if (!ScpClt.IsConnected)
                 {
                     Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                        Language.strSSHTransferFailed + Environment.NewLine +
+                        Language.SshTransferFailed + Environment.NewLine +
                         "SCP Not Connected!");
                     return;
                 }
@@ -101,7 +101,7 @@ namespace mRemoteNG.Tools
                 if (!SftpClt.IsConnected)
                 {
                     Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg,
-                        Language.strSSHTransferFailed + Environment.NewLine +
+                        Language.SshTransferFailed + Environment.NewLine +
                         "SFTP Not Connected!");
                     return;
                 }

mRemoteV1/Tools/Tools.LocalizedAttributes.cs

@@ -114,7 +114,7 @@ namespace mRemoteNG.Tools
                     if (!Localized)
                     {
                         Localized = true;
-                        DisplayNameValue = string.Format(Language.strFormatInherit,
+                        DisplayNameValue = string.Format(Language.FormatInherit,
                                                          Language.ResourceManager.GetString(DisplayNameValue));
                     }
 
@@ -140,7 +140,7 @@ namespace mRemoteNG.Tools
                     if (!Localized)
                     {
                         Localized = true;
-                        DescriptionValue = string.Format(Language.strFormatInheritDescription,
+                        DescriptionValue = string.Format(Language.FormatInheritDescription,
                                                          Language.ResourceManager.GetString(DescriptionValue));
                     }
 

mRemoteV1/Tree/ConnectionTreeDragAndDropHandler.cs

@@ -88,7 +88,7 @@ namespace mRemoteNG.Tree
             var dragDropEffect = DragDropEffects.None;
             if (!NodeIsDraggable(dropSource))
             {
-                _infoMessage = Language.strNodeNotDraggable;
+                _infoMessage = Language.NodeNotDraggable;
                 _enableFeedback = false;
             }
             else
@@ -127,7 +127,7 @@ namespace mRemoteNG.Tree
         {
             var dragDropEffect = DragDropEffects.None;
             if (AncestorDraggingOntoChild(dropSource, dropTarget))
-                _infoMessage = Language.strNodeCannotDragParentOnChild;
+                _infoMessage = Language.NodeCannotDragParentOnChild;
             else if (dropTarget is PuttySessionInfo || dropTarget is RootNodeInfo)
                 _enableFeedback = false;
             else
@@ -143,11 +143,11 @@ namespace mRemoteNG.Tree
         {
             var validDrag = false;
             if (NodeDraggingOntoSelf(dropSource, dropTarget))
-                _infoMessage = Language.strNodeCannotDragOnSelf;
+                _infoMessage = Language.NodeCannotDragOnSelf;
             else if (AncestorDraggingOntoChild(dropSource, dropTarget))
-                _infoMessage = Language.strNodeCannotDragParentOnChild;
+                _infoMessage = Language.NodeCannotDragParentOnChild;
             else if (DraggingOntoCurrentParent(dropSource, dropTarget))
-                _infoMessage = Language.strNodeAlreadyInFolder;
+                _infoMessage = Language.NodeAlreadyInFolder;
             else
                 validDrag = true;
             return validDrag;

mRemoteV1/Tree/Root/RootNodeInfo.cs

@@ -16,7 +16,7 @@ namespace mRemoteNG.Tree.Root
         public RootNodeInfo(RootNodeType rootType, string uniqueId)
             : base(uniqueId)
         {
-            _name = Language.strConnections;
+            _name = Language.Connections;
             Type = rootType;
         }
 
@@ -27,21 +27,21 @@ namespace mRemoteNG.Tree.Root
 
         #region Public Properties
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous)),
          Browsable(true),
-         LocalizedAttributes.LocalizedDefaultValue(nameof(Language.strConnections)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameName)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionName))]
+         LocalizedAttributes.LocalizedDefaultValue(nameof(Language.Connections)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Name)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionName))]
         public override string Name
         {
             get => _name;
             set => _name = value;
         }
         
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous)),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Miscellaneous)),
          Browsable(true),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePasswordProtect)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPasswordProtect)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.PasswordProtect)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPasswordProtect)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public new bool Password { get; set; }
 

mRemoteV1/Tree/Root/RootPuttySessionsNodeInfo.cs

@@ -10,10 +10,10 @@ namespace mRemoteNG.Tree.Root
 
         public RootPuttySessionsNodeInfo() : base(RootNodeType.PuttySessions)
         {
-            _name = Language.strPuttySavedSessionsRootName;
+            _name = Language.PuttySavedSessionsRootName;
             _panel =
                 string.IsNullOrEmpty(Settings.Default.PuttySavedSessionsPanel)
-                    ? Language.strGeneral
+                    ? Language.General
                     : Settings.Default.PuttySavedSessionsPanel;
         }
 
@@ -30,9 +30,9 @@ namespace mRemoteNG.Tree.Root
             }
         }
 
-        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
-         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePanel)),
-         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPanel))]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.Display)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.Panel)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.PropertyDescriptionPanel))]
         public override string Panel
         {
             get { return _panel; }

mRemoteV1/Tree/SelectedConnectionDeletionConfirmer.cs

@@ -30,19 +30,19 @@ namespace mRemoteNG.Tree
 
         private bool UserConfirmsEmptyFolderDeletion(AbstractConnectionRecord deletionTarget)
         {
-            var messagePrompt = string.Format(Language.strConfirmDeleteNodeFolder, deletionTarget.Name);
+            var messagePrompt = string.Format(Language.ConfirmDeleteNodeFolder, deletionTarget.Name);
             return PromptUser(messagePrompt);
         }
 
         private bool UserConfirmsNonEmptyFolderDeletion(AbstractConnectionRecord deletionTarget)
         {
-            var messagePrompt = string.Format(Language.strConfirmDeleteNodeFolderNotEmpty, deletionTarget.Name);
+            var messagePrompt = string.Format(Language.ConfirmDeleteNodeFolderNotEmpty, deletionTarget.Name);
             return PromptUser(messagePrompt);
         }
 
         private bool UserConfirmsConnectionDeletion(AbstractConnectionRecord deletionTarget)
         {
-            var messagePrompt = string.Format(Language.strConfirmDeleteNodeConnection, deletionTarget.Name);
+            var messagePrompt = string.Format(Language.ConfirmDeleteNodeConnection, deletionTarget.Name);
             return PromptUser(messagePrompt);
         }
 

mRemoteV1/UI/Controls/Base/NGSearchBox.cs

@@ -41,7 +41,7 @@ namespace mRemoteNG.UI.Controls.Base
                 return;
 
             _settingDefaultText = true;
-            Text = Language.strSearchPrompt;
+            Text = Language.SearchPrompt;
             _pbClear.Visible = false;
         }
 

mRemoteV1/UI/Controls/ConnectionContextMenu.cs

@@ -400,39 +400,38 @@ namespace mRemoteNG.UI.Controls
 
         private void ApplyLanguage()
         {
-            _cMenTreeConnect.Text = Language.strConnect;
-            _cMenTreeConnectWithOptions.Text = Language.strConnectWithOptions;
-            _cMenTreeConnectWithOptionsConnectToConsoleSession.Text = Language.strConnectToConsoleSession;
-            _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Text =
-                Language.strDontConnectToConsoleSessionMenuItem;
-            _cMenTreeConnectWithOptionsConnectInFullscreen.Text = Language.strConnectInFullscreen;
-            _cMenTreeConnectWithOptionsNoCredentials.Text = Language.strConnectNoCredentials;
-            _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = Language.strChoosePanelBeforeConnecting;
+            _cMenTreeConnect.Text = Language.Connect;
+            _cMenTreeConnectWithOptions.Text = Language.ConnectWithOptions;
+            _cMenTreeConnectWithOptionsConnectToConsoleSession.Text = Language.ConnectToConsoleSession;
+            _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Text = Language.DontConnectToConsoleSession;
+            _cMenTreeConnectWithOptionsConnectInFullscreen.Text = Language.ConnectInFullscreen;
+            _cMenTreeConnectWithOptionsNoCredentials.Text = Language.ConnectNoCredentials;
+            _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = Language.ChoosePanelBeforeConnecting;
             _cMenTreeConnectWithOptionsViewOnly.Text = Language.ConnectInViewOnlyMode;
-            _cMenTreeDisconnect.Text = Language.strMenuDisconnect;
+            _cMenTreeDisconnect.Text = Language.Disconnect;
 
-            _cMenTreeToolsExternalApps.Text = Language.strMenuExternalTools;
-            _cMenTreeToolsTransferFile.Text = Language.strMenuTransferFile;
+            _cMenTreeToolsExternalApps.Text = Language._Tools;
+            _cMenTreeToolsTransferFile.Text = Language.TransferFile;
 
-            _cMenTreeDuplicate.Text = Language.strDuplicate;
-            _cMenTreeRename.Text = Language.strRename;
-            _cMenTreeDelete.Text = Language.strMenuDelete;
-            _cMenTreeCopyHostname.Text = Language.strMenuCopyHostname;
+            _cMenTreeDuplicate.Text = Language.Duplicate;
+            _cMenTreeRename.Text = Language.Rename;
+            _cMenTreeDelete.Text = Language.Delete;
+            _cMenTreeCopyHostname.Text = Language.CopyHostname;
 
-            _cMenTreeImport.Text = Language.strImportMenuItem;
-            _cMenTreeImportFile.Text = Language.strImportFromFileMenuItem;
-            _cMenTreeImportActiveDirectory.Text = Language.strImportAD;
-            _cMenTreeImportPortScan.Text = Language.strImportPortScan;
-            _cMenTreeExportFile.Text = Language.strExportToFileMenuItem;
+            _cMenTreeImport.Text = Language._Import;
+            _cMenTreeImportFile.Text = Language.ImportFromFile;
+            _cMenTreeImportActiveDirectory.Text = Language.ImportAD;
+            _cMenTreeImportPortScan.Text = Language.ImportPortScan;
+            _cMenTreeExportFile.Text = Language._ExportToFile;
 
-            _cMenTreeAddConnection.Text = Language.strAddConnection;
-            _cMenTreeAddFolder.Text = Language.strAddFolder;
+            _cMenTreeAddConnection.Text = Language.NewConnection;
+            _cMenTreeAddFolder.Text = Language.NewFolder;
 
-            _cMenTreeToolsSort.Text = Language.strSort;
-            _cMenTreeToolsSortAscending.Text = Language.strSortAsc;
-            _cMenTreeToolsSortDescending.Text = Language.strSortDesc;
-            _cMenTreeMoveUp.Text = Language.strMoveUp;
-            _cMenTreeMoveDown.Text = Language.strMoveDown;
+            _cMenTreeToolsSort.Text = Language.Sort;
+            _cMenTreeToolsSortAscending.Text = Language.SortAsc;
+            _cMenTreeToolsSortDescending.Text = Language.SortDesc;
+            _cMenTreeMoveUp.Text = Language.MoveUp;
+            _cMenTreeMoveDown.Text = Language.MoveDown;
         }
 
         internal void ShowHideMenuItems()

mRemoteV1/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs

@@ -183,7 +183,7 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid
             {
                 Runtime.MessageCollector.AddMessage(
                     MessageClass.ErrorMsg,
-                    Language.strConfigPropertyGridHideItemsFailed +
+                    Language.ConfigPropertyGridHideItemsFailed +
                     Environment.NewLine + ex.Message, true);
             }
         }
@@ -282,11 +282,11 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid
             if (IsShowingInheritance)
                 return;
 
-            if (e.ChangedItem.Label == Language.strPropertyNameProtocol)
+            if (e.ChangedItem.Label == Language.Protocol)
             {
                 SelectedConnectionInfo.SetDefaultPort();
             }
-            else if (e.ChangedItem.Label == Language.strPropertyNameName)
+            else if (e.ChangedItem.Label == Language.Name)
             {
                 if (Settings.Default.SetHostnameLikeDisplayName)
                 {
@@ -310,7 +310,7 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid
             if (rootInfo.Password)
             {
                 var passwordName = Settings.Default.UseSQLServer
-                    ? Language.strSQLServer.TrimEnd(':')
+                    ? Language.SQLServer.TrimEnd(':')
                     : Path.GetFileName(Runtime.ConnectionsService.GetStartupConnectionFileName());
 
                 var password = MiscTools.PasswordDialog(passwordName);
@@ -348,7 +348,7 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid
             catch (Exception ex)
             {
                 Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
-                    Language.strConfigPropertyGridValueFailed + Environment.NewLine +
+                    Language.ConfigPropertyGridValueFailed + Environment.NewLine +
                     ex.Message, true);
             }
         }

mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs

@@ -305,7 +305,7 @@ namespace mRemoteNG.UI.Controls
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strErrorAddFolderFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.ErrorAddFolderFailed, ex);
             }
         }
 

mRemoteV1/UI/Controls/CredentialRecordListBox.cs

@@ -8,8 +8,8 @@ namespace mRemoteNG.UI.Controls
     public partial class CredentialRecordListBox : ListBox
     {
         public new ICredentialRecord SelectedItem => (ICredentialRecord)base.SelectedItem;
-        public ICredentialRecord NoneSelection { get; } = new CredentialRecord {Title = $"--{Language.strNone}--"};
-        public ICredentialRecord AddNewSelection { get; } = new CredentialRecord {Title = $"--{Language.strAdd}--"};
+        public ICredentialRecord NoneSelection { get; } = new CredentialRecord {Title = $"--{Language.None}--"};
+        public ICredentialRecord AddNewSelection { get; } = new CredentialRecord {Title = $"--{Language.Add}--"};
 
         public CredentialRecordListBox(IEnumerable<ICredentialRecord> listOfCredentialRecords)
         {

mRemoteV1/UI/Controls/CredentialRecordListView.cs

@@ -73,9 +73,9 @@ namespace mRemoteNG.UI.Controls
 
         private void ApplyLanguage()
         {
-            olvColumnTitle.Text = Language.strTitle;
-            olvColumnUsername.Text = Language.strPropertyNameUsername;
-            olvColumnDomain.Text = Language.strPropertyNameDomain;
+            olvColumnTitle.Text = Language.Title;
+            olvColumnUsername.Text = Language.Username;
+            olvColumnDomain.Text = Language.Domain;
         }
 
         private object CredentialIdAspectGetter(object rowObject)

mRemoteV1/UI/Controls/ExternalToolsToolStrip.cs

@@ -49,7 +49,7 @@ namespace mRemoteNG.UI.Controls
             CMenToolbarShowText.CheckState = CheckState.Checked;
             CMenToolbarShowText.Name = "cMenToolbarShowText";
             CMenToolbarShowText.Size = new System.Drawing.Size(128, 22);
-            CMenToolbarShowText.Text = Language.strMenuShowText;
+            CMenToolbarShowText.Text = Language.ShowText;
             CMenToolbarShowText.Click += cMenToolbarShowText_Click;
         }
 
@@ -86,7 +86,7 @@ namespace mRemoteNG.UI.Controls
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionStackTrace(Language.strErrorAddExternalToolsToToolBarFailed, ex);
+                Runtime.MessageCollector.AddExceptionStackTrace(Language.ErrorAddExternalToolsToToolBarFailed, ex);
             }
             finally
             {

mRemoteV1/UI/Controls/IPTextBox.cs

@@ -257,7 +257,7 @@ namespace mRemoteNG.UI.Controls
                 if (theValue >= 0 && theValue <= 255)
                     return true;
 
-                MessageBox.Show(Language.strIPRange, Language.strOutOfRange);
+                MessageBox.Show(Language.MustBeBetween0And255, Language.OutOfRange);
                 return false;
             }
             catch

mRemoteV1/UI/Controls/MultiSshToolStrip.cs

@@ -36,13 +36,13 @@ namespace mRemoteNG.UI.Controls
             // 
             _lblMultiSsh.Name = "_lblMultiSsh";
             _lblMultiSsh.Size = new System.Drawing.Size(77, 22);
-            _lblMultiSsh.Text = Language.strMultiSSH;
+            _lblMultiSsh.Text = Language.MultiSsh;
             // 
-            // txtMultiSSH
+            // txtMultiSsh
             // 
             _txtMultiSsh.Name = "_txtMultiSsh";
             _txtMultiSsh.Size = new System.Drawing.Size(new DisplayProperties().ScaleWidth(300), 25);
-            _txtMultiSsh.ToolTipText = Language.strMultiSSHToolTip;
+            _txtMultiSsh.ToolTipText = Language.MultiSshToolTip;
 
             Items.AddRange(new ToolStripItem[]
             {

mRemoteV1/UI/Controls/QuickConnectComboBox.cs

@@ -176,7 +176,7 @@ namespace mRemoteNG.UI.Controls
             }
             catch (Exception ex)
             {
-                Runtime.MessageCollector.AddExceptionMessage(Language.strQuickConnectAddFailed, ex);
+                Runtime.MessageCollector.AddExceptionMessage(Language.QuickConnectAddFailed, ex);
             }
         }
 

mRemoteV1/UI/Controls/QuickConnectToolStrip.cs

@@ -51,7 +51,7 @@ namespace mRemoteNG.UI.Controls
 
         private void ApplyLanguage()
         {
-            _lblQuickConnect.Text = Language.strQuickConnect;
+            _lblQuickConnect.Text = Language.QuickConnect;
         }
 
         private void Initialize()
@@ -73,7 +73,7 @@ namespace mRemoteNG.UI.Controls
             // 
             _lblQuickConnect.Name = "lblQuickConnect";
             _lblQuickConnect.Size = new Size(55, 22);
-            _lblQuickConnect.Text = Language.strLabelConnect;
+            _lblQuickConnect.Text = Language.Connect;
             _lblQuickConnect.Click += lblQuickConnect_Click;
             // 
             // cmbQuickConnect
@@ -109,7 +109,7 @@ namespace mRemoteNG.UI.Controls
             _btnQuickConnect.Margin = new Padding(0, 1, 3, 2);
             _btnQuickConnect.Name = "btnQuickConnect";
             _btnQuickConnect.Size = new Size(84, 22);
-            _btnQuickConnect.Text = Language.strMenuConnect;
+            _btnQuickConnect.Text = Language.Connect;
             _btnQuickConnect.ButtonClick += btnQuickConnect_ButtonClick;
             _btnQuickConnect.DropDownItemClicked += btnQuickConnect_DropDownItemClicked;
             // 
@@ -130,7 +130,7 @@ namespace mRemoteNG.UI.Controls
             _btnConnections.ImageTransparentColor = Color.Magenta;
             _btnConnections.Name = "btnConnections";
             _btnConnections.Size = new Size(29, 22);
-            _btnConnections.Text = Language.strMenuConnections;
+            _btnConnections.Text = Language.Connections;
             _btnConnections.DropDownOpening += btnConnections_DropDownOpening;
             // 
             // mnuConnections

mRemoteV1/UI/DialogFactory.cs

@@ -17,7 +17,7 @@ namespace mRemoteNG.UI
                 Title = "",
                 CheckFileExists = true,
                 InitialDirectory = ConnectionsFileInfo.DefaultConnectionsPath,
-                Filter = Language.strFiltermRemoteXML + @"|*.xml|" + Language.strFilterAll + @"|*.*"
+                Filter = Language.FiltermRemoteXML + @"|*.xml|" + Language.FilterAll + @"|*.*"
             };
         }
 
@@ -35,12 +35,12 @@ namespace mRemoteNG.UI
             var commandButtons = new List<string>
             {
                 Language.ConfigurationCreateNew,
-                Language.strOpenADifferentFile,
-                Language.strMenuExit
+                Language.OpenADifferentFile,
+                Language.Exit
             };
 
             if (showCancelButton)
-                commandButtons.Add(Language.strButtonCancel);
+                commandButtons.Add(Language._Cancel);
 
             var answered = false;
             while (!answered)
@@ -81,7 +81,7 @@ namespace mRemoteNG.UI
                 {
                     Runtime.MessageCollector.AddExceptionMessage(
                                                                  string
-                                                                     .Format(Language.strConnectionsFileCouldNotBeLoadedNew,
+                                                                     .Format(Language.ConnectionsFileCouldNotBeLoadedNew,
                                                                              connectionFileName),
                                                                  exception,
                                                                  MessageClass.WarningMsg);
@@ -102,7 +102,7 @@ namespace mRemoteNG.UI
                 InitialDirectory = ConnectionsFileInfo.DefaultConnectionsPath,
                 FileName = ConnectionsFileInfo.DefaultConnectionsFile,
                 OverwritePrompt = true,
-                Filter = Language.strFiltermRemoteXML + @"|*.xml|" + Language.strFilterAll + @"|*.*"
+                Filter = Language.FiltermRemoteXML + @"|*.xml|" + Language.FilterAll + @"|*.*"
             };
         }
     }

mRemoteV1/UI/Forms/ExportForm.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows.Forms;
@@ -167,9 +167,9 @@ namespace mRemoteNG.UI.Forms
                 saveFileDialog.OverwritePrompt = true;
 
                 var fileTypes = new List<string>();
-                fileTypes.AddRange(new[] {Language.strFiltermRemoteXML, "*.xml"});
-                fileTypes.AddRange(new[] {Language.strFiltermRemoteCSV, "*.csv"});
-                fileTypes.AddRange(new[] {Language.strFilterAll, "*.*"});
+                fileTypes.AddRange(new[] {Language.FiltermRemoteXML, "*.xml"});
+                fileTypes.AddRange(new[] {Language.FiltermRemoteCSV, "*.csv"});
+                fileTypes.AddRange(new[] {Language.FilterAll, "*.*"});
 
                 saveFileDialog.Filter = string.Join("|", fileTypes.ToArray());
                 SelectFileTypeBasedOnSaveFormat(saveFileDialog);
@@ -228,28 +228,28 @@ namespace mRemoteNG.UI.Forms
 
         private void ApplyLanguage()
         {
-            Text = Language.strExport;
+            Text = Language.Export;
 
-            grpFile.Text = Language.strExportFile;
-            lblFileName.Text = Language.strLabelFilename;
-            btnBrowse.Text = Language.strButtonBrowse;
-            lblFileFormat.Text = Language.strFileFormatLabel;
+            grpFile.Text = Language.ExportFile;
+            lblFileName.Text = Language.Filename;
+            btnBrowse.Text = Language._Browse;
+            lblFileFormat.Text = Language.FileFormat;
 
-            grpItems.Text = Language.strExportItems;
-            rdoExportEverything.Text = Language.strExportEverything;
-            rdoExportSelectedFolder.Text = Language.strExportSelectedFolder;
-            rdoExportSelectedConnection.Text = Language.strExportSelectedConnection;
+            grpItems.Text = Language.ExportItems;
+            rdoExportEverything.Text = Language.ExportEverything;
+            rdoExportSelectedFolder.Text = Language.ExportSelectedFolder;
+            rdoExportSelectedConnection.Text = Language.ExportSelectedConnection;
 
-            grpProperties.Text = Language.strExportProperties;
-            chkUsername.Text = Language.strCheckboxUsername;
-            chkPassword.Text = Language.strCheckboxPassword;
-            chkDomain.Text = Language.strCheckboxDomain;
-            chkAssignedCredential.Text = Language.strAssignedCredential;
-            chkInheritance.Text = Language.strCheckboxInheritance;
-            lblUncheckProperties.Text = Language.strUncheckProperties;
+            grpProperties.Text = Language.ExportProperties;
+            chkUsername.Text = Language.Username;
+            chkPassword.Text = Language.Password;
+            chkDomain.Text = Language.Domain;
+            chkAssignedCredential.Text = Language.AssignedCredential;
+            chkInheritance.Text = Language.Inheritance;
+            lblUncheckProperties.Text = Language.UncheckProperties;
 
-            btnOK.Text = Language.strButtonOK;
-            btnCancel.Text = Language.strButtonCancel;
+            btnOK.Text = Language._Ok;
+            btnCancel.Text = Language._Cancel;
         }
 
         #endregion
@@ -292,9 +292,9 @@ namespace mRemoteNG.UI.Forms
                 switch (Format)
                 {
                     case SaveFormat.mRXML:
-                        return Language.strMremoteNgXml;
+                        return Language.MremoteNgXml;
                     case SaveFormat.mRCSV:
-                        return Language.strMremoteNgCsv;
+                        return Language.MremoteNgCsv;
                     default:
                         return Format.ToString();
                 }

mRemoteV1/UI/Forms/FrmAbout.cs

@@ -20,18 +20,18 @@ namespace mRemoteNG.UI.Window
 
         private void ApplyLanguage()
         {
-            lblLicense.Text = Language.strLabelReleasedUnderGPL;
-            base.Text = Language.strAbout;
-            llChangelog.Text = Language.strChangelog;
-            llCredits.Text = Language.strCredits;
-            llLicense.Text = Language.strLicense;
+            lblLicense.Text = Language.ReleasedUnderGPL;
+            base.Text = Language.About;
+            llChangelog.Text = Language.Changelog;
+            llCredits.Text = Language.Credits;
+            llLicense.Text = Language.License;
             lblCopyright.Text = GeneralAppInfo.Copyright;
             lblVersion.Text = $@"Version {GeneralAppInfo.ApplicationVersion}";
             AddPortableString();
         }
 
         [Conditional("PORTABLE")]
-        private void AddPortableString() => lblTitle.Text += $@" {Language.strLabelPortableEdition}";
+        private void AddPortableString() => lblTitle.Text += $@" {Language.PortableEdition}";
 
         private void ApplyTheme()
         {

mRemoteV1/UI/Forms/Input/FrmInputBox.Designer.cs

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.buttonOk = new mRemoteNG.UI.Controls.Base.NGButton();
+            this._Ok = new mRemoteNG.UI.Controls.Base.NGButton();
             this.buttonCancel = new mRemoteNG.UI.Controls.Base.NGButton();
             this.textBox = new mRemoteNG.UI.Controls.Base.NGTextBox();
             this.label = new mRemoteNG.UI.Controls.Base.NGLabel();
@@ -42,7 +42,7 @@
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
-            this.tableLayoutPanel1.Controls.Add(this.buttonOk, 1, 2);
+            this.tableLayoutPanel1.Controls.Add(this._Ok, 1, 2);
             this.tableLayoutPanel1.Controls.Add(this.buttonCancel, 2, 2);
             this.tableLayoutPanel1.Controls.Add(this.textBox, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.label, 0, 0);
@@ -56,17 +56,17 @@
             this.tableLayoutPanel1.Size = new System.Drawing.Size(284, 81);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
-            // buttonOk
+            // _Ok
             // 
-            this.buttonOk._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER;
-            this.buttonOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonOk.Location = new System.Drawing.Point(125, 55);
-            this.buttonOk.Name = "buttonOk";
-            this.buttonOk.Size = new System.Drawing.Size(75, 23);
-            this.buttonOk.TabIndex = 0;
-            this.buttonOk.Text = "Ok";
-            this.buttonOk.UseVisualStyleBackColor = true;
-            this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);
+            this._Ok._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER;
+            this._Ok.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this._Ok.Location = new System.Drawing.Point(125, 55);
+            this._Ok.Name = "_Ok";
+            this._Ok.Size = new System.Drawing.Size(75, 23);
+            this._Ok.TabIndex = 0;
+            this._Ok.Text = "Ok";
+            this._Ok.UseVisualStyleBackColor = true;
+            this._Ok.Click += new System.EventHandler(this._Ok_Click);
             // 
             // buttonCancel
             // 
@@ -128,7 +128,7 @@
         #endregion
 
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private Controls.Base.NGButton buttonOk;
+        private Controls.Base.NGButton _Ok;
         private Controls.Base.NGButton buttonCancel;
         private Controls.Base.NGTextBox textBox;
         private Controls.Base.NGLabel label;

mRemoteV1/UI/Forms/Input/FrmInputBox.cs

@@ -20,8 +20,8 @@ namespace mRemoteNG.UI.Forms.Input
 
         private void ApplyLanguage()
         {
-            buttonOk.Text = Language.strButtonOK;
-            buttonCancel.Text = Language.strButtonCancel;
+            _Ok.Text = Language._Ok;
+            buttonCancel.Text = Language._Cancel;
         }
 
         private void ApplyTheme()
@@ -32,7 +32,7 @@ namespace mRemoteNG.UI.Forms.Input
             ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
         }
 
-        private void buttonOk_Click(object sender, System.EventArgs e)
+        private void _Ok_Click(object sender, System.EventArgs e)
         {
             DialogResult = DialogResult.OK;
             returnValue = textBox.Text;