More localization improvements.

2026-02-17 22:11:48 +08:00 · 2010-02-20 13:49:09 -06:00
parent a1fc6c0a0d
commit 6301fcc320
16 changed files with 371 additions and 94 deletions
--- a/mRemoteV1/Language/Language.DE.vb
+++ b/mRemoteV1/Language/Language.DE.vb
@@ -107,29 +107,8 @@
        Public Const RDPSmartSize As String = "Smart Size"
 		
        Public Const Fullscreen As String = "Vollbild"
-        Public Const Information As String = "Information"
-        Public Const Warning As String = "Warnung"
-        Public Const Error_ As String = "Fehler"
        Public Const PasswordProtect As String = "Passwortschützen"
-        Public Const AutomaticReconnect As String = "Automatisches wiederverbinden"
-        Public Const ServerStatus As String = "Server Status:"
-        Public Const ReconnectWhenReady As String = "Verbinden wenn bereit"
-        Public Const Connections As String = "Verbindungen"
-        Public Const Files As String = "Dateien"
-        Public Const All As String = "Alle"
-        Public Const Yes As String = "Ja"
-        Public Const No As String = "Nein"
-        Public Const New_ As String = "Neu"
-        Public Const Connection As String = "Verbindung"
-        Public Const Folder As String = "Ordner"
-        Public Const Root As String = "Wurzel"
-        Public Const SureToDeleteItem As String = "Sind sie sicher dass sie dieses Objekt löschen möchten?"
-        Public Const License As String = "Lizenz"
-        Public Const About As String = "Über"
-        Public Const ChangeLog As String = "Änderungen:"
-        Public Const ReleasedUnderGPL As String = "Unter der GNU General Public License (GPL) veröffentlicht"
-        Public Const SomeIconsBy As String = "Einige Icons von"
-        Public Const Change As String = "Ändern"
+
        Public Const Inheritance As String = "Vererbung"
        Public Const Default_ As String = "Standard"
        Public Const Properties As String = "Eigenschaften"
--- a/mRemoteV1/Language/Language.EN.vb
+++ b/mRemoteV1/Language/Language.EN.vb
@@ -120,25 +120,8 @@
        Public Const RDPSmartSize As String = "Smart Size"
 		
        Public Const Fullscreen As String = "Fullscreen"
-        Public Const Information As String = "Information"
-        Public Const Warning As String = "Warning"
-        Public Const Error_ As String = "Error"
        Public Const PasswordProtect As String = "Password Protect"
-        Public Const AutomaticReconnect As String = "Automatic Reconnect"
-        Public Const ServerStatus As String = "Server Status:"
-        Public Const ReconnectWhenReady As String = "Reconnect when ready"
-        Public Const Connections As String = "Connections"
-        Public Const Files As String = "Files"
-        Public Const All As String = "All"
-        Public Const Yes As String = "Yes"
-        Public Const No As String = "No"
-        Public Const New_ As String = "New"
-        Public Const Connection As String = "Connection"
-        Public Const Folder As String = "Folder"
-        Public Const Root As String = "Root"
-        Public Const SureToDeleteItem As String = "Are you sure you want to delete this Item?"
-        Public Const License As String = "License"
-        Public Const Change As String = "Change"
+
        Public Const Inheritance As String = "Inheritance"
        Public Const Default_ As String = "Default"
        Public Const Properties As String = "Properties"
--- a/mRemoteV1/Language/Resources.de.resx
+++ b/mRemoteV1/Language/Resources.de.resx
@@ -359,4 +359,84 @@
  <data name="strTabAdvanced" xml:space="preserve">
    <value>Erweitert</value>
  </data>
+  <data name="strButtonChange" xml:space="preserve">
+    <value>Ändern</value>
+  </data>
+  <data name="strCheckboxReconnectWhenReady" xml:space="preserve">
+    <value>Verbinden wenn bereit</value>
+  </data>
+  <data name="strConnections" xml:space="preserve">
+    <value>Verbindungen</value>
+  </data>
+  <data name="strFilterAll" xml:space="preserve">
+    <value>Alle Dateien (*.*)</value>
+  </data>
+  <data name="strFilterApplication" xml:space="preserve">
+    <value>Application Dateien (*.exe)</value>
+    <comment>Need translation</comment>
+  </data>
+  <data name="strFiltermRemoteCSV" xml:space="preserve">
+    <value>mRemote CSV Dateien (*.csv)</value>
+  </data>
+  <data name="strFiltermRemoteXML" xml:space="preserve">
+    <value>mRemote XML Dateien (*.xml)</value>
+  </data>
+  <data name="strFilterRDP" xml:space="preserve">
+    <value>RDP Dateien (*.rdp)</value>
+  </data>
+  <data name="strFiltervRD2008CSV" xml:space="preserve">
+    <value>visionapp Remote Desktop 2008 CSV Dateien (*.csv)</value>
+  </data>
+  <data name="strGroupboxAutomaticReconnect" xml:space="preserve">
+    <value>Automatisches wiederverbinden</value>
+  </data>
+  <data name="strGroupboxConnection" xml:space="preserve">
+    <value>Verbindung</value>
+  </data>
+  <data name="strGroupboxFiles" xml:space="preserve">
+    <value>Dateien</value>
+  </data>
+  <data name="strLabelServerStatus" xml:space="preserve">
+    <value>Server Status:</value>
+  </data>
+  <data name="strNewConnection" xml:space="preserve">
+    <value>Neu Verbindung</value>
+  </data>
+  <data name="strNewFolder" xml:space="preserve">
+    <value>Neu Ordner</value>
+  </data>
+  <data name="strNewRoot" xml:space="preserve">
+    <value>Neu Wurzel</value>
+  </data>
+  <data name="strNo" xml:space="preserve">
+    <value>Nein</value>
+  </data>
+  <data name="strTitleError" xml:space="preserve">
+    <value>Fehler ({0})</value>
+  </data>
+  <data name="strTitleInformation" xml:space="preserve">
+    <value>Information ({0})</value>
+  </data>
+  <data name="strTitleWarning" xml:space="preserve">
+    <value>Warnung ({0})</value>
+  </data>
+  <data name="strUpdateFrequencyCustom" xml:space="preserve">
+    <value>Every {0} days</value>
+    <comment>Need translation</comment>
+  </data>
+  <data name="strUpdateFrequencyDaily" xml:space="preserve">
+    <value>Daily</value>
+    <comment>Need translation</comment>
+  </data>
+  <data name="strUpdateFrequencyMonthly" xml:space="preserve">
+    <value>Monthly</value>
+    <comment>Need translation</comment>
+  </data>
+  <data name="strUpdateFrequencyWeekly" xml:space="preserve">
+    <value>Weekly</value>
+    <comment>Need translation</comment>
+  </data>
+  <data name="strYes" xml:space="preserve">
+    <value>Ya</value>
+  </data>
 </root>
--- a/mRemoteV1/Messages/Messages.Collector.vb
+++ b/mRemoteV1/Messages/Messages.Collector.vb
@@ -138,11 +138,11 @@ Namespace Messages
        Private Shared Sub ShowMessageBox(ByVal Msg As Messages.Message)
            Select Case Msg.MsgClass
                Case Messages.MessageClass.InformationMsg
-                    MessageBox.Show(Msg.MsgText, Language.Base.Information & " (" & Msg.MsgDate & ")", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                    MessageBox.Show(Msg.MsgText, String.Format(My.Resources.strTitleInformation, Msg.MsgDate), MessageBoxButtons.OK, MessageBoxIcon.Information)
                Case Messages.MessageClass.WarningMsg
-                    MessageBox.Show(Msg.MsgText, Language.Base.Warning & " (" & Msg.MsgDate & ")", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+                    MessageBox.Show(Msg.MsgText, String.Format(My.Resources.strTitleWarning, Msg.MsgDate), MessageBoxButtons.OK, MessageBoxIcon.Warning)
                Case Messages.MessageClass.ErrorMsg
-                    MessageBox.Show(Msg.MsgText, Language.Base.Error_ & " (" & Msg.MsgDate & ")", MessageBoxButtons.OK, MessageBoxIcon.Error)
+                    MessageBox.Show(Msg.MsgText, String.Format(My.Resources.strTitleError, Msg.MsgDate), MessageBoxButtons.OK, MessageBoxIcon.Error)
            End Select
        End Sub

--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -780,6 +780,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Change.
+        '''</summary>
+        Friend ReadOnly Property strButtonChange() As String
+            Get
+                Return ResourceManager.GetString("strButtonChange", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to &amp;Close.
        '''</summary>
@@ -888,6 +897,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Reconnect when ready.
+        '''</summary>
+        Friend ReadOnly Property strCheckboxReconnectWhenReady() As String
+            Get
+                Return ResourceManager.GetString("strCheckboxReconnectWhenReady", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Use a proxy server to connect.
        '''</summary>
@@ -960,6 +978,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Connections.
+        '''</summary>
+        Friend ReadOnly Property strConnections() As String
+            Get
+                Return ResourceManager.GetString("strConnections", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Includes icons by [FAMFAMFAM].
        '''</summary>
@@ -978,6 +1005,87 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to All Files (*.*).
+        '''</summary>
+        Friend ReadOnly Property strFilterAll() As String
+            Get
+                Return ResourceManager.GetString("strFilterAll", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Application Files (*.exe).
+        '''</summary>
+        Friend ReadOnly Property strFilterApplication() As String
+            Get
+                Return ResourceManager.GetString("strFilterApplication", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to mRemote CSV Files (*.csv).
+        '''</summary>
+        Friend ReadOnly Property strFiltermRemoteCSV() As String
+            Get
+                Return ResourceManager.GetString("strFiltermRemoteCSV", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to mRemote XML Files (*.xml).
+        '''</summary>
+        Friend ReadOnly Property strFiltermRemoteXML() As String
+            Get
+                Return ResourceManager.GetString("strFiltermRemoteXML", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to RDP Files (*.rdp).
+        '''</summary>
+        Friend ReadOnly Property strFilterRDP() As String
+            Get
+                Return ResourceManager.GetString("strFilterRDP", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to visionapp Remote Desktop 2008 CSV Files (*.csv).
+        '''</summary>
+        Friend ReadOnly Property strFiltervRD2008CSV() As String
+            Get
+                Return ResourceManager.GetString("strFiltervRD2008CSV", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Automatic Reconnect.
+        '''</summary>
+        Friend ReadOnly Property strGroupboxAutomaticReconnect() As String
+            Get
+                Return ResourceManager.GetString("strGroupboxAutomaticReconnect", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Connection.
+        '''</summary>
+        Friend ReadOnly Property strGroupboxConnection() As String
+            Get
+                Return ResourceManager.GetString("strGroupboxConnection", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Files.
+        '''</summary>
+        Friend ReadOnly Property strGroupboxFiles() As String
+            Get
+                Return ResourceManager.GetString("strGroupboxFiles", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Inactive.
        '''</summary>
@@ -1077,6 +1185,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Server Status:.
+        '''</summary>
+        Friend ReadOnly Property strLabelServerStatus() As String
+            Get
+                Return ResourceManager.GetString("strLabelServerStatus", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Verify:.
        '''</summary>
@@ -1527,6 +1644,42 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to New Connection.
+        '''</summary>
+        Friend ReadOnly Property strNewConnection() As String
+            Get
+                Return ResourceManager.GetString("strNewConnection", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to New Folder.
+        '''</summary>
+        Friend ReadOnly Property strNewFolder() As String
+            Get
+                Return ResourceManager.GetString("strNewFolder", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to New Root.
+        '''</summary>
+        Friend ReadOnly Property strNewRoot() As String
+            Get
+                Return ResourceManager.GetString("strNewRoot", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to No.
+        '''</summary>
+        Friend ReadOnly Property strNo() As String
+            Get
+                Return ResourceManager.GetString("strNo", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Aspect.
        '''</summary>
@@ -1572,6 +1725,24 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Error ({0}).
+        '''</summary>
+        Friend ReadOnly Property strTitleError() As String
+            Get
+                Return ResourceManager.GetString("strTitleError", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Information ({0}).
+        '''</summary>
+        Friend ReadOnly Property strTitleInformation() As String
+            Get
+                Return ResourceManager.GetString("strTitleInformation", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Password.
        '''</summary>
@@ -1590,6 +1761,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Warning ({0}).
+        '''</summary>
+        Friend ReadOnly Property strTitleWarning() As String
+            Get
+                Return ResourceManager.GetString("strTitleWarning", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Looks up a localized string similar to Every {0} days.
        '''</summary>
@@ -1626,6 +1806,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Looks up a localized string similar to Yes.
+        '''</summary>
+        Friend ReadOnly Property strYes() As String
+            Get
+                Return ResourceManager.GetString("strYes", resourceCulture)
+            End Get
+        End Property
+        
        Friend ReadOnly Property Tab_Icon() As System.Drawing.Icon
            Get
                Dim obj As Object = ResourceManager.GetObject("Tab_Icon", resourceCulture)
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -736,4 +736,67 @@
  <data name="strTabAdvanced" xml:space="preserve">
    <value>Advanced</value>
  </data>
+  <data name="strButtonChange" xml:space="preserve">
+    <value>Change</value>
+  </data>
+  <data name="strCheckboxReconnectWhenReady" xml:space="preserve">
+    <value>Reconnect when ready</value>
+  </data>
+  <data name="strConnections" xml:space="preserve">
+    <value>Connections</value>
+  </data>
+  <data name="strFilterAll" xml:space="preserve">
+    <value>All Files (*.*)</value>
+  </data>
+  <data name="strFilterApplication" xml:space="preserve">
+    <value>Application Files (*.exe)</value>
+  </data>
+  <data name="strFiltermRemoteCSV" xml:space="preserve">
+    <value>mRemote CSV Files (*.csv)</value>
+  </data>
+  <data name="strFiltermRemoteXML" xml:space="preserve">
+    <value>mRemote XML Files (*.xml)</value>
+  </data>
+  <data name="strFilterRDP" xml:space="preserve">
+    <value>RDP Files (*.rdp)</value>
+  </data>
+  <data name="strFiltervRD2008CSV" xml:space="preserve">
+    <value>visionapp Remote Desktop 2008 CSV Files (*.csv)</value>
+  </data>
+  <data name="strGroupboxAutomaticReconnect" xml:space="preserve">
+    <value>Automatic Reconnect</value>
+  </data>
+  <data name="strGroupboxConnection" xml:space="preserve">
+    <value>Connection</value>
+  </data>
+  <data name="strGroupboxFiles" xml:space="preserve">
+    <value>Files</value>
+  </data>
+  <data name="strLabelServerStatus" xml:space="preserve">
+    <value>Server Status:</value>
+  </data>
+  <data name="strNewConnection" xml:space="preserve">
+    <value>New Connection</value>
+  </data>
+  <data name="strNewFolder" xml:space="preserve">
+    <value>New Folder</value>
+  </data>
+  <data name="strNewRoot" xml:space="preserve">
+    <value>New Root</value>
+  </data>
+  <data name="strNo" xml:space="preserve">
+    <value>No</value>
+  </data>
+  <data name="strTitleError" xml:space="preserve">
+    <value>Error ({0})</value>
+  </data>
+  <data name="strTitleInformation" xml:space="preserve">
+    <value>Information ({0})</value>
+  </data>
+  <data name="strTitleWarning" xml:space="preserve">
+    <value>Warning ({0})</value>
+  </data>
+  <data name="strYes" xml:space="preserve">
+    <value>Yes</value>
+  </data>
 </root>
--- a/mRemoteV1/Tools/ReconnectGroup.vb
+++ b/mRemoteV1/Tools/ReconnectGroup.vb
@@ -84,9 +84,9 @@
    End Sub

    Private Sub ApplyLanguage()
-        grpAutomaticReconnect.Text = Language.Base.AutomaticReconnect
+        grpAutomaticReconnect.Text = My.Resources.strGroupboxAutomaticReconnect
        btnClose.Text = My.Resources.strButtonClose
-        lblServerStatus.Text = Language.Base.ServerStatus
-        chkReconnectWhenReady.Text = Language.Base.ReconnectWhenReady
+        lblServerStatus.Text = My.Resources.strLabelServerStatus
+        chkReconnectWhenReady.Text = My.Resources.strCheckboxReconnectWhenReady
    End Sub
 End Class
--- a/mRemoteV1/Tools/Tools.Controls.vb
+++ b/mRemoteV1/Tools/Tools.Controls.vb
@@ -63,7 +63,7 @@ Namespace Tools
            Public Sub New()
                Try
                    Me._cMenCons = New ToolStripMenuItem
-                    Me._cMenCons.Text = Language.Base.Connections
+                    Me._cMenCons.Text = My.Resources.strConnections
                    Me._cMenCons.Image = My.Resources.Root

                    Me._cMenSep1 = New ToolStripSeparator
@@ -178,8 +178,6 @@ Namespace Tools
            End Sub
        End Class

-
-
        Public Shared Function ConnectionsSaveAsDialog() As SaveFileDialog
            Dim sDlg As New SaveFileDialog()
            sDlg.CheckPathExists = True
@@ -187,8 +185,7 @@ Namespace Tools
            sDlg.FileName = App.Info.Connections.DefaultConnectionsFile
            sDlg.OverwritePrompt = True

-            sDlg.Filter = "mRemote XML " & Language.Base.Files & " (*.xml)|*.xml|" & "mRemote CSV " & Language.Base.Files & " (*.csv)|*.csv|" & "vRD 2008 CSV " & Language.Base.Files & " (*.csv)|*.csv|" & Language.Base.All & " " & Language.Base.Files & " (*.*)|*.*"
-
+            sDlg.Filter = My.Resources.strFiltermRemoteXML & "|*.xml|" & My.Resources.strFiltermRemoteCSV & "|*.csv|" & My.Resources.strFiltervRD2008CSV & "|*.csv|" & My.Resources.strFilterAll & "|*.*"

            Return sDlg
        End Function
@@ -197,7 +194,7 @@ Namespace Tools
            Dim lDlg As New OpenFileDialog()
            lDlg.CheckFileExists = True
            lDlg.InitialDirectory = App.Info.Connections.DefaultConnectionsPath
-            lDlg.Filter = "mRemote XML " & Language.Base.Files & " (*.xml)|*.xml|" & Language.Base.All & " " & Language.Base.Files & " (*.*)|*.*"
+            lDlg.Filter = My.Resources.strFiltermRemoteXML & "|*.xml|" & My.Resources.strFilterAll & "|*.*"

            Return lDlg
        End Function
@@ -206,14 +203,11 @@ Namespace Tools
            Dim lDlg As New OpenFileDialog()
            lDlg.CheckFileExists = True
            'lDlg.InitialDirectory = App.Info.Connections.DefaultConnectionsPath
-            lDlg.Filter = "RDP " & Language.Base.Files & " (*.rdp)|*.rdp|" & Language.Base.All & " " & Language.Base.Files & " (*.*)|*.*"
+            lDlg.Filter = My.Resources.strFilterRDP & "|*.rdp|" & My.Resources.strFilterAll & "|*.*"

            Return lDlg
        End Function

-
-
-
        Public Class TreeNodeSorter
            Implements IComparer

--- a/mRemoteV1/Tools/Tools.Misc.vb
+++ b/mRemoteV1/Tools/Tools.Misc.vb
@@ -282,11 +282,11 @@ Namespace Tools

            Public Overloads Overrides Function ConvertFrom(ByVal context As ITypeDescriptorContext, ByVal culture As System.Globalization.CultureInfo, ByVal value As Object) As Object
                If value.GetType() Is GetType(String) Then
-                    If CStr(value).ToLower() = Language.Base.Yes.ToLower Then
+                    If CStr(value).ToLower() = My.Resources.strYes.ToLower Then
                        Return True
                    End If

-                    If CStr(value).ToLower() = Language.Base.No.ToLower Then
+                    If CStr(value).ToLower() = My.Resources.strNo.ToLower Then
                        Return False
                    End If

@@ -298,7 +298,7 @@ Namespace Tools

            Public Overloads Overrides Function ConvertTo(ByVal context As ITypeDescriptorContext, ByVal culture As System.Globalization.CultureInfo, ByVal value As Object, ByVal destinationType As Type) As Object
                If destinationType Is GetType(String) Then
-                    Return IIf(CBool(value), Language.Base.Yes, Language.Base.No)
+                    Return IIf(CBool(value), My.Resources.strYes, My.Resources.strNo)
                End If

                Return MyBase.ConvertTo(context, culture, value, destinationType)
--- a/mRemoteV1/Tools/Tools.PortScan.vb
+++ b/mRemoteV1/Tools/Tools.PortScan.vb
@@ -271,9 +271,9 @@ Namespace Tools

            Private Function BoolToYesNo(ByVal Bool As Boolean) As String
                If Bool = True Then
-                    Return Language.Base.Yes
+                    Return My.Resources.strYes
                Else
-                    Return Language.Base.No
+                    Return My.Resources.strNo
                End If
            End Function

--- a/mRemoteV1/Tree/Tree.Node.vb
+++ b/mRemoteV1/Tree/Tree.Node.vb
@@ -182,19 +182,18 @@ Namespace Tree
        Public Shared Function AddNode(ByVal NodeType As Tree.Node.Type, Optional ByVal Text As String = "") As TreeNode
            Try
                Dim nNode As New TreeNode
-                nNode.Text = Language.Base.New_ & " "

                Select Case NodeType
                    Case Type.Connection
-                        nNode.Text &= Language.Base.Connection
+                        nNode.Text = My.Resources.strNewConnection
                        nNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
                        nNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
                    Case Type.Container
-                        nNode.Text &= Language.Base.Folder
+                        nNode.Text = My.Resources.strNewFolder
                        nNode.ImageIndex = Images.Enums.TreeImage.Container
                        nNode.SelectedImageIndex = Images.Enums.TreeImage.Container
                    Case Type.Root
-                        nNode.Text &= Language.Base.Root
+                        nNode.Text = My.Resources.strNewRoot
                        nNode.ImageIndex = Images.Enums.TreeImage.Root
                        nNode.SelectedImageIndex = Images.Enums.TreeImage.Root
                End Select
@@ -500,7 +499,7 @@ Namespace Tree
            Else
                _TreeView.Nodes.Clear()
                '_TreeView.Nodes.Add("Credentials")
-                _TreeView.Nodes.Add(Language.Base.Connections)
+                _TreeView.Nodes.Add(My.Resources.strConnections)
            End If
        End Sub

--- a/mRemoteV1/UI/UI.Window.ADImport.vb
+++ b/mRemoteV1/UI/UI.Window.ADImport.vb
@@ -12,7 +12,6 @@ Namespace UI
            Friend WithEvents lblDomain As System.Windows.Forms.Label
            Friend WithEvents btnChangeDomain As System.Windows.Forms.Button
            Friend WithEvents AD As ADTree.ADtree
-            Friend WithEvents Label2 As System.Windows.Forms.Label

            Private Sub InitializeComponent()
                Me.btnOK = New System.Windows.Forms.Button
@@ -20,7 +19,6 @@ Namespace UI
                Me.txtDomain = New System.Windows.Forms.TextBox
                Me.lblDomain = New System.Windows.Forms.Label
                Me.btnChangeDomain = New System.Windows.Forms.Button
-                Me.Label2 = New System.Windows.Forms.Label
                Me.AD = New ADTree.ADtree
                Me.SuspendLayout()
                '
@@ -32,7 +30,7 @@ Namespace UI
                Me.btnOK.Name = "btnOK"
                Me.btnOK.Size = New System.Drawing.Size(75, 23)
                Me.btnOK.TabIndex = 100
-                Me.btnOK.Text = My.Resources.strButtonOK
+                Me.btnOK.Text = Global.mRemote.My.Resources.Resources.strButtonOK
                Me.btnOK.UseVisualStyleBackColor = True
                '
                'btnCancel
@@ -44,7 +42,7 @@ Namespace UI
                Me.btnCancel.Name = "btnCancel"
                Me.btnCancel.Size = New System.Drawing.Size(75, 23)
                Me.btnCancel.TabIndex = 110
-                Me.btnCancel.Text = My.Resources.strButtonCancel
+                Me.btnCancel.Text = Global.mRemote.My.Resources.Resources.strButtonCancel
                Me.btnCancel.UseVisualStyleBackColor = True
                '
                'txtDomain
@@ -64,7 +62,7 @@ Namespace UI
                Me.lblDomain.Name = "lblDomain"
                Me.lblDomain.Size = New System.Drawing.Size(46, 13)
                Me.lblDomain.TabIndex = 20
-                Me.lblDomain.Text = Language.Base.Props_Domain & ":"
+                Me.lblDomain.Text = "Domain:"
                '
                'btnChangeDomain
                '
@@ -74,26 +72,19 @@ Namespace UI
                Me.btnChangeDomain.Name = "btnChangeDomain"
                Me.btnChangeDomain.Size = New System.Drawing.Size(75, 23)
                Me.btnChangeDomain.TabIndex = 40
-                Me.btnChangeDomain.Text = Language.Base.Change
+                Me.btnChangeDomain.Text = Global.mRemote.My.Resources.Resources.strButtonChange
                Me.btnChangeDomain.UseVisualStyleBackColor = True
                '
-                'Label2
-                '
-                Me.Label2.AutoSize = True
-                Me.Label2.Location = New System.Drawing.Point(-190, 349)
-                Me.Label2.Name = "Label2"
-                Me.Label2.Size = New System.Drawing.Size(44, 13)
-                Me.Label2.TabIndex = 3
-                Me.Label2.Text = Language.Base.Change
-                '
                'AD
                '
+                Me.AD.ADPath = Nothing
                Me.AD.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
                            Or System.Windows.Forms.AnchorStyles.Left) _
                            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-                Me.AD.Domain = ""
+                Me.AD.Domain = "akane"
                Me.AD.Location = New System.Drawing.Point(0, 0)
                Me.AD.Name = "AD"
+                Me.AD.SelectedNode = Nothing
                Me.AD.Size = New System.Drawing.Size(530, 341)
                Me.AD.TabIndex = 10
                '
@@ -103,12 +94,12 @@ Namespace UI
                Me.CancelButton = Me.btnCancel
                Me.ClientSize = New System.Drawing.Size(530, 373)
                Me.Controls.Add(Me.AD)
-                Me.Controls.Add(Me.Label2)
                Me.Controls.Add(Me.lblDomain)
                Me.Controls.Add(Me.txtDomain)
                Me.Controls.Add(Me.btnChangeDomain)
                Me.Controls.Add(Me.btnCancel)
                Me.Controls.Add(Me.btnOK)
+                Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                Me.Icon = Global.mRemote.My.Resources.Resources.ActiveDirectory_Icon
                Me.Name = "ADImport"
                Me.TabText = "Active Directory Import"
@@ -136,8 +127,7 @@ Namespace UI
                btnOK.Text = My.Resources.strButtonOK
                btnCancel.Text = My.Resources.strButtonCancel
                lblDomain.Text = Language.Base.Props_Domain & ":"
-                btnChangeDomain.Text = Language.Base.Change
-                Label2.Text = Language.Base.Change
+                btnChangeDomain.Text = My.Resources.strButtonChange
            End Sub
 #End Region

--- a/mRemoteV1/UI/UI.Window.ExternalApps.vb
+++ b/mRemoteV1/UI/UI.Window.ExternalApps.vb
@@ -428,7 +428,7 @@ Namespace UI
                Label3.Text = Language.Base.Arguments & ":"
                Label2.Text = Language.Base.Filename & ":"
                Label1.Text = Language.Base.DisplayName & ":"
-                dlgOpenFile.Filter = Language.Base.All & " " & Language.Base.Files & " (*.*)|*.*"
+                dlgOpenFile.Filter = My.Resources.strFilterAll & "|*.*"
                TabText = My.Resources.strMenuExternalTools
                Text = My.Resources.strMenuExternalTools
            End Sub
--- a/mRemoteV1/UI/UI.Window.Options.vb
+++ b/mRemoteV1/UI/UI.Window.Options.vb
@@ -1699,7 +1699,7 @@ Namespace UI
                chkOpenNewTabRightOfSelected.Text = Language.Base.OpenNewTabRight
                chkAlwaysShowPanelSelectionDlg.Text = Language.Base.AlwaysShowPanelSelection
                chkDoubleClickClosesTab.Text = Language.Base.DoubleClickTabClosesIt
-                tabConnections.Title = Language.Base.Connections
+                tabConnections.Title = My.Resources.strConnections
                chkHostnameLikeDisplayName.Text = Language.Base.SetHostnameLikeDisplayName
                grpExperimental.Text = Language.Base.Experimental.ToUpper
                chkUseSQLServer.Text = Language.Base.UseSQLServer
@@ -1746,7 +1746,7 @@ Namespace UI

            Private Sub btnBrowseCustomPuttyPath_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnBrowseCustomPuttyPath.Click
                Dim oDlg As New OpenFileDialog()
-                oDlg.Filter = Language.Base.Applications & " (*.exe)|*.exe|" & Language.Base.All & " " & Language.Base.Files & " (*.*)|*.*"
+                oDlg.Filter = My.Resources.strFilterApplication & "|*.exe|" & My.Resources.strFilterAll & "|*.*"
                oDlg.FileName = "putty.exe"
                oDlg.CheckFileExists = True
                oDlg.Multiselect = False
--- a/mRemoteV1/UI/UI.Window.SSHTransfer.vb
+++ b/mRemoteV1/UI/UI.Window.SSHTransfer.vb
@@ -74,7 +74,7 @@ Namespace UI
                Me.grpFiles.Size = New System.Drawing.Size(668, 194)
                Me.grpFiles.TabIndex = 2000
                Me.grpFiles.TabStop = False
-                Me.grpFiles.Text = Language.Base.Files
+                Me.grpFiles.Text = My.Resources.strGroupboxFiles
                '
                'lblLocalFile
                '
@@ -146,7 +146,7 @@ Namespace UI
                Me.grpConnection.Size = New System.Drawing.Size(668, 135)
                Me.grpConnection.TabIndex = 1000
                Me.grpConnection.TabStop = False
-                Me.grpConnection.Text = Language.Base.Connection
+                Me.grpConnection.Text = My.Resources.strGroupboxConnection
                '
                'radProtSFTP
                '
@@ -350,11 +350,11 @@ Namespace UI
            End Sub

            Private Sub ApplyLanguage()
-                grpFiles.Text = Language.Base.Files
+                grpFiles.Text = My.Resources.strGroupboxFiles
                lblLocalFile.Text = Language.Base.LocalFile & ":"
                lblRemoteFile.Text = Language.Base.RemoteFile & ":"
                btnBrowse.Text = Language.Base.Browse
-                grpConnection.Text = Language.Base.Connection
+                grpConnection.Text = My.Resources.strGroupboxConnection
                lblProtocol.Text = Language.Base.Props_Protocol & ":"
                lblPassword.Text = Language.Base.Props_Password & ":"
                lblUser.Text = Language.Base.User & ":"
--- a/mRemoteV1/UI/UI.Window.Tree.vb
+++ b/mRemoteV1/UI/UI.Window.Tree.vb
@@ -506,8 +506,8 @@ Namespace UI
                mMenView.Text = My.Resources.strMenuView
                mMenViewExpandAllFolders.Text = Language.Base.ExpandAllFolders
                mMenViewCollapseAllFolders.Text = Language.Base.CollapseAllFolders
-                TabText = Language.Base.Connections
-                Text = Language.Base.Connections
+                TabText = My.Resources.strConnections
+                Text = My.Resources.strConnections
            End Sub
 #End Region