Added LocalizedCategory attribute. More localization.

mRemoteV1/Connection/Connection.Info.vb

@@ -1,6 +1,5 @@
 Imports System.Windows.Forms
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
 Imports mRemote.Tools.LocalizedAttributes
 Imports mRemote.App.Runtime
 
@@ -10,10 +9,10 @@ Namespace Connection
 #Region "Properties"
 #Region "1 Display"
         Private _Name As String = "New Connection"
-        <Category(Category1 & Language.Base.Props_Display), _
-           Browsable(True), _
-           DisplayName(Language.Base.Props_Name), _
-           Description(Language.Base.Descr_Name)> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameName"), _
+            LocalizedDescription("strPropertyDescriptionName")> _
         Public Property Name() As String
             Get
                 Return Me._Name
@@ -24,10 +23,10 @@ Namespace Connection
         End Property
 
         Private _Description As String = My.Settings.ConDefaultDescription
-        <Category(Category1 & Language.Base.Props_Display), _
+        <LocalizedCategory("strCategoryDisplay", 1), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Description), _
-            Description(Language.Base.Descr_Description)> _
+            LocalizedDisplayName("strPropertyNameDescription"), _
+            LocalizedDescription("strPropertyDescriptionDescription")> _
         Public Property Description() As String
             Get
                 If Me._Inherit.Description And Me._Parent IsNot Nothing Then
@@ -50,11 +49,11 @@ Namespace Connection
         End Property
 
         Private _Icon As String = My.Settings.ConDefaultIcon
-        <Category(Category1 & Language.Base.Props_Display), _
+        <LocalizedCategory("strCategoryDisplay", 1), _
             TypeConverter(GetType(mRemote.Connection.Icon)), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Icon), _
-            Description(Language.Base.Descr_Icon)> _
+            LocalizedDisplayName("strPropertyNameIcon"), _
+            LocalizedDescription("strPropertyDescriptionIcon")> _
         Public Property Icon() As String
             Get
                 If Me._Inherit.Icon And Me._Parent IsNot Nothing Then
@@ -77,10 +76,10 @@ Namespace Connection
         End Property
 
         Private _Panel As String = My.Settings.ConDefaultPanel
-        <Category(Category1 & Language.Base.Props_Display), _
+        <LocalizedCategory("strCategoryDisplay", 1), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Panel), _
-            Description(Language.Base.Descr_Panel)> _
+            LocalizedDisplayName("strPropertyNamePanel"), _
+            LocalizedDescription("strPropertyDescriptionPanel")> _
             Public Property Panel() As String
             Get
                 If Me._Inherit.Panel And Me._Parent IsNot Nothing Then
@@ -104,10 +103,10 @@ Namespace Connection
 #End Region
 #Region "2 Connection"
         Private _Hostname As String = ""
-        <Category(Category2 & Language.Base.Props_Connection), _
+        <LocalizedCategory("strCategoryConnection", 2), _
             Browsable(True), _
-            LocalizedDisplayName("strConnectionPropertyHostnameIP"), _
-            LocalizedDescription("strConnectionDescriptionHostnameIP")> _
+            LocalizedDisplayName("strPropertyNameHostnameIP"), _
+            LocalizedDescription("strPropertyDescriptionHostnameIP")> _
         Public Property Hostname() As String
             Get
                 Return Me._Hostname
@@ -118,10 +117,10 @@ Namespace Connection
         End Property
 
         Private _Username As String = My.Settings.ConDefaultUsername
-        <Category(Category2 & Language.Base.Props_Connection), _
+        <LocalizedCategory("strCategoryConnection", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Username), _
-            Description(Language.Base.Descr_Username)> _
+            LocalizedDisplayName("strPropertyNameUsername"), _
+            LocalizedDescription("strPropertyDescriptionUsername")> _
         Public Property Username() As String
             Get
                 If Me._Inherit.Username And Me._Parent IsNot Nothing Then
@@ -144,10 +143,10 @@ Namespace Connection
         End Property
 
         Private _Password As String = My.Settings.ConDefaultPassword
-        <Category(Category2 & Language.Base.Props_Connection), _
+        <LocalizedCategory("strCategoryConnection", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Password), _
-            Description(Language.Base.Descr_Password), _
+            LocalizedDisplayName("strPropertyNamePassword"), _
+            LocalizedDescription("strPropertyDescriptionPassword"), _
             PasswordPropertyText(True)> _
         Public Property Password() As String
             Get
@@ -171,10 +170,10 @@ Namespace Connection
         End Property
 
         Private _Domain As String = My.Settings.ConDefaultDomain
-        <Category(Category2 & Language.Base.Props_Connection), _
+        <LocalizedCategory("strCategoryConnection", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Domain), _
-            Description(Language.Base.Descr_Domain)> _
+            LocalizedDisplayName("strPropertyNameDomain"), _
+            LocalizedDescription("strPropertyDescriptionDomain")> _
         Public Property Domain() As String
             Get
                 If Me._Inherit.Domain And Me._Parent IsNot Nothing Then
@@ -198,10 +197,10 @@ Namespace Connection
 #End Region
 #Region "3 Protocol"
         Private _Protocol As Connection.Protocol.Protocols = Tools.Misc.StringToEnum(GetType(Connection.Protocol.Protocols), My.Settings.ConDefaultProtocol)
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Protocol), _
-            Description(Language.Base.Descr_Protocol), _
+            LocalizedDisplayName("strPropertyNameProtocol"), _
+            LocalizedDescription("strPropertyDescriptionProtocol"), _
             TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
         Public Property Protocol() As Connection.Protocol.Protocols
             Get
@@ -225,7 +224,7 @@ Namespace Connection
         End Property
 
         Private _ExtApp As String = My.Settings.ConDefaultExtApp
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
             DisplayName(Language.Base.Props_ExtApp), _
             Description(Language.Base.Descr_ExtApp), _
@@ -252,10 +251,10 @@ Namespace Connection
         End Property
 
         Private _Port As Integer
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Port), _
-            Description(Language.Base.Descr_Port)> _
+            LocalizedDisplayName("strPropertyNamePort"), _
+            LocalizedDescription("strPropertyDescriptionPort")> _
         Public Property Port() As Integer
             Get
                 If Me._Inherit.Port And Me._Parent IsNot Nothing Then
@@ -278,7 +277,7 @@ Namespace Connection
         End Property
 
         Private _PuttySession As String = My.Settings.ConDefaultPuttySession
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
             DisplayName(Language.Base.Props_PuttySession), _
             Description(Language.Base.Descr_PuttySession), _
@@ -305,7 +304,7 @@ Namespace Connection
         End Property
 
         Private _ICAEncryption As Connection.Protocol.ICA.EncryptionStrength = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.ICA.EncryptionStrength), My.Settings.ConDefaultICAEncryptionStrength)
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
             DisplayName(Language.Base.Props_EncryrptionStrength), _
             Description(Language.Base.Descr_EncryptionStrength), _
@@ -332,7 +331,7 @@ Namespace Connection
         End Property
 
         Private _UseConsoleSession As Boolean = My.Settings.ConDefaultUseConsoleSession
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
             DisplayName(Language.Base.Props_UseConsoleSession), _
             Description(Language.Base.Descr_UseConsoleSession), _
@@ -359,7 +358,7 @@ Namespace Connection
         End Property
 
         Private _RDPAuthenticationLevel As Connection.Protocol.RDP.AuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.AuthenticationLevel), My.Settings.ConDefaultRDPAuthenticationLevel)
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
             DisplayName(Language.Base.Props_AuthenticationLevel), _
             Description(Language.Base.Descr_AuthenticationLevel), _
@@ -386,7 +385,7 @@ Namespace Connection
         End Property
 
         Private _RenderingEngine As Connection.Protocol.HTTPBase.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.HTTPBase.RenderingEngine), My.Settings.ConDefaultRenderingEngine)
-        <Category(Category3 & Language.Base.Props_Protocol), _
+        <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RenderingEngine), _
             Description(Language.Base.Descr_RenderingEngine), _
@@ -414,7 +413,7 @@ Namespace Connection
 #End Region
 #Region "4 RD Gateway"
         Private _RDGatewayUsageMethod As mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUsageMethod), My.Settings.ConDefaultRDGatewayUsageMethod)
-        <Category(Category4 & Language.Base.Category_RDGateway), _
+        <LocalizedCategory("strCategoryGateway", 4), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RDGatewayUsageMethod), _
             Description(Language.Base.Descr_RDGatewayUsageMethod), _
@@ -441,7 +440,7 @@ Namespace Connection
         End Property
 
         Private _RDGatewayHostname As String
-        <Category(Category4 & Language.Base.Category_RDGateway), _
+        <LocalizedCategory("strCategoryGateway", 4), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RDGatewayHostname), _
             Description(Language.Base.Descr_RDGatewayHostname)> _
@@ -467,7 +466,7 @@ Namespace Connection
         End Property
 
         Private _RDGatewayUseConnectionCredentials As mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), My.Settings.ConDefaultRDGatewayUseConnectionCredentials)
-        <Category(Category4 & Language.Base.Category_RDGateway), _
+        <LocalizedCategory("strCategoryGateway", 4), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RDGatewayUseConnectionCredentials), _
             Description(Language.Base.Descr_RDGatewayUseConnectionCredentials), _
@@ -494,7 +493,7 @@ Namespace Connection
         End Property
 
         Private _RDGatewayUsername As String
-        <Category(Category4 & Language.Base.Category_RDGateway), _
+        <LocalizedCategory("strCategoryGateway", 4), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RDGatewayUsername), _
             Description(Language.Base.Descr_RDGatewayUsername)> _
@@ -520,7 +519,7 @@ Namespace Connection
         End Property
 
         Private _RDGatewayPassword As String
-        <Category(Category4 & Language.Base.Category_RDGateway), _
+        <LocalizedCategory("strCategoryGateway", 4), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RDGatewayPassword), _
             Description(Language.Base.Descr_RDGatewayPassword), _
@@ -547,7 +546,7 @@ Namespace Connection
         End Property
 
         Private _RDGatewayDomain As String
-        <Category(Category4 & Language.Base.Category_RDGateway), _
+        <LocalizedCategory("strCategoryGateway", 4), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RDGatewayDomain), _
             Description(Language.Base.Descr_RDGatewayDomain)> _
@@ -574,7 +573,7 @@ Namespace Connection
 #End Region
 #Region "5 Appearance"
         Private _Resolution As Connection.Protocol.RDP.RDPResolutions = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPResolutions), My.Settings.ConDefaultResolution)
-        <Category(Category5 & Language.Base.Props_Appearance), _
+        <LocalizedCategory("strCategoryAppearance", 5), _
             Browsable(True), _
             DisplayName(Language.Base.Props_Resolution), _
             Description(Language.Base.Descr_Resolution), _
@@ -601,10 +600,10 @@ Namespace Connection
         End Property
 
         Private _Colors As Connection.Protocol.RDP.RDPColors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPColors), My.Settings.ConDefaultColors)
-        <Category(Category5 & Language.Base.Props_Appearance), _
+        <LocalizedCategory("strCategoryAppearance", 5), _
             Browsable(True), _
-            LocalizedDisplayName("strConnectionPropertyColors"), _
-            LocalizedDescription("strConnectionDescriptionColors"), _
+            LocalizedDisplayName("strPropertyNameColors"), _
+            LocalizedDescription("strPropertyDescriptionColors"), _
             TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
         Public Property Colors() As Connection.Protocol.RDP.RDPColors
             Get
@@ -628,7 +627,7 @@ Namespace Connection
         End Property
 
         Private _CacheBitmaps As Boolean = My.Settings.ConDefaultCacheBitmaps
-        <Category(Category5 & Language.Base.Props_Appearance), _
+        <LocalizedCategory("strCategoryAppearance", 5), _
             Browsable(True), _
             DisplayName(Language.Base.Props_CacheBitmaps), _
             Description(Language.Base.Descr_CacheBitmaps), _
@@ -655,7 +654,7 @@ Namespace Connection
         End Property
 
         Private _DisplayWallpaper As Boolean = My.Settings.ConDefaultDisplayWallpaper
-        <Category(Category5 & Language.Base.Props_Appearance), _
+        <LocalizedCategory("strCategoryAppearance", 5), _
             Browsable(True), _
             DisplayName(Language.Base.Props_DisplayWallpaper), _
             Description(Language.Base.Descr_DisplayWallpaper), _
@@ -682,7 +681,7 @@ Namespace Connection
         End Property
 
         Private _DisplayThemes As Boolean = My.Settings.ConDefaultDisplayThemes
-        <Category(Category5 & Language.Base.Props_Appearance), _
+        <LocalizedCategory("strCategoryAppearance", 5), _
             Browsable(True), _
             DisplayName(Language.Base.Props_DisplayThemes), _
             Description(Language.Base.Descr_DisplayThemes), _
@@ -710,7 +709,7 @@ Namespace Connection
 #End Region
 #Region "6 Redirect"
         Private _RedirectKeys As Boolean = My.Settings.ConDefaultRedirectKeys
-        <Category(Category6 & Language.Base.Props_Redirect), _
+        <LocalizedCategory("strCategoryRedirect", 6), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedKeyCombinations), _
             Description(Language.Base.Descr_RedKeyCombinations), _
@@ -737,7 +736,7 @@ Namespace Connection
         End Property
 
         Private _RedirectDiskDrives As Boolean = My.Settings.ConDefaultRedirectDiskDrives
-        <Category(Category6 & Language.Base.Props_Redirect), _
+        <LocalizedCategory("strCategoryRedirect", 6), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedDiskDrives), _
             Description(Language.Base.Descr_RedDiskDrives), _
@@ -764,7 +763,7 @@ Namespace Connection
         End Property
 
         Private _RedirectPrinters As Boolean = My.Settings.ConDefaultRedirectPrinters
-        <Category(Category6 & Language.Base.Props_Redirect), _
+        <LocalizedCategory("strCategoryRedirect", 6), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedPrinters), _
             Description(Language.Base.Descr_RedPrinters), _
@@ -791,7 +790,7 @@ Namespace Connection
         End Property
 
         Private _RedirectPorts As Boolean = My.Settings.ConDefaultRedirectPorts
-        <Category(Category6 & Language.Base.Props_Redirect), _
+        <LocalizedCategory("strCategoryRedirect", 6), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedPorts), _
             Description(Language.Base.Descr_RedPorts), _
@@ -818,7 +817,7 @@ Namespace Connection
         End Property
 
         Private _RedirectSmartCards As Boolean = My.Settings.ConDefaultRedirectSmartCards
-        <Category(Category6 & Language.Base.Props_Redirect), _
+        <LocalizedCategory("strCategoryRedirect", 6), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedSmartCards), _
             Description(Language.Base.Descr_RedSmartCards), _
@@ -845,7 +844,7 @@ Namespace Connection
         End Property
 
         Private _RedirectSound As Connection.Protocol.RDP.RDPSounds = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPSounds), My.Settings.ConDefaultRedirectSound)
-        <Category(Category6 & Language.Base.Props_Redirect), _
+        <LocalizedCategory("strCategoryRedirect", 6), _
             Browsable(True), _
             DisplayName(Language.Base.Props_RedSounds), _
             Description(Language.Base.Descr_RedSound), _
@@ -873,7 +872,7 @@ Namespace Connection
 #End Region
 #Region "7 Misc"
         Private _PreExtApp As String = My.Settings.ConDefaultPreExtApp
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(True), _
             DisplayName(Language.Base.Props_PreExtApp), _
             Description(Language.Base.Descr_PreExtApp), _
@@ -900,7 +899,7 @@ Namespace Connection
         End Property
 
         Private _PostExtApp As String = My.Settings.ConDefaultPostExtApp
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(True), _
             DisplayName(Language.Base.Props_PostExtApp), _
             Description(Language.Base.Descr_PostExtApp), _
@@ -927,7 +926,7 @@ Namespace Connection
         End Property
 
         Private _MacAddress As String = My.Settings.ConDefaultMacAddress
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(True), _
             DisplayName(Language.Base.Props_MacAddress), _
             Description(Language.Base.Descr_MacAddress)> _
@@ -953,7 +952,7 @@ Namespace Connection
         End Property
 
         Private _UserField As String = My.Settings.ConDefaultUserField
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(True), _
             DisplayName(Language.Base.Props_UserField), _
             Description(Language.Base.Descr_UserField)> _
@@ -980,7 +979,7 @@ Namespace Connection
 #End Region
 #Region "VNC"
         Private _VNCCompression As mRemote.Connection.Protocol.VNC.Compression = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Compression), My.Settings.ConDefaultVNCCompression)
-        <Category(Category5 & Language.Base.Props_Appearance), _
+        <LocalizedCategory("strCategoryAppearance", 5), _
            Browsable(False), _
            DisplayName(Language.Base.Props_Compression), _
            Description(Language.Base.Descr_Compression), _
@@ -1007,11 +1006,11 @@ Namespace Connection
         End Property
 
         Private _VNCEncoding As mRemote.Connection.Protocol.VNC.Encoding = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Encoding), My.Settings.ConDefaultVNCEncoding)
-        <Category(Category5 & Language.Base.Props_Appearance), _
-           Browsable(False), _
-           DisplayName(Language.Base.Props_Encoding), _
-           Description(Language.Base.Descr_Encoding), _
-           TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
+        <LocalizedCategory("strCategoryAppearance", 5), _
+            Browsable(False), _
+            DisplayName(Language.Base.Props_Encoding), _
+            Description(Language.Base.Descr_Encoding), _
+            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
         Public Property VNCEncoding() As mRemote.Connection.Protocol.VNC.Encoding
             Get
                 If Me._Inherit.VNCEncoding And Me._Parent IsNot Nothing Then
@@ -1035,7 +1034,7 @@ Namespace Connection
 
 
         Private _VNCAuthMode As mRemote.Connection.Protocol.VNC.AuthMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.AuthMode), My.Settings.ConDefaultVNCAuthMode)
-        <Category(Category2 & Language.Base.Props_Connection), _
+        <LocalizedCategory("strCategoryConnection", 2), _
             Browsable(False), _
             DisplayName(Language.Base.Props_AuthMode), _
             Description(Language.Base.Descr_AuthMode), _
@@ -1062,7 +1061,7 @@ Namespace Connection
         End Property
 
         Private _VNCProxyType As mRemote.Connection.Protocol.VNC.ProxyType = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.ProxyType), My.Settings.ConDefaultVNCProxyType)
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
            Browsable(False), _
            DisplayName(Language.Base.Props_ProxyType), _
            Description(Language.Base.Descr_ProxyType), _
@@ -1089,7 +1088,7 @@ Namespace Connection
         End Property
 
         Private _VNCProxyIP As String = My.Settings.ConDefaultVNCProxyIP
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(False), _
             DisplayName(Language.Base.Props_ProxyIP), _
             Description(Language.Base.Descr_ProxyIP)> _
@@ -1115,7 +1114,7 @@ Namespace Connection
         End Property
 
         Private _VNCProxyPort As Integer = My.Settings.ConDefaultVNCProxyPort
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(False), _
             DisplayName(Language.Base.Props_ProxyPort), _
             Description(Language.Base.Descr_ProxyPort)> _
@@ -1141,7 +1140,7 @@ Namespace Connection
         End Property
 
         Private _VNCProxyUsername As String = My.Settings.ConDefaultVNCProxyUsername
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(False), _
             DisplayName(Language.Base.Props_ProxyUsername), _
             Description(Language.Base.Props_ProxyUsername)> _
@@ -1167,7 +1166,7 @@ Namespace Connection
         End Property
 
         Private _VNCProxyPassword As String = My.Settings.ConDefaultVNCProxyPassword
-        <Category(Category7 & Language.Base.Props_Misc), _
+        <LocalizedCategory("strCategoryMiscellaneous", 7), _
             Browsable(False), _
             DisplayName(Language.Base.Props_ProxyPassword), _
             Description(Language.Base.Descr_ProxyPassword), _
@@ -1194,11 +1193,11 @@ Namespace Connection
         End Property
 
         Private _VNCColors As mRemote.Connection.Protocol.VNC.Colors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.Colors), My.Settings.ConDefaultVNCColors)
-        <Category(Category5 & Language.Base.Props_Appearance), _
-           Browsable(False), _
-           DisplayName(Language.Base.Props_Colors), _
-           Description(Language.Base.Descr_Colors), _
-           TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
+        <LocalizedCategory("strCategoryAppearance", 5), _
+            Browsable(False), _
+            DisplayName(Language.Base.Props_Colors), _
+            Description(Language.Base.Descr_Colors), _
+            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
        Public Property VNCColors() As mRemote.Connection.Protocol.VNC.Colors
             Get
                 If Me._Inherit.VNCColors And Me._Parent IsNot Nothing Then
@@ -1221,11 +1220,11 @@ Namespace Connection
         End Property
 
         Private _VNCSmartSizeMode As mRemote.Connection.Protocol.VNC.SmartSizeMode = Tools.Misc.StringToEnum(GetType(Connection.Protocol.VNC.SmartSizeMode), My.Settings.ConDefaultVNCSmartSizeMode)
-        <Category(Category5 & Language.Base.Props_Appearance), _
-           Browsable(True), _
-           DisplayName(Language.Base.Props_SmartSizeMode), _
-           Description(Language.Base.Descr_SmartSizeMode), _
-           TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
+        <LocalizedCategory("strCategoryAppearance", 5), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_SmartSizeMode), _
+            Description(Language.Base.Descr_SmartSizeMode), _
+            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
         Public Property VNCSmartSizeMode() As mRemote.Connection.Protocol.VNC.SmartSizeMode
             Get
                 If Me._Inherit.VNCSmartSizeMode And Me._Parent IsNot Nothing Then
@@ -1248,11 +1247,11 @@ Namespace Connection
         End Property
 
         Private _VNCViewOnly As Boolean = My.Settings.ConDefaultVNCViewOnly
-        <Category(Category5 & Language.Base.Props_Appearance), _
-           Browsable(True), _
-           DisplayName(Language.Base.Props_ViewOnly), _
-           Description(Language.Base.Descr_ViewOnly), _
-           TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+        <LocalizedCategory("strCategoryAppearance", 5), _
+            Browsable(True), _
+            DisplayName(Language.Base.Props_ViewOnly), _
+            Description(Language.Base.Descr_ViewOnly), _
+            TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
         Public Property VNCViewOnly() As Boolean
             Get
                 If Me._Inherit.VNCViewOnly And Me._Parent IsNot Nothing Then
@@ -1544,11 +1543,11 @@ Namespace Connection
 
 
 #Region "1 General"
-            <Category(Category1 & Language.Base.Props_General), _
-                          Browsable(True), _
-                          DisplayName(Language.Base.Props_InheritEverything), _
-                          TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
-                      Public Property EverythingInherited() As Boolean
+            <LocalizedCategory("strCategoryGeneral", 1), _
+                Browsable(True), _
+                DisplayName(Language.Base.Props_InheritEverything), _
+                TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+            Public Property EverythingInherited() As Boolean
                 Get
                     If Me._CacheBitmaps And Me._Colors And Me._Description And Me._DisplayThemes And Me._DisplayWallpaper _
                     And Me._Domain And Me._Icon And Me._Password And Me._Port And Me._Protocol And Me._PuttySession _
@@ -1573,9 +1572,9 @@ Namespace Connection
 #End Region
 #Region "2 Display"
             Private _Description As Boolean = My.Settings.InhDefaultDescription
-            <Category(Category2 & Language.Base.Props_Display), _
+            <LocalizedCategory("strCategoryDisplay", 2), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Description), _
+                LocalizedDisplayName("strPropertyNameInheritDescription"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Description() As Boolean
                 Get
@@ -1587,9 +1586,9 @@ Namespace Connection
             End Property
 
             Private _Icon As Boolean = My.Settings.InhDefaultIcon
-            <Category(Category2 & Language.Base.Props_Display), _
+            <LocalizedCategory("strCategoryDisplay", 2), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Icon), _
+                LocalizedDisplayName("strPropertyNameInheritIcon"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Icon() As Boolean
                 Get
@@ -1601,9 +1600,9 @@ Namespace Connection
             End Property
 
             Private _Panel As Boolean = My.Settings.InhDefaultPanel
-            <Category(Category2 & Language.Base.Props_Display), _
+            <LocalizedCategory("strCategoryDisplay", 2), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Panel), _
+                LocalizedDisplayName("strPropertyNameInheritPanel"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Panel() As Boolean
                 Get
@@ -1616,9 +1615,9 @@ Namespace Connection
 #End Region
 #Region "3 Connection"
             Private _Username As Boolean = My.Settings.InhDefaultUsername
-            <Category(Category3 & Language.Base.Props_Connection), _
+            <LocalizedCategory("strCategoryConnection", 3), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Username), _
+                LocalizedDisplayName("strPropertyNameInheritUsername"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Username() As Boolean
                 Get
@@ -1630,9 +1629,9 @@ Namespace Connection
             End Property
 
             Private _Password As Boolean = My.Settings.InhDefaultPassword
-            <Category(Category3 & Language.Base.Props_Connection), _
+            <LocalizedCategory("strCategoryConnection", 3), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Password), _
+                LocalizedDisplayName("strPropertyNameInheritPassword"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Password() As Boolean
                 Get
@@ -1644,9 +1643,9 @@ Namespace Connection
             End Property
 
             Private _Domain As Boolean = My.Settings.InhDefaultDomain
-            <Category(Category3 & Language.Base.Props_Connection), _
+            <LocalizedCategory("strCategoryConnection", 3), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Domain), _
+                LocalizedDisplayName("strPropertyNameInheritDomain"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Domain() As Boolean
                 Get
@@ -1659,9 +1658,9 @@ Namespace Connection
 #End Region
 #Region "4 Protocol"
             Private _Protocol As Boolean = My.Settings.InhDefaultProtocol
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Protocol), _
+                LocalizedDisplayName("strPropertyNameInheritProtocol"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Protocol() As Boolean
                 Get
@@ -1673,7 +1672,7 @@ Namespace Connection
             End Property
 
             Private _ExtApp As Boolean = My.Settings.InhDefaultExtApp
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ExtApp), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1687,9 +1686,9 @@ Namespace Connection
             End Property
 
             Private _Port As Boolean = My.Settings.InhDefaultPort
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
-                DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Port), _
+                LocalizedDisplayName("strPropertyNameInheritPort"), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
             Public Property Port() As Boolean
                 Get
@@ -1701,7 +1700,7 @@ Namespace Connection
             End Property
 
             Private _PuttySession As Boolean = My.Settings.InhDefaultPuttySession
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_PuttySession), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1715,7 +1714,7 @@ Namespace Connection
             End Property
 
             Private _ICAEncryption As Boolean = My.Settings.InhDefaultICAEncryptionStrength
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_EncryrptionStrength), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1729,7 +1728,7 @@ Namespace Connection
             End Property
 
             Private _RDPAuthenticationLevel As Boolean = My.Settings.InhDefaultRDPAuthenticationLevel
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_AuthenticationLevel), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1743,7 +1742,7 @@ Namespace Connection
             End Property
 
             Private _RenderingEngine As Boolean = My.Settings.InhDefaultRenderingEngine
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RenderingEngine), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1757,7 +1756,7 @@ Namespace Connection
             End Property
 
             Private _UseConsoleSession As Boolean = My.Settings.InhDefaultUseConsoleSession
-            <Category(Category4 & Language.Base.Props_Protocol), _
+            <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_UseConsoleSession), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1772,7 +1771,7 @@ Namespace Connection
 #End Region
 #Region "5 RD Gateway"
             Private _RDGatewayUsageMethod As Boolean = False
-            <Category(Category5 & Language.Base.Category_RDGateway), _
+            <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayUsageMethod), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1786,7 +1785,7 @@ Namespace Connection
             End Property
 
             Private _RDGatewayHostname As Boolean = False
-            <Category(Category5 & Language.Base.Category_RDGateway), _
+            <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayHostname), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1800,7 +1799,7 @@ Namespace Connection
             End Property
 
             Private _RDGatewayUseConnectionCredentials As Boolean = False
-            <Category(Category5 & Language.Base.Category_RDGateway), _
+            <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayUseConnectionCredentials), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1814,7 +1813,7 @@ Namespace Connection
             End Property
 
             Private _RDGatewayUsername As Boolean = False
-            <Category(Category5 & Language.Base.Category_RDGateway), _
+            <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayUsername), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1828,7 +1827,7 @@ Namespace Connection
             End Property
 
             Private _RDGatewayPassword As Boolean = False
-            <Category(Category5 & Language.Base.Category_RDGateway), _
+            <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayPassword), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1842,7 +1841,7 @@ Namespace Connection
             End Property
 
             Private _RDGatewayDomain As Boolean = False
-            <Category(Category5 & Language.Base.Category_RDGateway), _
+            <LocalizedCategory("strCategoryGateway", 5), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RDGatewayDomain), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1857,7 +1856,7 @@ Namespace Connection
 #End Region
 #Region "6 Appearance"
             Private _Resolution As Boolean = My.Settings.InhDefaultResolution
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Resolution), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1871,7 +1870,7 @@ Namespace Connection
             End Property
 
             Private _Colors As Boolean = My.Settings.InhDefaultColors
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Colors), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1885,7 +1884,7 @@ Namespace Connection
             End Property
 
             Private _CacheBitmaps As Boolean = My.Settings.InhDefaultCacheBitmaps
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_CacheBitmaps), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1899,7 +1898,7 @@ Namespace Connection
             End Property
 
             Private _DisplayWallpaper As Boolean = My.Settings.InhDefaultDisplayWallpaper
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_DisplayWallpaper), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1913,7 +1912,7 @@ Namespace Connection
             End Property
 
             Private _DisplayThemes As Boolean = My.Settings.InhDefaultDisplayThemes
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_DisplayThemes), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1926,9 +1925,9 @@ Namespace Connection
                 End Set
             End Property
 #End Region
-#Region "6 Redirect"
+#Region "7 Redirect"
             Private _RedirectKeys As Boolean = My.Settings.InhDefaultRedirectKeys
-            <Category(Category7 & Language.Base.Props_Redirect), _
+            <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedKeyCombinations), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1942,7 +1941,7 @@ Namespace Connection
             End Property
 
             Private _RedirectDiskDrives As Boolean = My.Settings.InhDefaultRedirectDiskDrives
-            <Category(Category7 & Language.Base.Props_Redirect), _
+            <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedDiskDrives), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1956,7 +1955,7 @@ Namespace Connection
             End Property
 
             Private _RedirectPrinters As Boolean = My.Settings.InhDefaultRedirectPrinters
-            <Category(Category7 & Language.Base.Props_Redirect), _
+            <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedPrinters), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1970,7 +1969,7 @@ Namespace Connection
             End Property
 
             Private _RedirectPorts As Boolean = My.Settings.InhDefaultRedirectPorts
-            <Category(Category7 & Language.Base.Props_Redirect), _
+            <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedPorts), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1984,7 +1983,7 @@ Namespace Connection
             End Property
 
             Private _RedirectSmartCards As Boolean = My.Settings.InhDefaultRedirectSmartCards
-            <Category(Category7 & Language.Base.Props_Redirect), _
+            <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedSmartCards), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -1998,7 +1997,7 @@ Namespace Connection
             End Property
 
             Private _RedirectSound As Boolean = My.Settings.InhDefaultRedirectSound
-            <Category(Category7 & Language.Base.Props_Redirect), _
+            <LocalizedCategory("strCategoryRedirect", 7), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_RedSounds), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2011,9 +2010,9 @@ Namespace Connection
                 End Set
             End Property
 #End Region
-#Region "7 Misc"
+#Region "8 Misc"
             Private _PreExtApp As Boolean = My.Settings.InhDefaultPreExtApp
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_PreExtApp), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2027,7 +2026,7 @@ Namespace Connection
             End Property
 
             Private _PostExtApp As Boolean = My.Settings.InhDefaultPostExtApp
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_PostExtApp), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2041,7 +2040,7 @@ Namespace Connection
             End Property
 
             Private _MacAddress As Boolean = My.Settings.InhDefaultMacAddress
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_MacAddress), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2055,7 +2054,7 @@ Namespace Connection
             End Property
 
             Private _UserField As Boolean = My.Settings.InhDefaultUserField
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_UserField), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2070,7 +2069,7 @@ Namespace Connection
 #End Region
 #Region "VNC"
             Private _VNCCompression As Boolean = My.Settings.InhDefaultVNCCompression
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Compression), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2084,7 +2083,7 @@ Namespace Connection
             End Property
 
             Private _VNCEncoding As Boolean = My.Settings.InhDefaultVNCEncoding
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Encoding), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2098,7 +2097,7 @@ Namespace Connection
             End Property
 
             Private _VNCAuthMode As Boolean = My.Settings.InhDefaultVNCAuthMode
-            <Category(Category3 & Language.Base.Props_Connection), _
+            <LocalizedCategory("strCategoryConnection", 3), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_AuthMode), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2112,7 +2111,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyType As Boolean = My.Settings.InhDefaultVNCProxyType
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyType), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2126,7 +2125,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyIP As Boolean = My.Settings.InhDefaultVNCProxyIP
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyIP), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2140,7 +2139,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyPort As Boolean = My.Settings.InhDefaultVNCProxyPort
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyPort), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2154,7 +2153,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyUsername As Boolean = My.Settings.InhDefaultVNCProxyUsername
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyUsername), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2168,7 +2167,7 @@ Namespace Connection
             End Property
 
             Private _VNCProxyPassword As Boolean = My.Settings.InhDefaultVNCProxyPassword
-            <Category(Category8 & Language.Base.Props_Misc), _
+            <LocalizedCategory("strCategoryMiscellaneous", 8), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ProxyPassword), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2182,7 +2181,7 @@ Namespace Connection
             End Property
 
             Private _VNCColors As Boolean = My.Settings.InhDefaultVNCColors
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_Colors), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2196,7 +2195,7 @@ Namespace Connection
             End Property
 
             Private _VNCSmartSizeMode As Boolean = My.Settings.InhDefaultVNCSmartSizeMode
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_SmartSizeMode), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
@@ -2210,7 +2209,7 @@ Namespace Connection
             End Property
 
             Private _VNCViewOnly As Boolean = My.Settings.InhDefaultVNCViewOnly
-            <Category(Category6 & Language.Base.Props_Appearance), _
+            <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _
                 DisplayName(Language.Base.Inherit & " " & Language.Base.Props_ViewOnly), _
                 TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _

mRemoteV1/Container/Container.Info.vb

@@ -1,21 +1,21 @@
 Imports System.Windows.Forms
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
+Imports mRemote.Tools.LocalizedAttributes
 
 Namespace Container
     <DefaultProperty("Name")> _
     Public Class Info
 #Region "Properties"
         Private _Name As String = "New Container"
-        <Category(Category1 & "Display"), _
-           Browsable(True), _
-           [ReadOnly](False), _
-           Bindable(False), _
-           DefaultValue(""), _
-           DesignOnly(False), _
-           DisplayName(Language.Base.Props_Name), _
-           Description("Enter a name"), _
-           Attributes.Container()> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            [ReadOnly](False), _
+            Bindable(False), _
+            DefaultValue(""), _
+            DesignOnly(False), _
+            LocalizedDisplayName("strPropertyNameName"), _
+            LocalizedDescription("strPropertyDescriptionName"), _
+            Attributes.Container()> _
         Public Property Name() As String
             Get
                 Return Me._ConnectionInfo.Name

mRemoteV1/Credential/Credential.Info.vb

@@ -1,15 +1,14 @@
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
-Imports mRemote.Tools.Misc.PropertyGridValue
+Imports mRemote.Tools.LocalizedAttributes
 
 Namespace Credential
     Public Class Info
 #Region "1 Display"
         Private _Name As String
-        <Category(Category1 & "Display"), _
-           Browsable(True), _
-           DisplayName(Language.Base.Props_Name), _
-           Description("Enter a name")> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameName"), _
+            LocalizedDescription("strPropertyDescriptionName")> _
         Public Property Name() As String
             Get
                 Return _Name
@@ -20,10 +19,10 @@ Namespace Credential
         End Property
 
         Private _Description As String
-        <Category(Category1 & "Description"), _
-           Browsable(True), _
-           DisplayName(Language.Base.Props_Description), _
-           Description("Enter a description")> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameDescription"), _
+            LocalizedDescription("strPropertyDescriptionDescription")> _
         Public Property Description() As String
             Get
                 Return _Description
@@ -35,10 +34,10 @@ Namespace Credential
 #End Region
 #Region "2 Credentials"
         Private _Username As String
-        <Category(Category2 & "Credentials"), _
+        <LocalizedCategory("strCategoryCredentials", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Username), _
-            Description("Enter a username")> _
+            LocalizedDisplayName("strPropertyNameUsername"), _
+            LocalizedDescription("strPropertyDescriptionUsername")> _
         Public Property Username() As String
             Get
                 Return _Username
@@ -49,10 +48,10 @@ Namespace Credential
         End Property
 
         Private _Password As String
-        <Category(Category2 & "Credentials"), _
+        <LocalizedCategory("strCategoryCredentials", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Password), _
-            Description("Enter a password"), _
+            LocalizedDisplayName("strPropertyNamePassword"), _
+            LocalizedDescription("strPropertyDescriptionPassword"), _
             PasswordPropertyText(True)> _
         Public Property Password() As String
             Get
@@ -64,10 +63,10 @@ Namespace Credential
         End Property
 
         Private _Domain As String
-        <Category(Category2 & "Credentials"), _
+        <LocalizedCategory("strCategoryCredentials", 2), _
             Browsable(True), _
-            DisplayName(Language.Base.Props_Domain), _
-            Description("Enter a domain")> _
+            LocalizedDisplayName("strPropertyNameDomain"), _
+            LocalizedDescription("strPropertyDescriptionDomain")> _
         Public Property Domain() As String
             Get
                 Return _Domain

mRemoteV1/Language/Language.DE.vb

@@ -1,23 +1,5 @@
 Namespace Language
     Public Class DE
-        Public Const Props_Name As String = "Name"
-        Public Const Descr_Name As String = "Dies ist der Name der im Verbindungs Baum angezeigt wird."
-        Public Const Props_Description As String = "Beschreibung"
-        Public Const Descr_Description As String = "Hier kann eine Beschreibung für den Host hinterlegt werden."
-        Public Const Props_Icon As String = "Icon"
-        Public Const Descr_Icon As String = "Das ausgewählte Icon wird bei Verbindung zum Host im Tab angezeigt."
-        Public Const Props_Panel As String = "Panel"
-        Public Const Descr_Panel As String = "Setzt das Panel in dem die Verbindung geöffnet wird."
-        Public Const Props_Username As String = "Benutzername"
-        Public Const Descr_Username As String = "Geben sie hier ihren Benutzernamen ein."
-        Public Const Props_Password As String = "Passwort"
-        Public Const Descr_Password As String = "Geben sie hier ihr Passwort ein."
-        Public Const Props_Domain As String = "Domäne"
-        Public Const Descr_Domain As String = "Geben sie hier ihre Domäne ein."
-        Public Const Props_Protocol As String = "Protokoll"
-        Public Const Descr_Protocol As String = "Wählen sie das Protokoll das verwendet werden soll um eine Verbindung aufzubauen."
-        Public Const Props_Port As String = "Port"
-        Public Const Descr_Port As String = "Geben sie den Port ein auf dem das Protokoll auf Verbindungen wartet."
         Public Const Props_PuttySession As String = "Putty Session"
         Public Const Descr_PuttySession As String = "Wählen sie eine PuTTY session die bei Verbindung verwendet werden soll."
         Public Const Props_EncryrptionStrength As String = "Verschlüsselungsstärke"

mRemoteV1/Language/Language.EN.vb

@@ -1,23 +1,5 @@
 Namespace Language
     Public Class EN
-        Public Const Props_Name As String = "Name"
-        Public Const Descr_Name As String = "This is the name that will be displayed in the connections tree."
-        Public Const Props_Description As String = "Description"
-        Public Const Descr_Description As String = "Put your notes or a description for the host here."
-        Public Const Props_Icon As String = "Icon"
-        Public Const Descr_Icon As String = "Choose a icon that will be displayed when connected to the host."
-        Public Const Props_Panel As String = "Panel"
-        Public Const Descr_Panel As String = "Sets the panel in which the connection will open."
-        Public Const Props_Username As String = "Username"
-        Public Const Descr_Username As String = "Enter your username."
-        Public Const Props_Password As String = "Password"
-        Public Const Descr_Password As String = "Enter your password."
-        Public Const Props_Domain As String = "Domain"
-        Public Const Descr_Domain As String = "Enter your domain."
-        Public Const Props_Protocol As String = "Protocol"
-        Public Const Descr_Protocol As String = "Choose the protocol mRemoteNG should use to connect to the host."
-        Public Const Props_Port As String = "Port"
-        Public Const Descr_Port As String = "Enter the port the selected protocol is listening on."
         Public Const Props_PuttySession As String = "Putty Session"
         Public Const Descr_PuttySession As String = "Select a PuTTY session to be used when connecting."
         Public Const Props_EncryrptionStrength As String = "Encryption Strength"
@@ -91,13 +73,13 @@
         Public Const Props_RDGatewayDomain As String = "Gateway Domain"
         Public Const Descr_RDGatewayDomain As String = "Specifies the domain name that a user provides to connect to the RD Gateway server."
 
-        Public Const Props_General As String = "General"
-        Public Const Props_Display As String = "Display"
-        Public Const Props_Connection As String = "Connection"
-        Public Const Category_RDGateway As String = "Gateway"
-        Public Const Props_Appearance As String = "Appearance"
-        Public Const Props_Redirect As String = "Redirect"
-        Public Const Props_Misc As String = "Misc"
+        'Public Const Props_General As String = "General"
+        'Public Const Props_Display As String = "Display"
+        'Public Const Props_Connection As String = "Connection"
+        'Public Const Category_RDGateway As String = "Gateway"
+        'Public Const Props_Appearance As String = "Appearance"
+        'Public Const Props_Redirect As String = "Redirect"
+        'Public Const Props_Misc As String = "Misc"
         Public Const Props_InheritEverything As String = "Inherit Everything"
         Public Const Props_ExtApp As String = "Ext. App"
         Public Const Descr_ExtApp As String = "Select the Ext. App to be started."

mRemoteV1/Language/Resources.de.resx

@@ -159,10 +159,10 @@
   <data name="strConfirmResetLayout" xml:space="preserve">
     <value>Sind Sie sicher das Sie das Panel auf das Standartlayout zurücksetzen wollen?</value>
   </data>
-  <data name="strConnectionDescriptionColors" xml:space="preserve">
+  <data name="strPropertyDescriptionColors" xml:space="preserve">
     <value>Wählen sie die Farb Qualität.</value>
   </data>
-  <data name="strConnectionPropertyColors" xml:space="preserve">
+  <data name="strPropertyNameColors" xml:space="preserve">
     <value>Farben</value>
   </data>
   <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
@@ -558,10 +558,138 @@
   <data name="strMenuViewOnly" xml:space="preserve">
     <value>View-Only (VNC)</value>
   </data>
-  <data name="strConnectionDescriptionHostnameIP" xml:space="preserve">
+  <data name="strPropertyDescriptionHostnameIP" xml:space="preserve">
     <value>Der Hostname oder die IP zu der eine Verbinung aufgebaut werden soll.</value>
   </data>
-  <data name="strConnectionPropertyHostnameIP" xml:space="preserve">
+  <data name="strPropertyNameHostnameIP" xml:space="preserve">
     <value>Hostname/IP</value>
   </data>
+  <data name="strButtonIcon" xml:space="preserve">
+    <value>Icon</value>
+  </data>
+  <data name="strCategoryAppearance" xml:space="preserve">
+    <value>Aussehen</value>
+  </data>
+  <data name="strCategoryConnection" xml:space="preserve">
+    <value>Verbindung</value>
+  </data>
+  <data name="strCategoryCredentials" xml:space="preserve">
+    <value>Credentials</value>
+    <comment>Need translation</comment>
+  </data>
+  <data name="strCategoryDisplay" xml:space="preserve">
+    <value>Anzeige</value>
+  </data>
+  <data name="strCategoryGateway" xml:space="preserve">
+    <value>Gateway</value>
+    <comment>Need translation</comment>
+  </data>
+  <data name="strCategoryMiscellaneous" xml:space="preserve">
+    <value>Verschiedenes</value>
+  </data>
+  <data name="strCategoryProtocol" xml:space="preserve">
+    <value>Protokoll</value>
+  </data>
+  <data name="strCategoryRedirect" xml:space="preserve">
+    <value>Umleitung</value>
+  </data>
+  <data name="strColumnHostnameIP" xml:space="preserve">
+    <value>Hostname/IP</value>
+  </data>
+  <data name="strColumnUsername" xml:space="preserve">
+    <value>Benutzername</value>
+  </data>
+  <data name="strLabelDomain" xml:space="preserve">
+    <value>Domäne:</value>
+  </data>
+  <data name="strLabelPort" xml:space="preserve">
+    <value>Port:</value>
+  </data>
+  <data name="strLabelProtocol" xml:space="preserve">
+    <value>Protokoll:</value>
+  </data>
+  <data name="strLabelUsername" xml:space="preserve">
+    <value>Benutzername:</value>
+  </data>
+  <data name="strPropertyDescriptionDescription" xml:space="preserve">
+    <value>Put your notes or a description for the host here.</value>
+  </data>
+  <data name="strPropertyDescriptionDomain" xml:space="preserve">
+    <value>Geben sie hier ihre Domäne ein.</value>
+  </data>
+  <data name="strPropertyDescriptionIcon" xml:space="preserve">
+    <value>Das ausgewählte Icon wird bei Verbindung zum Host im Tab angezeigt.</value>
+  </data>
+  <data name="strPropertyDescriptionName" xml:space="preserve">
+    <value>Dies ist der Name der im Verbindungs Baum angezeigt wird.</value>
+  </data>
+  <data name="strPropertyDescriptionPanel" xml:space="preserve">
+    <value>Setzt das Panel in dem die Verbindung geöffnet wird.</value>
+  </data>
+  <data name="strPropertyDescriptionPassword" xml:space="preserve">
+    <value>Geben sie hier ihr Passwort ein.</value>
+  </data>
+  <data name="strPropertyDescriptionPort" xml:space="preserve">
+    <value>Geben sie den Port ein auf dem das Protokoll auf Verbindungen wartet.</value>
+  </data>
+  <data name="strPropertyDescriptionProtocol" xml:space="preserve">
+    <value>Wählen sie das Protokoll das verwendet werden soll um eine Verbindung aufzubauen.</value>
+  </data>
+  <data name="strPropertyDescriptionUsername" xml:space="preserve">
+    <value>Geben sie hier ihren Benutzernamen ein.</value>
+  </data>
+  <data name="strPropertyNameDescription" xml:space="preserve">
+    <value>Beschreibung</value>
+  </data>
+  <data name="strPropertyNameDomain" xml:space="preserve">
+    <value>Domäne</value>
+  </data>
+  <data name="strPropertyNameIcon" xml:space="preserve">
+    <value>Icon</value>
+  </data>
+  <data name="strPropertyNameInheritDescription" xml:space="preserve">
+    <value>Vererbe Beschreibung</value>
+  </data>
+  <data name="strPropertyNameInheritDomain" xml:space="preserve">
+    <value>Vererbe Domäne</value>
+  </data>
+  <data name="strPropertyNameInheritIcon" xml:space="preserve">
+    <value>Vererbe Icon</value>
+  </data>
+  <data name="strPropertyNameInheritPanel" xml:space="preserve">
+    <value>Vererbe Panel</value>
+  </data>
+  <data name="strPropertyNameInheritPassword" xml:space="preserve">
+    <value>Vererbe Passwort</value>
+  </data>
+  <data name="strPropertyNameInheritPort" xml:space="preserve">
+    <value>Vererbe Port</value>
+  </data>
+  <data name="strPropertyNameInheritProtocol" xml:space="preserve">
+    <value>Vererbe Protokoll</value>
+  </data>
+  <data name="strPropertyNameInheritUsername" xml:space="preserve">
+    <value>Vererbe Benutzername</value>
+  </data>
+  <data name="strPropertyNameName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="strPropertyNamePanel" xml:space="preserve">
+    <value>Panel</value>
+  </data>
+  <data name="strPropertyNamePassword" xml:space="preserve">
+    <value>Passwort</value>
+  </data>
+  <data name="strPropertyNamePort" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="strPropertyNameProtocol" xml:space="preserve">
+    <value>Protokoll</value>
+  </data>
+  <data name="strPropertyNameUsername" xml:space="preserve">
+    <value>Benutzername</value>
+  </data>
+  <data name="strTabAppearance" xml:space="preserve">
+    <value>Aussehen</value>
+  </data>
 </root>

mRemoteV1/Language/Resources.en-US.resx

@@ -117,10 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="strConnectionDescriptionColors" xml:space="preserve">
+  <data name="strPropertyDescriptionColors" xml:space="preserve">
     <value>Select the color quality to be used.</value>
   </data>
-  <data name="strConnectionPropertyColors" xml:space="preserve">
+  <data name="strPropertyNameColors" xml:space="preserve">
     <value>Colors</value>
   </data>
 </root>

mRemoteV1/My Project/Resources.Designer.vb

@@ -834,6 +834,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Icon.
+        '''</summary>
+        Friend ReadOnly Property strButtonIcon() As String
+            Get
+                Return ResourceManager.GetString("strButtonIcon", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to &amp;Import.
         '''</summary>
@@ -915,6 +924,78 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Appearance.
+        '''</summary>
+        Friend ReadOnly Property strCategoryAppearance() As String
+            Get
+                Return ResourceManager.GetString("strCategoryAppearance", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Connection.
+        '''</summary>
+        Friend ReadOnly Property strCategoryConnection() As String
+            Get
+                Return ResourceManager.GetString("strCategoryConnection", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Credentials.
+        '''</summary>
+        Friend ReadOnly Property strCategoryCredentials() As String
+            Get
+                Return ResourceManager.GetString("strCategoryCredentials", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Display.
+        '''</summary>
+        Friend ReadOnly Property strCategoryDisplay() As String
+            Get
+                Return ResourceManager.GetString("strCategoryDisplay", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Gateway.
+        '''</summary>
+        Friend ReadOnly Property strCategoryGateway() As String
+            Get
+                Return ResourceManager.GetString("strCategoryGateway", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Miscellaneous.
+        '''</summary>
+        Friend ReadOnly Property strCategoryMiscellaneous() As String
+            Get
+                Return ResourceManager.GetString("strCategoryMiscellaneous", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Protocol.
+        '''</summary>
+        Friend ReadOnly Property strCategoryProtocol() As String
+            Get
+                Return ResourceManager.GetString("strCategoryProtocol", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Redirect.
+        '''</summary>
+        Friend ReadOnly Property strCategoryRedirect() As String
+            Get
+                Return ResourceManager.GetString("strCategoryRedirect", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Automatically try to reconnect when disconnected from server (RDP &amp;&amp; ICA only).
         '''</summary>
@@ -1041,6 +1122,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Hostname/IP.
+        '''</summary>
+        Friend ReadOnly Property strColumnHostnameIP() As String
+            Get
+                Return ResourceManager.GetString("strColumnHostnameIP", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Message.
         '''</summary>
@@ -1050,6 +1140,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Username.
+        '''</summary>
+        Friend ReadOnly Property strColumnUsername() As String
+            Get
+                Return ResourceManager.GetString("strColumnUsername", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Wait For Exit.
         '''</summary>
@@ -1122,42 +1221,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Looks up a localized string similar to Select the colour quality to be used..
-        '''</summary>
-        Friend ReadOnly Property strConnectionDescriptionColors() As String
-            Get
-                Return ResourceManager.GetString("strConnectionDescriptionColors", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Enter the hostname or ip you want to connect to..
-        '''</summary>
-        Friend ReadOnly Property strConnectionDescriptionHostnameIP() As String
-            Get
-                Return ResourceManager.GetString("strConnectionDescriptionHostnameIP", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Colours.
-        '''</summary>
-        Friend ReadOnly Property strConnectionPropertyColors() As String
-            Get
-                Return ResourceManager.GetString("strConnectionPropertyColors", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Hostname/IP.
-        '''</summary>
-        Friend ReadOnly Property strConnectionPropertyHostnameIP() As String
-            Get
-                Return ResourceManager.GetString("strConnectionPropertyHostnameIP", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Looks up a localized string similar to Connections.
         '''</summary>
@@ -1329,6 +1392,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Domain:.
+        '''</summary>
+        Friend ReadOnly Property strLabelDomain() As String
+            Get
+                Return ResourceManager.GetString("strLabelDomain", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Filename:.
         '''</summary>
@@ -1356,6 +1428,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Port:.
+        '''</summary>
+        Friend ReadOnly Property strLabelPort() As String
+            Get
+                Return ResourceManager.GetString("strLabelPort", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Portable Edition.
         '''</summary>
@@ -1365,6 +1446,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Protocol:.
+        '''</summary>
+        Friend ReadOnly Property strLabelProtocol() As String
+            Get
+                Return ResourceManager.GetString("strLabelProtocol", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to To configure PuTTY sessions click this button:.
         '''</summary>
@@ -1419,6 +1509,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Username:.
+        '''</summary>
+        Friend ReadOnly Property strLabelUsername() As String
+            Get
+                Return ResourceManager.GetString("strLabelUsername", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Verify:.
         '''</summary>
@@ -2049,6 +2148,276 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Select the colour quality to be used..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionColors() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionColors", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Put your notes or a description for the host here..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionDescription() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionDescription", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Enter your domain..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionDomain() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionDomain", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Enter the hostname or ip you want to connect to..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionHostnameIP() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionHostnameIP", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Choose a icon that will be displayed when connected to the host..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionIcon() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionIcon", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to This is the name that will be displayed in the connections tree..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionName() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Sets the panel in which the connection will open..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionPanel() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionPanel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Enter your password..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionPassword() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionPassword", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Enter the port the selected protocol is listening on..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionPort() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionPort", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Choose the protocol mRemoteNG should use to connect to the host..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionProtocol() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionProtocol", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Enter your username..
+        '''</summary>
+        Friend ReadOnly Property strPropertyDescriptionUsername() As String
+            Get
+                Return ResourceManager.GetString("strPropertyDescriptionUsername", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Colours.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameColors() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameColors", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Description.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameDescription() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameDescription", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Domain.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameDomain() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameDomain", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Hostname/IP.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameHostnameIP() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameHostnameIP", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Icon.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameIcon() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameIcon", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Description.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritDescription() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritDescription", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Domain.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritDomain() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritDomain", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Icon.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritIcon() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritIcon", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Panel.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritPanel() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritPanel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Password.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritPassword() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritPassword", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Port.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritPort() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritPort", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Protocol.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritProtocol() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritProtocol", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Inherit Username.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameInheritUsername() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameInheritUsername", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Name.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameName() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Panel.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNamePanel() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNamePanel", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Password.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNamePassword() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNamePassword", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Port.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNamePort() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNamePort", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Protocol.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameProtocol() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameProtocol", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Username.
+        '''</summary>
+        Friend ReadOnly Property strPropertyNameUsername() As String
+            Get
+                Return ResourceManager.GetString("strPropertyNameUsername", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Aspect.
         '''</summary>
@@ -2094,6 +2463,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Appearance.
+        '''</summary>
+        Friend ReadOnly Property strTabAppearance() As String
+            Get
+                Return ResourceManager.GetString("strTabAppearance", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Error ({0}).
         '''</summary>

mRemoteV1/My Project/Resources.resx

@@ -550,10 +550,10 @@
   <data name="strButtonStop" xml:space="preserve">
     <value>&amp;Stop</value>
   </data>
-  <data name="strConnectionDescriptionColors" xml:space="preserve">
+  <data name="strPropertyDescriptionColors" xml:space="preserve">
     <value>Select the colour quality to be used.</value>
   </data>
-  <data name="strConnectionPropertyColors" xml:space="preserve">
+  <data name="strPropertyNameColors" xml:space="preserve">
     <value>Colours</value>
   </data>
   <data name="strInactive" xml:space="preserve">
@@ -916,10 +916,136 @@
   <data name="strMenuViewOnly" xml:space="preserve">
     <value>View Only (VNC)</value>
   </data>
-  <data name="strConnectionDescriptionHostnameIP" xml:space="preserve">
+  <data name="strPropertyDescriptionHostnameIP" xml:space="preserve">
     <value>Enter the hostname or ip you want to connect to.</value>
   </data>
-  <data name="strConnectionPropertyHostnameIP" xml:space="preserve">
+  <data name="strPropertyNameHostnameIP" xml:space="preserve">
     <value>Hostname/IP</value>
   </data>
+  <data name="strButtonIcon" xml:space="preserve">
+    <value>Icon</value>
+  </data>
+  <data name="strCategoryAppearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
+  <data name="strCategoryConnection" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="strCategoryCredentials" xml:space="preserve">
+    <value>Credentials</value>
+  </data>
+  <data name="strCategoryDisplay" xml:space="preserve">
+    <value>Display</value>
+  </data>
+  <data name="strCategoryGateway" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="strCategoryMiscellaneous" xml:space="preserve">
+    <value>Miscellaneous</value>
+  </data>
+  <data name="strCategoryProtocol" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="strCategoryRedirect" xml:space="preserve">
+    <value>Redirect</value>
+  </data>
+  <data name="strColumnHostnameIP" xml:space="preserve">
+    <value>Hostname/IP</value>
+  </data>
+  <data name="strColumnUsername" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="strLabelDomain" xml:space="preserve">
+    <value>Domain:</value>
+  </data>
+  <data name="strLabelPort" xml:space="preserve">
+    <value>Port:</value>
+  </data>
+  <data name="strLabelProtocol" xml:space="preserve">
+    <value>Protocol:</value>
+  </data>
+  <data name="strLabelUsername" xml:space="preserve">
+    <value>Username:</value>
+  </data>
+  <data name="strPropertyDescriptionDescription" xml:space="preserve">
+    <value>Put your notes or a description for the host here.</value>
+  </data>
+  <data name="strPropertyDescriptionDomain" xml:space="preserve">
+    <value>Enter your domain.</value>
+  </data>
+  <data name="strPropertyDescriptionIcon" xml:space="preserve">
+    <value>Choose a icon that will be displayed when connected to the host.</value>
+  </data>
+  <data name="strPropertyDescriptionName" xml:space="preserve">
+    <value>This is the name that will be displayed in the connections tree.</value>
+  </data>
+  <data name="strPropertyDescriptionPanel" xml:space="preserve">
+    <value>Sets the panel in which the connection will open.</value>
+  </data>
+  <data name="strPropertyDescriptionPassword" xml:space="preserve">
+    <value>Enter your password.</value>
+  </data>
+  <data name="strPropertyDescriptionPort" xml:space="preserve">
+    <value>Enter the port the selected protocol is listening on.</value>
+  </data>
+  <data name="strPropertyDescriptionProtocol" xml:space="preserve">
+    <value>Choose the protocol mRemoteNG should use to connect to the host.</value>
+  </data>
+  <data name="strPropertyDescriptionUsername" xml:space="preserve">
+    <value>Enter your username.</value>
+  </data>
+  <data name="strPropertyNameDescription" xml:space="preserve">
+    <value>Description</value>
+  </data>
+  <data name="strPropertyNameDomain" xml:space="preserve">
+    <value>Domain</value>
+  </data>
+  <data name="strPropertyNameIcon" xml:space="preserve">
+    <value>Icon</value>
+  </data>
+  <data name="strPropertyNameInheritDescription" xml:space="preserve">
+    <value>Inherit Description</value>
+  </data>
+  <data name="strPropertyNameInheritDomain" xml:space="preserve">
+    <value>Inherit Domain</value>
+  </data>
+  <data name="strPropertyNameInheritIcon" xml:space="preserve">
+    <value>Inherit Icon</value>
+  </data>
+  <data name="strPropertyNameInheritPanel" xml:space="preserve">
+    <value>Inherit Panel</value>
+  </data>
+  <data name="strPropertyNameInheritPassword" xml:space="preserve">
+    <value>Inherit Password</value>
+  </data>
+  <data name="strPropertyNameInheritPort" xml:space="preserve">
+    <value>Inherit Port</value>
+  </data>
+  <data name="strPropertyNameInheritProtocol" xml:space="preserve">
+    <value>Inherit Protocol</value>
+  </data>
+  <data name="strPropertyNameInheritUsername" xml:space="preserve">
+    <value>Inherit Username</value>
+  </data>
+  <data name="strPropertyNameName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="strPropertyNamePanel" xml:space="preserve">
+    <value>Panel</value>
+  </data>
+  <data name="strPropertyNamePassword" xml:space="preserve">
+    <value>Password</value>
+  </data>
+  <data name="strPropertyNamePort" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="strPropertyNameProtocol" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="strPropertyNameUsername" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="strTabAppearance" xml:space="preserve">
+    <value>Appearance</value>
+  </data>
 </root>

mRemoteV1/Root/Root.Info.vb

@@ -1,6 +1,6 @@
 Imports System.Windows.Forms
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
+Imports mRemote.Tools.LocalizedAttributes
 
 Namespace Root
     <DefaultProperty("Name")> _
@@ -11,15 +11,15 @@ Namespace Root
 
 #Region "Properties"
         Private _Name As String = "Connections"
-        <Category(Category1 & "Display"), _
-           Browsable(True), _
-           [ReadOnly](False), _
-           Bindable(False), _
-           DefaultValue(""), _
-           DesignOnly(False), _
-           DisplayName(Language.Base.Props_Name), _
-           Description("Enter a name"), _
-           Attributes.Root()> _
+        <LocalizedCategory("strCategoryDisplay", 1), _
+            Browsable(True), _
+            [ReadOnly](False), _
+            Bindable(False), _
+            DefaultValue(""), _
+            DesignOnly(False), _
+            LocalizedDisplayName("strPropertyNameName"), _
+            LocalizedDescription("strPropertyDescriptionName"), _
+            Attributes.Root()> _
         Public Property Name() As String
             Get
                 Return Me._Name
@@ -30,7 +30,7 @@ Namespace Root
         End Property
 
         Private _Password As Boolean
-        <Category(Category1 & "Display"), _
+        <LocalizedCategory("strCategoryDisplay", 1), _
            Browsable(True), _
            [ReadOnly](False), _
            Bindable(False), _

mRemoteV1/Tools/Tools.LocalizedAttributes.vb

@@ -2,14 +2,40 @@
 
 Namespace Tools
     Public Class LocalizedAttributes
+        <AttributeUsage(AttributeTargets.All, AllowMultiple:=False, Inherited:=True)> _
+        Public Class LocalizedCategoryAttribute
+            Inherits CategoryAttribute
+
+            Private Const MaxOrder As Integer = 10
+            Private Order As Integer
+
+            Public Sub New(ByVal value As String, Optional ByVal Order As Integer = 1)
+                MyBase.New(value)
+                If Order > LocalizedCategoryAttribute.MaxOrder Then
+                    Me.Order = LocalizedCategoryAttribute.MaxOrder
+                Else
+                    Me.Order = Order
+                End If
+            End Sub
+
+            Protected Overrides Function GetLocalizedString(ByVal value As String) As String
+                Dim OrderPrefix As String = ""
+                For x As Integer = 0 To LocalizedCategoryAttribute.MaxOrder - Me.Order
+                    OrderPrefix &= vbTab
+                Next
+
+                Return OrderPrefix & My.Resources.ResourceManager.GetString(value)
+            End Function
+        End Class
+
         <AttributeUsage(AttributeTargets.All, AllowMultiple:=False, Inherited:=True)> _
         Public Class LocalizedDisplayNameAttribute
             Inherits DisplayNameAttribute
 
             Private Localized As Boolean
 
-            Public Sub New(ByVal Text As String)
-                MyBase.New(Text)
+            Public Sub New(ByVal value As String)
+                MyBase.New(value)
                 Me.Localized = False
             End Sub
 
@@ -31,8 +57,8 @@ Namespace Tools
 
             Private Localized As Boolean
 
-            Public Sub New(ByVal Text As String)
-                MyBase.New(Text)
+            Public Sub New(ByVal value As String)
+                MyBase.New(value)
                 Me.Localized = False
             End Sub
 

mRemoteV1/Tools/Tools.Misc.vb

@@ -200,26 +200,6 @@ Namespace Tools
             Return Nothing
         End Function
 
-        Public Class PropertyGridCategory
-            Public Const Category1 As String = vbCr & vbCr & vbCr & vbCr & vbCr & vbCr & vbCr & vbCr
-            Public Const Category2 As String = vbCr & vbCr & vbCr & vbCr & vbCr & vbCr & vbCr
-            Public Const Category3 As String = vbCr & vbCr & vbCr & vbCr & vbCr & vbCr
-            Public Const Category4 As String = vbCr & vbCr & vbCr & vbCr & vbCr
-            Public Const Category5 As String = vbCr & vbCr & vbCr & vbCr
-            Public Const Category6 As String = vbCr & vbCr & vbCr
-            Public Const Category7 As String = vbCr & vbCr
-            Public Const Category8 As String = vbCr
-        End Class
-
-        Public Class PropertyGridValue
-            Public Const Value1 As String = vbCr & vbCr & vbCr & vbCr & vbCr & vbCr
-            Public Const Value2 As String = vbCr & vbCr & vbCr & vbCr & vbCr
-            Public Const Value3 As String = vbCr & vbCr & vbCr & vbCr
-            Public Const Value4 As String = vbCr & vbCr & vbCr
-            Public Const Value5 As String = vbCr & vbCr
-            Public Const Value6 As String = vbCr
-        End Class
-
         Public Class EnumTypeConverter
             Inherits EnumConverter
             Private _enumType As System.Type

mRemoteV1/UI/UI.Window.ADImport.vb

@@ -126,7 +126,7 @@ Namespace UI
             Private Sub ApplyLanguage()
                 btnOK.Text = My.Resources.strButtonOK
                 btnCancel.Text = My.Resources.strButtonCancel
-                lblDomain.Text = Language.Base.Props_Domain & ":"
+                lblDomain.Text = My.Resources.strLabelDomain
                 btnChangeDomain.Text = My.Resources.strButtonChange
             End Sub
 #End Region

mRemoteV1/UI/UI.Window.Config.vb

@@ -432,7 +432,7 @@ Namespace UI
                 btnShowDefaultInheritance.Text = My.Resources.strButtonDefaultInheritance
                 btnShowProperties.Text = My.Resources.strButtonProperties
                 btnShowDefaultProperties.Text = My.Resources.strButtonDefaultProperties
-                btnIcon.Text = Language.Base.Props_Icon
+                btnIcon.Text = My.Resources.strButtonIcon
                 btnHostStatus.Text = My.Resources.strStatus
                 Text = My.Resources.strMenuConfig
                 TabText = My.Resources.strMenuConfig
@@ -442,18 +442,18 @@ Namespace UI
                 Try
                     If TypeOf Me.pGrid.SelectedObject Is mRemote.Connection.Info Then
                         Select Case e.ChangedItem.Label
-                            Case Language.Base.Props_Protocol
+                            Case My.Resources.strPropertyNameProtocol
                                 TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).SetDefaultPort()
-                            Case Language.Base.Props_Name
+                            Case My.Resources.strPropertyNameName
                                 App.Runtime.Windows.treeForm.tvConnections.SelectedNode.Text = Me.pGrid.SelectedObject.Name
-                            Case Language.Base.Props_Icon
+                            Case My.Resources.strPropertyNameIcon
                                 Dim conIcon As Icon = mRemote.Connection.Icon.FromString(TryCast(Me.pGrid.SelectedObject, mRemote.Connection.Info).Icon)
                                 If conIcon IsNot Nothing Then
                                     Me.btnIcon.Image = conIcon.ToBitmap
                                 End If
                             Case Language.Base.Props_PuttySession
                                 mRemote.Connection.PuttySession.PuttySessions = mRemote.Connection.Protocol.PuttyBase.GetSessions()
-                            Case Language.Base.Props_HostnameIP
+                            Case My.Resources.strPropertyNameHostnameIP
                                 Me.SetHostStatus(Me.pGrid.SelectedObject)
                         End Select
 
@@ -476,7 +476,7 @@ Namespace UI
                                         rInfo.Password = False
                                     End If
                                 End If
-                            Case Language.Base.Props_Name
+                            Case My.Resources.strPropertyNameName
                                 App.Runtime.Windows.treeForm.tvConnections.SelectedNode.Text = Me.pGrid.SelectedObject.Name
                         End Select
                     End If

mRemoteV1/UI/UI.Window.Options.vb

@@ -1671,9 +1671,9 @@ Namespace UI
                 Label1.Text = My.Resources.strLabelPuttyTimeout
                 chkAutomaticReconnect.Text = My.Resources.strCheckboxAutomaticReconnect
                 lblProxyAddress.Text = My.Resources.strLabelAddress
-                lblProxyPort.Text = Language.Base.Props_Port & ":"
-                lblProxyUsername.Text = Language.Base.Props_Username & ":"
-                lblProxyPassword.Text = Language.Base.Props_Password & ":"
+                lblProxyPort.Text = My.Resources.strLabelPort
+                lblProxyUsername.Text = My.Resources.strLabelUsername
+                lblProxyPassword.Text = My.Resources.strLabelPassword
                 chkUseProxyAuthentication.Text = My.Resources.strCheckboxProxyAuthentication
                 chkUseProxyForAutomaticUpdates.Text = My.Resources.strCheckboxUpdateUseProxy
                 lblConfigurePuttySessions.Text = My.Resources.strLabelPuttySessionsConfig
@@ -1688,7 +1688,7 @@ Namespace UI
                 chkCheckForUpdatesOnStartup.Text = Language.Base.CheckForUpdatesOnStartup
                 chkConfirmExit.Text = Language.Base.ConfirmExit
                 chkSaveConsOnExit.Text = Language.Base.SaveConsOnExit
-                tabAppearance.Title = Language.Base.Props_Appearance
+                tabAppearance.Title = My.Resources.strTabAppearance
                 chkMinimizeToSystemTray.Text = Language.Base.MinimizeToSysTray
                 chkShowFullConnectionsFilePathInTitle.Text = Language.Base.ShowFullConsFilePath
                 chkShowSystemTrayIcon.Text = Language.Base.AlwaysShowSysTrayIcon
@@ -1704,14 +1704,14 @@ Namespace UI
                 grpExperimental.Text = Language.Base.Experimental.ToUpper
                 chkUseSQLServer.Text = Language.Base.UseSQLServer
                 lblSQLInfo.Text = Language.Base.SQLInfo
-                lblSQLUsername.Text = Language.Base.Props_Username & ":"
+                lblSQLUsername.Text = My.Resources.strLabelUsername
                 lblSQLServer.Text = Language.Base.SQLServer & ":"
-                lblSQLPassword.Text = Language.Base.Props_Password & ":"
+                lblSQLPassword.Text = My.Resources.strLabelPassword
                 lblAutoSave2.Text = Language.Base.AutoSaveMins
                 lblAutoSave1.Text = Language.Base.AutoSaveEvery
-                lblCredentialsDomain.Text = Language.Base.Props_Domain & ":"
-                lblCredentialsPassword.Text = Language.Base.Props_Password & ":"
-                lblCredentialsUsername.Text = Language.Base.Props_Username & ":"
+                lblCredentialsDomain.Text = My.Resources.strLabelDomain
+                lblCredentialsPassword.Text = My.Resources.strLabelPassword
+                lblCredentialsUsername.Text = My.Resources.strLabelUsername
                 radCredentialsCustom.Text = Language.Base.TheFollowing & ":"
                 radCredentialsWindows.Text = Language.Base.MyCurrentWindowsCreds
                 radCredentialsNoInfo.Text = Language.Base.NoInformation

mRemoteV1/UI/UI.Window.PortScan.vb

@@ -396,7 +396,7 @@ Namespace UI
                 btnCancel.Text = My.Resources.strButtonCancel
                 btnImport.Text = My.Resources.strButtonImport
                 lblOnlyImport.Text = Language.Base.ProtocolToImport & ":"
-                clmHost.Text = Language.Base.Props_HostnameIP
+                clmHost.Text = My.Resources.strColumnHostnameIP
                 clmOpenPorts.Text = Language.Base.OpenPorts
                 clmClosedPorts.Text = Language.Base.ClosedPorts
                 Label2.Text = Language.Base.EndPort & ":"

mRemoteV1/UI/UI.Window.SSHTransfer.vb

@@ -179,7 +179,7 @@ Namespace UI
                 Me.lblProtocol.Name = "lblProtocol"
                 Me.lblProtocol.Size = New System.Drawing.Size(49, 13)
                 Me.lblProtocol.TabIndex = 90
-                Me.lblProtocol.Text = Language.Base.Props_Protocol & ":"
+                Me.lblProtocol.Text = My.Resources.strLabelProtocol
                 '
                 'lblPassword
                 '
@@ -188,7 +188,7 @@ Namespace UI
                 Me.lblPassword.Name = "lblPassword"
                 Me.lblPassword.Size = New System.Drawing.Size(56, 13)
                 Me.lblPassword.TabIndex = 70
-                Me.lblPassword.Text = Language.Base.Props_Password & ":"
+                Me.lblPassword.Text = My.Resources.strLabelPassword
                 '
                 'lblUser
                 '
@@ -207,7 +207,7 @@ Namespace UI
                 Me.lblPort.Name = "lblPort"
                 Me.lblPort.Size = New System.Drawing.Size(29, 13)
                 Me.lblPort.TabIndex = 30
-                Me.lblPort.Text = Language.Base.Props_Port & ":"
+                Me.lblPort.Text = My.Resources.strLabelPort
                 '
                 'lblHost
                 '
@@ -355,10 +355,10 @@ Namespace UI
                 lblRemoteFile.Text = Language.Base.RemoteFile & ":"
                 btnBrowse.Text = My.Resources.strButtonBrowse
                 grpConnection.Text = My.Resources.strGroupboxConnection
-                lblProtocol.Text = Language.Base.Props_Protocol & ":"
-                lblPassword.Text = Language.Base.Props_Password & ":"
+                lblProtocol.Text = My.Resources.strLabelProtocol
+                lblPassword.Text = My.Resources.strLabelPassword
                 lblUser.Text = Language.Base.User & ":"
-                lblPort.Text = Language.Base.Props_Port & ":"
+                lblPort.Text = My.Resources.strLabelPort
                 lblHost.Text = Language.Base.Host & ":"
                 btnTransfer.Text = Language.Base.Transfer
                 TabText = My.Resources.strMenuSSHFileTransfer

mRemoteV1/UI/UI.Window.Sessions.vb

@@ -51,7 +51,7 @@ Namespace UI
                 '
                 'clmSesUsername
                 '
-                Me.clmSesUsername.Text = Language.Base.Props_Username
+                Me.clmSesUsername.Text = My.Resources.strColumnUsername
                 Me.clmSesUsername.Width = 80
                 '
                 'clmSesActivity
@@ -127,7 +127,7 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                clmSesUsername.Text = Language.Base.Props_Username
+                clmSesUsername.Text = My.Resources.strColumnUsername
                 clmSesActivity.Text = Language.Base.Activity
                 clmSesType.Text = Language.Base.Type
                 cMenSessionRefresh.Text = Language.Base.Refresh