diff --git a/mRemoteV1/Connection/AbstractConnectionRecord.cs b/mRemoteV1/Connection/AbstractConnectionRecord.cs
index 4cc91050b..4569c5be7 100644
--- a/mRemoteV1/Connection/AbstractConnectionRecord.cs
+++ b/mRemoteV1/Connection/AbstractConnectionRecord.cs
@@ -92,37 +92,37 @@ namespace mRemoteNG.Connection
 
         #region Display
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameName"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionName")]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameName)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionName))]
         public virtual string Name
         {
             get => _name;
             set => SetField(ref _name, value, "Name");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameDescription"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDescription")]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDescription)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDescription))]
         public virtual string Description
         {
             get => GetPropertyValue("Description", _description);
             set => SetField(ref _description, value, "Description");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
          TypeConverter(typeof(ConnectionIcon)),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameIcon"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionIcon")]
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameIcon)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionIcon))]
         public virtual string Icon
         {
             get => GetPropertyValue("Icon", _icon);
             set => SetField(ref _icon, value, "Icon");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryDisplay"),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNamePanel"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPanel")]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay)),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePanel)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPanel))]
         public virtual string Panel
         {
             get => GetPropertyValue("Panel", _panel);
@@ -133,9 +133,9 @@ namespace mRemoteNG.Connection
 
         #region Connection
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameAddress"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAddress"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAddress)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAddress)),
          UsedInAllProtocolsExcept()]
         public virtual string Hostname
         {
@@ -143,9 +143,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _hostname, value?.Trim(), "Hostname");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNamePort"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPort"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePort)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPort)),
          UsedInAllProtocolsExcept(ProtocolType.ICA)]
         public virtual int Port
         {
@@ -153,9 +153,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _port, value, "Port");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameUsername"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUsername"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUsername)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUsername)),
          UsedInAllProtocolsExcept(ProtocolType.VNC, ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)]
         public virtual string Username
         {
@@ -163,9 +163,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _username, Settings.Default.DoNotTrimUsername ? value : value?.Trim(), "Username");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNamePassword"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPassword"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePassword)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPassword)),
          PasswordPropertyText(true),
          UsedInAllProtocolsExcept(ProtocolType.Telnet, ProtocolType.Rlogin, ProtocolType.RAW)]
         public virtual string Password
@@ -174,9 +174,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _password, value, "Password");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameDomain"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDomain"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDomain)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDomain)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA, ProtocolType.IntApp)]
         public string Domain
         {
@@ -184,9 +184,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _domain, value?.Trim(), "Domain");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameVmId"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVmId"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVmId)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVmId)),
          UsedInProtocol(ProtocolType.RDP)]
         public string VmId
         {
@@ -198,9 +198,9 @@ namespace mRemoteNG.Connection
 
         #region Protocol
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameProtocol"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionProtocol"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameProtocol)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionProtocol)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter))]
         public virtual ProtocolType Protocol
         {
@@ -208,20 +208,20 @@ namespace mRemoteNG.Connection
             set => SetField(ref _protocol, value, "Protocol");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRdpVersion"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRdpVersion"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRdpVersion)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRdpVersion)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public virtual RdpVersion RdpVersion
         {
-            get => GetPropertyValue(nameof(RdpVersion), _rdpProtocolVersion);
+            get => GetPropertyValue("RdpVersion", _rdpProtocolVersion);
             set => SetField(ref _rdpProtocolVersion, value, nameof(RdpVersion));
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameExternalTool"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionExternalTool"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameExternalTool)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionExternalTool)),
          TypeConverter(typeof(ExternalToolsTypeConverter)),
          UsedInProtocol(ProtocolType.IntApp)]
         public string ExtApp
@@ -230,9 +230,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _extApp, value, "ExtApp");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNamePuttySession"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionPuttySession"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNamePuttySession)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionPuttySession)),
          TypeConverter(typeof(Config.Putty.PuttySessionsManager.SessionList)),
          UsedInProtocol(ProtocolType.SSH1, ProtocolType.SSH2, ProtocolType.Telnet,
             ProtocolType.RAW, ProtocolType.Rlogin)]
@@ -242,9 +242,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _puttySession, value, "PuttySession");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameEncryptionStrength"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionEncryptionStrength"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEncryptionStrength)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEncryptionStrength)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.ICA)]
         public IcaProtocol.EncryptionStrength ICAEncryptionStrength
@@ -253,9 +253,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _icaEncryption, value, "ICAEncryptionStrength");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameUseConsoleSession"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUseConsoleSession"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseConsoleSession)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseConsoleSession)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseConsoleSession
@@ -264,9 +264,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _useConsoleSession, value, "UseConsoleSession");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameAuthenticationLevel"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAuthenticationLevel"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAuthenticationLevel)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAuthenticationLevel)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public AuthenticationLevel RDPAuthenticationLevel
@@ -275,9 +275,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdpAuthenticationLevel, value, "RDPAuthenticationLevel");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDPMinutesToIdleTimeout"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPMinutesToIdleTimeout"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDPMinutesToIdleTimeout)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDPMinutesToIdleTimeout)),
          UsedInProtocol(ProtocolType.RDP)]
         public virtual int RDPMinutesToIdleTimeout
         {
@@ -292,9 +292,9 @@ namespace mRemoteNG.Connection
             }
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDPAlertIdleTimeout"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDPAlertIdleTimeout"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDPAlertIdleTimeout)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDPAlertIdleTimeout)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RDPAlertIdleTimeout
         {
@@ -302,9 +302,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdpAlertIdleTimeout, value, "RDPAlertIdleTimeout");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameLoadBalanceInfo"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionLoadBalanceInfo"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameLoadBalanceInfo)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionLoadBalanceInfo)),
          UsedInProtocol(ProtocolType.RDP)]
         public string LoadBalanceInfo
         {
@@ -312,9 +312,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _loadBalanceInfo, value?.Trim(), "LoadBalanceInfo");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRenderingEngine"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRenderingEngine"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRenderingEngine)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRenderingEngine)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.HTTP, ProtocolType.HTTPS)]
         public HTTPBase.RenderingEngine RenderingEngine
@@ -323,9 +323,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _renderingEngine, value, "RenderingEngine");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameUseCredSsp"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUseCredSsp"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseCredSsp)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseCredSsp)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseCredSsp
@@ -334,9 +334,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _useCredSsp, value, "UseCredSsp");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameUseVmId"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUseVmId"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseVmId)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseVmId)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseVmId
@@ -345,9 +345,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _useVmId, value, "UseVmId");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameUseEnhancedMode"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUseEnhancedMode"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 3),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUseEnhancedMode)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUseEnhancedMode)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool UseEnhancedMode
@@ -359,9 +359,9 @@ namespace mRemoteNG.Connection
 
         #region RD Gateway
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayUsageMethod"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsageMethod"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayUsageMethod)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayUsageMethod)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDGatewayUsageMethod RDGatewayUsageMethod
@@ -370,9 +370,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayUsageMethod, value, "RDGatewayUsageMethod");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayHostname"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayHostname"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayHostname)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayHostname)),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayHostname
         {
@@ -380,9 +380,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayHostname, value?.Trim(), "RDGatewayHostname");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayUseConnectionCredentials"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUseConnectionCredentials"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayUseConnectionCredentials)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayUseConnectionCredentials)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDGatewayUseConnectionCredentials RDGatewayUseConnectionCredentials
@@ -391,9 +391,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayUseConnectionCredentials, value, "RDGatewayUseConnectionCredentials");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayUsername"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayUsername"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayUsername)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayUsername)),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayUsername
         {
@@ -401,9 +401,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayUsername, value?.Trim(), "RDGatewayUsername");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayPassword"),
-         LocalizedAttributes.LocalizedDescription("strPropertyNameRDGatewayPassword"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayPassword)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyNameRDGatewayPassword)),
          PasswordPropertyText(true),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayPassword
@@ -412,9 +412,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _rdGatewayPassword, value, "RDGatewayPassword");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 4),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDGatewayDomain"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRDGatewayDomain"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 4),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRDGatewayDomain)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRDGatewayDomain)),
          UsedInProtocol(ProtocolType.RDP)]
         public string RDGatewayDomain
         {
@@ -426,9 +426,9 @@ namespace mRemoteNG.Connection
 
         #region Appearance
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameResolution"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionResolution"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameResolution)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionResolution)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
         public RDPResolutions Resolution
@@ -437,9 +437,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _resolution, value, "Resolution");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameAutomaticResize"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAutomaticResize"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAutomaticResize)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAutomaticResize)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool AutomaticResize
@@ -448,9 +448,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _automaticResize, value, "AutomaticResize");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameColors"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionColors"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameColors)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionColors)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
         public RDPColors Colors
@@ -459,9 +459,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _colors, value, "Colors");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameCacheBitmaps"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionCacheBitmaps"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameCacheBitmaps)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionCacheBitmaps)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP, ProtocolType.ICA)]
         public bool CacheBitmaps
@@ -470,9 +470,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _cacheBitmaps, value, "CacheBitmaps");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameDisplayWallpaper"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDisplayWallpaper"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisplayWallpaper)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisplayWallpaper)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisplayWallpaper
@@ -481,9 +481,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _displayWallpaper, value, "DisplayWallpaper");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameDisplayThemes"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionDisplayThemes"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisplayThemes)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisplayThemes)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool DisplayThemes
@@ -492,9 +492,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _displayThemes, value, "DisplayThemes");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameEnableFontSmoothing"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionEnableFontSmoothing"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEnableFontSmoothing)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEnableFontSmoothing)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool EnableFontSmoothing
@@ -503,9 +503,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _enableFontSmoothing, value, "EnableFontSmoothing");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameEnableDesktopComposition"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionEnableDesktopComposition"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEnableDesktopComposition)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEnableDesktopComposition)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool EnableDesktopComposition
@@ -518,9 +518,9 @@ namespace mRemoteNG.Connection
 
         #region Redirect
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectKeys"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectKeys"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectKeys)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectKeys)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectKeys
@@ -529,9 +529,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectKeys, value, "RedirectKeys");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectDrives"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectDrives"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectDrives)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectDrives)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectDiskDrives
@@ -540,9 +540,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectDiskDrives, value, "RedirectDiskDrives");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectPrinters"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectPrinters"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectPrinters)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectPrinters)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectPrinters
@@ -551,9 +551,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectPrinters, value, "RedirectPrinters");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectClipboard"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectClipboard"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectClipboard)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectClipboard)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectClipboard
@@ -563,9 +563,9 @@ namespace mRemoteNG.Connection
         }
 
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectPorts"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectPorts"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectPorts)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectPorts)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectPorts
@@ -574,9 +574,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectPorts, value, "RedirectPorts");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectSmartCards"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectSmartCards"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectSmartCards)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectSmartCards)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectSmartCards
@@ -585,9 +585,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectSmartCards, value, "RedirectSmartCards");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectSounds"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectSounds"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectSounds)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectSounds)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDPSounds RedirectSound
@@ -596,9 +596,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _redirectSound, value, "RedirectSound");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameSoundQuality"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionSoundQuality"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameSoundQuality)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionSoundQuality)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public RDPSoundQuality SoundQuality
@@ -607,14 +607,14 @@ namespace mRemoteNG.Connection
             set => SetField(ref _soundQuality, value, "SoundQuality");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 6),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRedirectAudioCapture"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRedirectAudioCapture"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 6),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameRedirectAudioCapture)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionRedirectAudioCapture)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.RDP)]
         public bool RedirectAudioCapture
         {
-            get => GetPropertyValue(nameof(RedirectAudioCapture), _redirectAudioCapture);
+            get => GetPropertyValue("RedirectAudioCapture", _redirectAudioCapture);
             set => SetField(ref _redirectAudioCapture, value, nameof(RedirectAudioCapture));
         }
 
@@ -624,9 +624,9 @@ namespace mRemoteNG.Connection
 
         [Browsable(false)] public string ConstantID { get; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameExternalToolBefore"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionExternalToolBefore"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameExternalToolBefore)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionExternalToolBefore)),
          TypeConverter(typeof(ExternalToolsTypeConverter))]
         public virtual string PreExtApp
         {
@@ -634,9 +634,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _preExtApp, value, "PreExtApp");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameExternalToolAfter"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionExternalToolAfter"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameExternalToolAfter)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionExternalToolAfter)),
          TypeConverter(typeof(ExternalToolsTypeConverter))]
         public virtual string PostExtApp
         {
@@ -644,27 +644,27 @@ namespace mRemoteNG.Connection
             set => SetField(ref _postExtApp, value, "PostExtApp");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameMACAddress"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionMACAddress")]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameMACAddress)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionMACAddress))]
         public virtual string MacAddress
         {
             get => GetPropertyValue("MacAddress", _macAddress);
             set => SetField(ref _macAddress, value, "MacAddress");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameUser1"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionUser1")]
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameUser1)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionUser1))]
         public virtual string UserField
         {
             get => GetPropertyValue("UserField", _userField);
             set => SetField(ref _userField, value, "UserField");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 7),
-            LocalizedAttributes.LocalizedDisplayName("strPropertyNameFavorite"),
-            LocalizedAttributes.LocalizedDescription("strPropertyDescriptionFavorite"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameFavorite)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionFavorite)),
             TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public virtual bool Favorite
         {
@@ -676,9 +676,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("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameCompression"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionCompression"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameCompression)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionCompression)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -688,9 +688,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncCompression, value, "VNCCompression");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameEncoding"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionEncoding"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameEncoding)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionEncoding)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -700,9 +700,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncEncoding, value, "VNCEncoding");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 2),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameAuthenticationMode"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionAuthenticationMode"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 2),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameAuthenticationMode)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionAuthenticationMode)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -712,9 +712,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncAuthMode, value, "VNCAuthMode");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7),
-            LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyType"),
-            LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyType"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyType)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyType)),
             TypeConverter(typeof(MiscTools.EnumTypeConverter)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
@@ -724,9 +724,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyType, value, "VNCProxyType");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7),
-            LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyAddress"),
-            LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyAddress"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyAddress)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyAddress)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
         public string VNCProxyIP
@@ -735,9 +735,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyIp, value, "VNCProxyIP");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7),
-            LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyPort"),
-            LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyPort"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyPort)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyPort)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
         public int VNCProxyPort
@@ -746,9 +746,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyPort, value, "VNCProxyPort");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7),
-            LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyUsername"),
-            LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyUsername"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyUsername)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyUsername)),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
         public string VNCProxyUsername
@@ -757,9 +757,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyUsername, value, "VNCProxyUsername");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProxy", 7),
-            LocalizedAttributes.LocalizedDisplayName("strPropertyNameVNCProxyPassword"),
-            LocalizedAttributes.LocalizedDescription("strPropertyDescriptionVNCProxyPassword"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 7),
+            LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameVNCProxyPassword)),
+            LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionVNCProxyPassword)),
             PasswordPropertyText(true),
             UsedInProtocol(ProtocolType.VNC),
             Browsable(false)]
@@ -769,9 +769,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncProxyPassword, value, "VNCProxyPassword");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameColors"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionColors"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameColors)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionColors)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC),
          Browsable(false)]
@@ -781,9 +781,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncColors, value, "VNCColors");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameSmartSizeMode"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionSmartSizeMode"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameSmartSizeMode)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionSmartSizeMode)),
          TypeConverter(typeof(MiscTools.EnumTypeConverter)),
          UsedInProtocol(ProtocolType.VNC)]
         public ProtocolVNC.SmartSizeMode VNCSmartSizeMode
@@ -792,9 +792,9 @@ namespace mRemoteNG.Connection
             set => SetField(ref _vncSmartSizeMode, value, "VNCSmartSizeMode");
         }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 5),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameViewOnly"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionViewOnly"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 5),
+         LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameViewOnly)),
+         LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionViewOnly)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
          UsedInProtocol(ProtocolType.VNC)]
         public bool VNCViewOnly
diff --git a/mRemoteV1/Connection/ConnectionInfoInheritance.cs b/mRemoteV1/Connection/ConnectionInfoInheritance.cs
index 9d3a75138..9c6ede73b 100644
--- a/mRemoteV1/Connection/ConnectionInfoInheritance.cs
+++ b/mRemoteV1/Connection/ConnectionInfoInheritance.cs
@@ -14,9 +14,9 @@ namespace mRemoteNG.Connection
 
         #region General
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGeneral"),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAll"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAll"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGeneral)),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAll)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAll)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EverythingInherited
         {
@@ -28,21 +28,21 @@ namespace mRemoteNG.Connection
 
         #region Display
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryDisplay", 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDescription"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDescription"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay), 2),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDescription)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDescription)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Description { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryDisplay", 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameIcon"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionIcon"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay), 2),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameIcon)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionIcon)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Icon { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryDisplay", 2),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePanel"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPanel"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryDisplay), 2),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePanel)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPanel)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Panel { get; set; }
 
@@ -50,37 +50,37 @@ namespace mRemoteNG.Connection
 
         #region Connection
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUsername"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUsername"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUsername)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUsername)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Username { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVmId"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVmId"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVmId)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVmId)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool VmId { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePassword"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPassword"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePassword)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPassword)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Password { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDomain"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDomain"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDomain)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDomain)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         [Browsable(true)]
         public bool Domain { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryConnection", 3),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePort"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPort"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 3),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePort)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPort)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Port { get; set; }
 
@@ -88,87 +88,87 @@ namespace mRemoteNG.Connection
 
         #region Protocol
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameProtocol"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionProtocol"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameProtocol)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionProtocol)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Protocol { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayName("strPropertyNameRdpVersion"),
-         LocalizedAttributes.LocalizedDescription("strPropertyDescriptionRdpVersion"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRdpVersion)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRdpVersion)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RdpVersion { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameExternalTool"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionExternalTool"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameExternalTool)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionExternalTool)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool ExtApp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNamePuttySession"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionPuttySession"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNamePuttySession)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionPuttySession)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PuttySession { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEncryptionStrength"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionEncryptionStrength"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEncryptionStrength)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEncryptionStrength)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool ICAEncryptionStrength { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAuthenticationLevel"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAuthenticationLevel"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAuthenticationLevel)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAuthenticationLevel)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPAuthenticationLevel { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDPMinutesToIdleTimeout"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDPMinutesToIdleTimeout"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDPMinutesToIdleTimeout)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDPMinutesToIdleTimeout)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPMinutesToIdleTimeout { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDPAlertIdleTimeout"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDPAlertIdleTimeout"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDPAlertIdleTimeout)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDPAlertIdleTimeout)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDPAlertIdleTimeout { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameLoadBalanceInfo"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionLoadBalanceInfo"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameLoadBalanceInfo)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionLoadBalanceInfo)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool LoadBalanceInfo { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRenderingEngine"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRenderingEngine"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRenderingEngine)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRenderingEngine)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RenderingEngine { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseConsoleSession"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseConsoleSession"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseConsoleSession)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseConsoleSession)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseConsoleSession { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseCredSsp"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseCredSsp"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseCredSsp)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseCredSsp)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseCredSsp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseVmId"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseVmId"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseVmId)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseVmId)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseVmId { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 4),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUseEnhancedMode"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUseEnhancedMode"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProtocol), 4),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUseEnhancedMode)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUseEnhancedMode)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UseEnhancedMode { get; set; }
 
@@ -176,40 +176,39 @@ namespace mRemoteNG.Connection
 
         #region RD Gateway
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayUsageMethod"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayUsageMethod"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayUsageMethod)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayUsageMethod)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUsageMethod { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayHostname"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayHostname"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayHostname)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayHostname)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayHostname { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayUseConnectionCredentials"),
-         LocalizedAttributes.LocalizedDescriptionInherit(
-             "strPropertyDescriptionRDGatewayUseConnectionCredentials"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayUseConnectionCredentials)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayUseConnectionCredentials)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUseConnectionCredentials { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayUsername"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayUsername"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayUsername)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayUsername)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayUsername { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayPassword"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayPassword"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayPassword)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayPassword)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayPassword { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryGateway", 5),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRDGatewayDomain"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRDGatewayDomain"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryGateway), 5),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRDGatewayDomain)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRDGatewayDomain)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RDGatewayDomain { get; set; }
 
@@ -217,52 +216,51 @@ namespace mRemoteNG.Connection
 
         #region Appearance
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameResolution"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionResolution"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameResolution)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionResolution)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Resolution { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAutomaticResize"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAutomaticResize"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAutomaticResize)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAutomaticResize)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool AutomaticResize { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameColors"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionColors"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameColors)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionColors)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Colors { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameCacheBitmaps"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionCacheBitmaps"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameCacheBitmaps)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionCacheBitmaps)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool CacheBitmaps { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDisplayWallpaper"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDisplayWallpaper"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisplayWallpaper)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisplayWallpaper)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayWallpaper { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameDisplayThemes"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionDisplayThemes"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameDisplayThemes)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionDisplayThemes)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool DisplayThemes { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEnableFontSmoothing"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionEnableFontSmoothing"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEnableFontSmoothing)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEnableFontSmoothing)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableFontSmoothing { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 6),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEnableDesktopComposition"),
-         LocalizedAttributes.LocalizedDescriptionInherit(
-             "strPropertyDescriptionEnableEnableDesktopComposition"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 6),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEnableDesktopComposition)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEnableDesktopComposition)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool EnableDesktopComposition { get; set; }
 
@@ -270,57 +268,57 @@ namespace mRemoteNG.Connection
 
         #region Redirect
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectKeys"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectKeys"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectKeys)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectKeys)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectKeys { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectDrives"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectDrives"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectDrives)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectDrives)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectDiskDrives { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectPrinters"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectPrinters"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectPrinters)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectPrinters)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPrinters { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectClipboard"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectClipboard"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectClipboard)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectClipboard)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectClipboard { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectPorts"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectPorts"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectPorts)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectPorts)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectPorts { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectSmartCards"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectSmartCards"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectSmartCards)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectSmartCards)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSmartCards { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectSounds"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectSounds"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectSounds)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectSounds)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectSound { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameSoundQuality"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionSoundQuality"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameSoundQuality)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionSoundQuality)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool SoundQuality { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryRedirect", 7),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameRedirectAudioCapture"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionRedirectAudioCapture"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryRedirect), 7),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameRedirectAudioCapture)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionRedirectAudioCapture)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool RedirectAudioCapture { get; set; }
 
@@ -328,91 +326,91 @@ namespace mRemoteNG.Connection
 
         #region Misc
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameExternalToolBefore"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionExternalToolBefore"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameExternalToolBefore)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionExternalToolBefore)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PreExtApp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameExternalToolAfter"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionExternalToolAfter"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameExternalToolAfter)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionExternalToolAfter)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool PostExtApp { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameMACAddress"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionMACAddress"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameMACAddress)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionMACAddress)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool MacAddress { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-         LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameUser1"),
-         LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionUser1"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
+         LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameUser1)),
+         LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionUser1)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool UserField { get; set; }
 
-        [LocalizedAttributes.LocalizedCategory("strCategoryMiscellaneous", 8),
-        LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameFavorite"),
-        LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionFavorite"),
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryMiscellaneous), 8),
+        LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameFavorite)),
+        LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionFavorite)),
         TypeConverter(typeof(MiscTools.YesNoTypeConverter))]
         public bool Favorite { get; set; }
         #endregion
 
         #region VNC
-        [LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameCompression"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionCompression"), 
+        [LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameCompression)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionCompression)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCCompression {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameEncoding"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionEncoding"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameEncoding)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionEncoding)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCEncoding {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryConnection", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameAuthenticationMode"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionAuthenticationMode"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryConnection), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameAuthenticationMode)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionAuthenticationMode)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCAuthMode {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyType"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyType"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyType)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyType)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyType {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyAddress"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyAddress"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyAddress)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyAddress)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyIP {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyPort"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyPort"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyPort)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyPort)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPort {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyUsername"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyUsername"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyUsername)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyUsername)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyUsername {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryProxy", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameVNCProxyPassword"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionVNCProxyPassword"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryProxy), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameVNCProxyPassword)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionVNCProxyPassword)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCProxyPassword {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameColors"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionColors"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameColors)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionColors)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCColors {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameSmartSizeMode"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionSmartSizeMode"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameSmartSizeMode)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionSmartSizeMode)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCSmartSizeMode {get; set;}
 				
-		[LocalizedAttributes.LocalizedCategory("strCategoryAppearance", 9), 
-		LocalizedAttributes.LocalizedDisplayNameInherit("strPropertyNameViewOnly"), 
-		LocalizedAttributes.LocalizedDescriptionInherit("strPropertyDescriptionViewOnly"), 
+		[LocalizedAttributes.LocalizedCategory(nameof(Language.strCategoryAppearance), 9), 
+		LocalizedAttributes.LocalizedDisplayNameInherit(nameof(Language.strPropertyNameViewOnly)), 
+		LocalizedAttributes.LocalizedDescriptionInherit(nameof(Language.strPropertyDescriptionViewOnly)), 
 		TypeConverter(typeof(MiscTools.YesNoTypeConverter))]public bool VNCViewOnly {get; set;}
         #endregion