diff --git a/mRemoteV1/Connection/Connection.Info.vb b/mRemoteV1/Connection/Connection.Info.vb index d2ea2b458..0d6014407 100644 --- a/mRemoteV1/Connection/Connection.Info.vb +++ b/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" - _ + _ Public Property Name() As String Get Return Me._Name @@ -24,10 +23,10 @@ Namespace Connection End Property Private _Description As String = My.Settings.ConDefaultDescription - _ + 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 - _ + 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 - _ + 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 = "" - _ + 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 - _ + 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 - _ Public Property Password() As String Get @@ -171,10 +170,10 @@ Namespace Connection End Property Private _Domain As String = My.Settings.ConDefaultDomain - _ + 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) - _ Public Property Protocol() As Connection.Protocol.Protocols Get @@ -225,7 +224,7 @@ Namespace Connection End Property Private _ExtApp As String = My.Settings.ConDefaultExtApp - _ + 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 - _ @@ -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) - _ @@ -520,7 +519,7 @@ Namespace Connection End Property Private _RDGatewayPassword As String - _ @@ -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) - _ Public Property Colors() As Connection.Protocol.RDP.RDPColors Get @@ -628,7 +627,7 @@ Namespace Connection End Property Private _CacheBitmaps As Boolean = My.Settings.ConDefaultCacheBitmaps - _ @@ -953,7 +952,7 @@ Namespace Connection End Property Private _UserField As String = My.Settings.ConDefaultUserField - _ @@ -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) - _ + _ 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) - _ @@ -1115,7 +1114,7 @@ Namespace Connection End Property Private _VNCProxyPort As Integer = My.Settings.ConDefaultVNCProxyPort - _ @@ -1141,7 +1140,7 @@ Namespace Connection End Property Private _VNCProxyUsername As String = My.Settings.ConDefaultVNCProxyUsername - _ @@ -1167,7 +1166,7 @@ Namespace Connection End Property Private _VNCProxyPassword As String = My.Settings.ConDefaultVNCProxyPassword - _ + _ 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) - _ + _ 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 - _ + _ 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" - _ - Public Property EverythingInherited() As Boolean + _ + 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 - _ Public Property Description() As Boolean Get @@ -1587,9 +1586,9 @@ Namespace Connection End Property Private _Icon As Boolean = My.Settings.InhDefaultIcon - _ Public Property Icon() As Boolean Get @@ -1601,9 +1600,9 @@ Namespace Connection End Property Private _Panel As Boolean = My.Settings.InhDefaultPanel - _ Public Property Panel() As Boolean Get @@ -1616,9 +1615,9 @@ Namespace Connection #End Region #Region "3 Connection" Private _Username As Boolean = My.Settings.InhDefaultUsername - _ Public Property Username() As Boolean Get @@ -1630,9 +1629,9 @@ Namespace Connection End Property Private _Password As Boolean = My.Settings.InhDefaultPassword - _ Public Property Password() As Boolean Get @@ -1644,9 +1643,9 @@ Namespace Connection End Property Private _Domain As Boolean = My.Settings.InhDefaultDomain - _ Public Property Domain() As Boolean Get @@ -1659,9 +1658,9 @@ Namespace Connection #End Region #Region "4 Protocol" Private _Protocol As Boolean = My.Settings.InhDefaultProtocol - _ Public Property Protocol() As Boolean Get @@ -1673,7 +1672,7 @@ Namespace Connection End Property Private _ExtApp As Boolean = My.Settings.InhDefaultExtApp - _ @@ -1687,9 +1686,9 @@ Namespace Connection End Property Private _Port As Boolean = My.Settings.InhDefaultPort - _ Public Property Port() As Boolean Get @@ -1701,7 +1700,7 @@ Namespace Connection End Property Private _PuttySession As Boolean = My.Settings.InhDefaultPuttySession - _ @@ -1715,7 +1714,7 @@ Namespace Connection End Property Private _ICAEncryption As Boolean = My.Settings.InhDefaultICAEncryptionStrength - _ @@ -1729,7 +1728,7 @@ Namespace Connection End Property Private _RDPAuthenticationLevel As Boolean = My.Settings.InhDefaultRDPAuthenticationLevel - _ @@ -1743,7 +1742,7 @@ Namespace Connection End Property Private _RenderingEngine As Boolean = My.Settings.InhDefaultRenderingEngine - _ @@ -1757,7 +1756,7 @@ Namespace Connection End Property Private _UseConsoleSession As Boolean = My.Settings.InhDefaultUseConsoleSession - _ @@ -1772,7 +1771,7 @@ Namespace Connection #End Region #Region "5 RD Gateway" Private _RDGatewayUsageMethod As Boolean = False - _ @@ -1786,7 +1785,7 @@ Namespace Connection End Property Private _RDGatewayHostname As Boolean = False - _ @@ -1800,7 +1799,7 @@ Namespace Connection End Property Private _RDGatewayUseConnectionCredentials As Boolean = False - _ @@ -1814,7 +1813,7 @@ Namespace Connection End Property Private _RDGatewayUsername As Boolean = False - _ @@ -1828,7 +1827,7 @@ Namespace Connection End Property Private _RDGatewayPassword As Boolean = False - _ @@ -1842,7 +1841,7 @@ Namespace Connection End Property Private _RDGatewayDomain As Boolean = False - _ @@ -1857,7 +1856,7 @@ Namespace Connection #End Region #Region "6 Appearance" Private _Resolution As Boolean = My.Settings.InhDefaultResolution - _ @@ -1871,7 +1870,7 @@ Namespace Connection End Property Private _Colors As Boolean = My.Settings.InhDefaultColors - _ @@ -1885,7 +1884,7 @@ Namespace Connection End Property Private _CacheBitmaps As Boolean = My.Settings.InhDefaultCacheBitmaps - _ @@ -1899,7 +1898,7 @@ Namespace Connection End Property Private _DisplayWallpaper As Boolean = My.Settings.InhDefaultDisplayWallpaper - _ @@ -1913,7 +1912,7 @@ Namespace Connection End Property Private _DisplayThemes As Boolean = My.Settings.InhDefaultDisplayThemes - _ @@ -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 - _ @@ -1942,7 +1941,7 @@ Namespace Connection End Property Private _RedirectDiskDrives As Boolean = My.Settings.InhDefaultRedirectDiskDrives - _ @@ -1956,7 +1955,7 @@ Namespace Connection End Property Private _RedirectPrinters As Boolean = My.Settings.InhDefaultRedirectPrinters - _ @@ -1970,7 +1969,7 @@ Namespace Connection End Property Private _RedirectPorts As Boolean = My.Settings.InhDefaultRedirectPorts - _ @@ -1984,7 +1983,7 @@ Namespace Connection End Property Private _RedirectSmartCards As Boolean = My.Settings.InhDefaultRedirectSmartCards - _ @@ -1998,7 +1997,7 @@ Namespace Connection End Property Private _RedirectSound As Boolean = My.Settings.InhDefaultRedirectSound - _ @@ -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 - _ @@ -2027,7 +2026,7 @@ Namespace Connection End Property Private _PostExtApp As Boolean = My.Settings.InhDefaultPostExtApp - _ @@ -2041,7 +2040,7 @@ Namespace Connection End Property Private _MacAddress As Boolean = My.Settings.InhDefaultMacAddress - _ @@ -2055,7 +2054,7 @@ Namespace Connection End Property Private _UserField As Boolean = My.Settings.InhDefaultUserField - _ @@ -2070,7 +2069,7 @@ Namespace Connection #End Region #Region "VNC" Private _VNCCompression As Boolean = My.Settings.InhDefaultVNCCompression - _ @@ -2084,7 +2083,7 @@ Namespace Connection End Property Private _VNCEncoding As Boolean = My.Settings.InhDefaultVNCEncoding - _ @@ -2098,7 +2097,7 @@ Namespace Connection End Property Private _VNCAuthMode As Boolean = My.Settings.InhDefaultVNCAuthMode - _ @@ -2112,7 +2111,7 @@ Namespace Connection End Property Private _VNCProxyType As Boolean = My.Settings.InhDefaultVNCProxyType - _ @@ -2126,7 +2125,7 @@ Namespace Connection End Property Private _VNCProxyIP As Boolean = My.Settings.InhDefaultVNCProxyIP - _ @@ -2140,7 +2139,7 @@ Namespace Connection End Property Private _VNCProxyPort As Boolean = My.Settings.InhDefaultVNCProxyPort - _ @@ -2154,7 +2153,7 @@ Namespace Connection End Property Private _VNCProxyUsername As Boolean = My.Settings.InhDefaultVNCProxyUsername - _ @@ -2168,7 +2167,7 @@ Namespace Connection End Property Private _VNCProxyPassword As Boolean = My.Settings.InhDefaultVNCProxyPassword - _ @@ -2182,7 +2181,7 @@ Namespace Connection End Property Private _VNCColors As Boolean = My.Settings.InhDefaultVNCColors - _ @@ -2196,7 +2195,7 @@ Namespace Connection End Property Private _VNCSmartSizeMode As Boolean = My.Settings.InhDefaultVNCSmartSizeMode - _ @@ -2210,7 +2209,7 @@ Namespace Connection End Property Private _VNCViewOnly As Boolean = My.Settings.InhDefaultVNCViewOnly - _ diff --git a/mRemoteV1/Container/Container.Info.vb b/mRemoteV1/Container/Container.Info.vb index 99b0b8019..cd408164e 100644 --- a/mRemoteV1/Container/Container.Info.vb +++ b/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 _ Public Class Info #Region "Properties" Private _Name As String = "New Container" - _ + _ Public Property Name() As String Get Return Me._ConnectionInfo.Name diff --git a/mRemoteV1/Credential/Credential.Info.vb b/mRemoteV1/Credential/Credential.Info.vb index ac9e477c3..69fc4cd18 100644 --- a/mRemoteV1/Credential/Credential.Info.vb +++ b/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 - _ + _ Public Property Name() As String Get Return _Name @@ -20,10 +19,10 @@ Namespace Credential End Property Private _Description As String - _ + _ Public Property Description() As String Get Return _Description @@ -35,10 +34,10 @@ Namespace Credential #End Region #Region "2 Credentials" Private _Username As String - _ + LocalizedDisplayName("strPropertyNameUsername"), _ + LocalizedDescription("strPropertyDescriptionUsername")> _ Public Property Username() As String Get Return _Username @@ -49,10 +48,10 @@ Namespace Credential End Property Private _Password As String - _ Public Property Password() As String Get @@ -64,10 +63,10 @@ Namespace Credential End Property Private _Domain As String - _ + LocalizedDisplayName("strPropertyNameDomain"), _ + LocalizedDescription("strPropertyDescriptionDomain")> _ Public Property Domain() As String Get Return _Domain diff --git a/mRemoteV1/Language/Language.DE.vb b/mRemoteV1/Language/Language.DE.vb index 800ec2bdb..3917c7d31 100644 --- a/mRemoteV1/Language/Language.DE.vb +++ b/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" diff --git a/mRemoteV1/Language/Language.EN.vb b/mRemoteV1/Language/Language.EN.vb index 759b87262..a9fc218e9 100644 --- a/mRemoteV1/Language/Language.EN.vb +++ b/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." diff --git a/mRemoteV1/Language/Resources.de.resx b/mRemoteV1/Language/Resources.de.resx index 1e5d6c5ad..bd950d47f 100644 --- a/mRemoteV1/Language/Resources.de.resx +++ b/mRemoteV1/Language/Resources.de.resx @@ -159,10 +159,10 @@ Sind Sie sicher das Sie das Panel auf das Standartlayout zurücksetzen wollen? - + Wählen sie die Farb Qualität. - + Farben @@ -558,10 +558,138 @@ View-Only (VNC) - + Der Hostname oder die IP zu der eine Verbinung aufgebaut werden soll. - + Hostname/IP + + Icon + + + Aussehen + + + Verbindung + + + Credentials + Need translation + + + Anzeige + + + Gateway + Need translation + + + Verschiedenes + + + Protokoll + + + Umleitung + + + Hostname/IP + + + Benutzername + + + Domäne: + + + Port: + + + Protokoll: + + + Benutzername: + + + Put your notes or a description for the host here. + + + Geben sie hier ihre Domäne ein. + + + Das ausgewählte Icon wird bei Verbindung zum Host im Tab angezeigt. + + + Dies ist der Name der im Verbindungs Baum angezeigt wird. + + + Setzt das Panel in dem die Verbindung geöffnet wird. + + + Geben sie hier ihr Passwort ein. + + + Geben sie den Port ein auf dem das Protokoll auf Verbindungen wartet. + + + Wählen sie das Protokoll das verwendet werden soll um eine Verbindung aufzubauen. + + + Geben sie hier ihren Benutzernamen ein. + + + Beschreibung + + + Domäne + + + Icon + + + Vererbe Beschreibung + + + Vererbe Domäne + + + Vererbe Icon + + + Vererbe Panel + + + Vererbe Passwort + + + Vererbe Port + + + Vererbe Protokoll + + + Vererbe Benutzername + + + Name + + + Panel + + + Passwort + + + Port + + + Protokoll + + + Benutzername + + + Aussehen + \ No newline at end of file diff --git a/mRemoteV1/Language/Resources.en-US.resx b/mRemoteV1/Language/Resources.en-US.resx index 9e639d1f5..3b0eae428 100644 --- a/mRemoteV1/Language/Resources.en-US.resx +++ b/mRemoteV1/Language/Resources.en-US.resx @@ -117,10 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Select the color quality to be used. - + Colors \ No newline at end of file diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index baaa7d174..388592162 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -834,6 +834,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Icon. + ''' + Friend ReadOnly Property strButtonIcon() As String + Get + Return ResourceManager.GetString("strButtonIcon", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to &Import. ''' @@ -915,6 +924,78 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Appearance. + ''' + Friend ReadOnly Property strCategoryAppearance() As String + Get + Return ResourceManager.GetString("strCategoryAppearance", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Connection. + ''' + Friend ReadOnly Property strCategoryConnection() As String + Get + Return ResourceManager.GetString("strCategoryConnection", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Credentials. + ''' + Friend ReadOnly Property strCategoryCredentials() As String + Get + Return ResourceManager.GetString("strCategoryCredentials", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Display. + ''' + Friend ReadOnly Property strCategoryDisplay() As String + Get + Return ResourceManager.GetString("strCategoryDisplay", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Gateway. + ''' + Friend ReadOnly Property strCategoryGateway() As String + Get + Return ResourceManager.GetString("strCategoryGateway", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Miscellaneous. + ''' + Friend ReadOnly Property strCategoryMiscellaneous() As String + Get + Return ResourceManager.GetString("strCategoryMiscellaneous", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Protocol. + ''' + Friend ReadOnly Property strCategoryProtocol() As String + Get + Return ResourceManager.GetString("strCategoryProtocol", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Redirect. + ''' + Friend ReadOnly Property strCategoryRedirect() As String + Get + Return ResourceManager.GetString("strCategoryRedirect", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Automatically try to reconnect when disconnected from server (RDP && ICA only). ''' @@ -1041,6 +1122,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Hostname/IP. + ''' + Friend ReadOnly Property strColumnHostnameIP() As String + Get + Return ResourceManager.GetString("strColumnHostnameIP", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Message. ''' @@ -1050,6 +1140,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Username. + ''' + Friend ReadOnly Property strColumnUsername() As String + Get + Return ResourceManager.GetString("strColumnUsername", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Wait For Exit. ''' @@ -1122,42 +1221,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to Select the colour quality to be used.. - ''' - Friend ReadOnly Property strConnectionDescriptionColors() As String - Get - Return ResourceManager.GetString("strConnectionDescriptionColors", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to Enter the hostname or ip you want to connect to.. - ''' - Friend ReadOnly Property strConnectionDescriptionHostnameIP() As String - Get - Return ResourceManager.GetString("strConnectionDescriptionHostnameIP", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to Colours. - ''' - Friend ReadOnly Property strConnectionPropertyColors() As String - Get - Return ResourceManager.GetString("strConnectionPropertyColors", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to Hostname/IP. - ''' - Friend ReadOnly Property strConnectionPropertyHostnameIP() As String - Get - Return ResourceManager.GetString("strConnectionPropertyHostnameIP", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to Connections. ''' @@ -1329,6 +1392,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Domain:. + ''' + Friend ReadOnly Property strLabelDomain() As String + Get + Return ResourceManager.GetString("strLabelDomain", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Filename:. ''' @@ -1356,6 +1428,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Port:. + ''' + Friend ReadOnly Property strLabelPort() As String + Get + Return ResourceManager.GetString("strLabelPort", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Portable Edition. ''' @@ -1365,6 +1446,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Protocol:. + ''' + Friend ReadOnly Property strLabelProtocol() As String + Get + Return ResourceManager.GetString("strLabelProtocol", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to To configure PuTTY sessions click this button:. ''' @@ -1419,6 +1509,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Username:. + ''' + Friend ReadOnly Property strLabelUsername() As String + Get + Return ResourceManager.GetString("strLabelUsername", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Verify:. ''' @@ -2049,6 +2148,276 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Select the colour quality to be used.. + ''' + Friend ReadOnly Property strPropertyDescriptionColors() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionColors", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Put your notes or a description for the host here.. + ''' + Friend ReadOnly Property strPropertyDescriptionDescription() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionDescription", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Enter your domain.. + ''' + Friend ReadOnly Property strPropertyDescriptionDomain() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionDomain", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Enter the hostname or ip you want to connect to.. + ''' + Friend ReadOnly Property strPropertyDescriptionHostnameIP() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionHostnameIP", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Choose a icon that will be displayed when connected to the host.. + ''' + Friend ReadOnly Property strPropertyDescriptionIcon() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionIcon", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to This is the name that will be displayed in the connections tree.. + ''' + Friend ReadOnly Property strPropertyDescriptionName() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionName", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Sets the panel in which the connection will open.. + ''' + Friend ReadOnly Property strPropertyDescriptionPanel() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionPanel", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Enter your password.. + ''' + Friend ReadOnly Property strPropertyDescriptionPassword() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionPassword", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Enter the port the selected protocol is listening on.. + ''' + Friend ReadOnly Property strPropertyDescriptionPort() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionPort", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Choose the protocol mRemoteNG should use to connect to the host.. + ''' + Friend ReadOnly Property strPropertyDescriptionProtocol() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionProtocol", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Enter your username.. + ''' + Friend ReadOnly Property strPropertyDescriptionUsername() As String + Get + Return ResourceManager.GetString("strPropertyDescriptionUsername", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Colours. + ''' + Friend ReadOnly Property strPropertyNameColors() As String + Get + Return ResourceManager.GetString("strPropertyNameColors", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Description. + ''' + Friend ReadOnly Property strPropertyNameDescription() As String + Get + Return ResourceManager.GetString("strPropertyNameDescription", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Domain. + ''' + Friend ReadOnly Property strPropertyNameDomain() As String + Get + Return ResourceManager.GetString("strPropertyNameDomain", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Hostname/IP. + ''' + Friend ReadOnly Property strPropertyNameHostnameIP() As String + Get + Return ResourceManager.GetString("strPropertyNameHostnameIP", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Icon. + ''' + Friend ReadOnly Property strPropertyNameIcon() As String + Get + Return ResourceManager.GetString("strPropertyNameIcon", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Description. + ''' + Friend ReadOnly Property strPropertyNameInheritDescription() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritDescription", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Domain. + ''' + Friend ReadOnly Property strPropertyNameInheritDomain() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritDomain", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Icon. + ''' + Friend ReadOnly Property strPropertyNameInheritIcon() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritIcon", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Panel. + ''' + Friend ReadOnly Property strPropertyNameInheritPanel() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritPanel", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Password. + ''' + Friend ReadOnly Property strPropertyNameInheritPassword() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritPassword", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Port. + ''' + Friend ReadOnly Property strPropertyNameInheritPort() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritPort", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Protocol. + ''' + Friend ReadOnly Property strPropertyNameInheritProtocol() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritProtocol", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Inherit Username. + ''' + Friend ReadOnly Property strPropertyNameInheritUsername() As String + Get + Return ResourceManager.GetString("strPropertyNameInheritUsername", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Name. + ''' + Friend ReadOnly Property strPropertyNameName() As String + Get + Return ResourceManager.GetString("strPropertyNameName", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Panel. + ''' + Friend ReadOnly Property strPropertyNamePanel() As String + Get + Return ResourceManager.GetString("strPropertyNamePanel", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Password. + ''' + Friend ReadOnly Property strPropertyNamePassword() As String + Get + Return ResourceManager.GetString("strPropertyNamePassword", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Port. + ''' + Friend ReadOnly Property strPropertyNamePort() As String + Get + Return ResourceManager.GetString("strPropertyNamePort", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Protocol. + ''' + Friend ReadOnly Property strPropertyNameProtocol() As String + Get + Return ResourceManager.GetString("strPropertyNameProtocol", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Username. + ''' + Friend ReadOnly Property strPropertyNameUsername() As String + Get + Return ResourceManager.GetString("strPropertyNameUsername", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Aspect. ''' @@ -2094,6 +2463,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Appearance. + ''' + Friend ReadOnly Property strTabAppearance() As String + Get + Return ResourceManager.GetString("strTabAppearance", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Error ({0}). ''' diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index c8d526172..1989476c5 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -550,10 +550,10 @@ &Stop - + Select the colour quality to be used. - + Colours @@ -916,10 +916,136 @@ View Only (VNC) - + Enter the hostname or ip you want to connect to. - + Hostname/IP + + Icon + + + Appearance + + + Connection + + + Credentials + + + Display + + + Gateway + + + Miscellaneous + + + Protocol + + + Redirect + + + Hostname/IP + + + Username + + + Domain: + + + Port: + + + Protocol: + + + Username: + + + Put your notes or a description for the host here. + + + Enter your domain. + + + Choose a icon that will be displayed when connected to the host. + + + This is the name that will be displayed in the connections tree. + + + Sets the panel in which the connection will open. + + + Enter your password. + + + Enter the port the selected protocol is listening on. + + + Choose the protocol mRemoteNG should use to connect to the host. + + + Enter your username. + + + Description + + + Domain + + + Icon + + + Inherit Description + + + Inherit Domain + + + Inherit Icon + + + Inherit Panel + + + Inherit Password + + + Inherit Port + + + Inherit Protocol + + + Inherit Username + + + Name + + + Panel + + + Password + + + Port + + + Protocol + + + Username + + + Appearance + \ No newline at end of file diff --git a/mRemoteV1/Root/Root.Info.vb b/mRemoteV1/Root/Root.Info.vb index 43444d107..b472c1de4 100644 --- a/mRemoteV1/Root/Root.Info.vb +++ b/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 _ @@ -11,15 +11,15 @@ Namespace Root #Region "Properties" Private _Name As String = "Connections" - _ + _ Public Property Name() As String Get Return Me._Name @@ -30,7 +30,7 @@ Namespace Root End Property Private _Password As Boolean - _ + 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 + _ 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 diff --git a/mRemoteV1/Tools/Tools.Misc.vb b/mRemoteV1/Tools/Tools.Misc.vb index 5b23ed97f..165f52bc1 100644 --- a/mRemoteV1/Tools/Tools.Misc.vb +++ b/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 diff --git a/mRemoteV1/UI/UI.Window.ADImport.vb b/mRemoteV1/UI/UI.Window.ADImport.vb index 95016c038..1f5177b73 100644 --- a/mRemoteV1/UI/UI.Window.ADImport.vb +++ b/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 diff --git a/mRemoteV1/UI/UI.Window.Config.vb b/mRemoteV1/UI/UI.Window.Config.vb index aae476ccf..c7a72e176 100644 --- a/mRemoteV1/UI/UI.Window.Config.vb +++ b/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 diff --git a/mRemoteV1/UI/UI.Window.Options.vb b/mRemoteV1/UI/UI.Window.Options.vb index 11533bae8..d9c6c315b 100644 --- a/mRemoteV1/UI/UI.Window.Options.vb +++ b/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 diff --git a/mRemoteV1/UI/UI.Window.PortScan.vb b/mRemoteV1/UI/UI.Window.PortScan.vb index 011e2f060..3883516af 100644 --- a/mRemoteV1/UI/UI.Window.PortScan.vb +++ b/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 & ":" diff --git a/mRemoteV1/UI/UI.Window.SSHTransfer.vb b/mRemoteV1/UI/UI.Window.SSHTransfer.vb index 6821a7e8d..aa2a3965b 100644 --- a/mRemoteV1/UI/UI.Window.SSHTransfer.vb +++ b/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 diff --git a/mRemoteV1/UI/UI.Window.Sessions.vb b/mRemoteV1/UI/UI.Window.Sessions.vb index 31e4f4e19..bbf4e42c7 100644 --- a/mRemoteV1/UI/UI.Window.Sessions.vb +++ b/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