Updated version number to 1.66 for release.

Signed-off-by: Andreas Rehm <rehm@itsolution2.de>

.gitignore

@@ -6,5 +6,14 @@ mRemoteV1/publish
 *.suo
 *.vbproj.user
 Thumbs.db
-_ReSharper.*
+[Dd]ebug/
+_Re[Ss]harper.*
+*.resharper
 *.resharper.user
+*.suo
+*.cache
+*~
+*.swp
+*.user*
+*.pidb
+*.gpState

BUILD.CMD

@@ -3,30 +3,34 @@
 SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 SET DEVENV="devenv.exe"
 SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
-SET RAR="%ProgramFiles%\WinRAR\Rar.exe"
-SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip"
-SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip"
+SET RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+SET BINARYZIP="%~dp0\Release\mRemoteNG-1.66.zip"
+SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.66.zip"
 
-call %VCVARSALL% x86
+call %VCVARSALL% x86 > NUL 2>&1
 
-rmdir /s /q "%~dp0\mRemoteV1\bin"
-rmdir /s /q "%~dp0\mRemoteV1\obj"
+rmdir /s /q "%~dp0\mRemoteV1\bin" > NUL 2>&1
+rmdir /s /q "%~dp0\mRemoteV1\obj" > NUL 2>&1
 
+echo Building release version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
+
+echo Building portable version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
 
 mkdir "%~dp0\Release"
 
+echo Creating installer package...
 %MAKENSIS% "%~dp0\Installer\mRemote.nsi"
 
-del /f /q %BINARYZIP%
+echo Creating release ZIP file...
+del /f /q %BINARYZIP% > NUL 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %BINARYZIP% "%~dp0\*.TXT"
 
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT"
-
-del /f /q %PORTABLEZIP%
-
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT"
+echo Creating portable ZIP file...
+del /f /q %PORTABLEZIP% > NUL 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %PORTABLEZIP% "%~dp0\*.TXT"

CREDITS.TXT

@@ -2,7 +2,9 @@ Contributors
 ============
 
 Felix Deimel
+Tom Hiller
 Riley McArdle
+Andreas Rehm
 David Vidmar
 
 

Installer/Language/czech.nsi

@@ -0,0 +1,16 @@
+; Czech installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_CZECH} "mRemoteNG run CZECH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_CZECH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_CZECH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."

Installer/Language/dutch.nsi

@@ -0,0 +1,16 @@
+; Dutch installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_DUTCH} "mRemoteNG run DUTCH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_DUTCH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_DUTCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."

Installer/Language/english.nsi

@@ -0,0 +1,16 @@
+; English installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_ENGLISH} "Launch mRemoteNG Now"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_ENGLISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_ENGLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."

Installer/Language/french.nsi

@@ -0,0 +1,16 @@
+; French installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_FRENCH} "mRemoteNG run FRENCH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_FRENCH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_FRENCH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."

Installer/Language/german.nsi

@@ -0,0 +1,16 @@
+; German installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_GERMAN} "mRemoteNG jetzt Starten"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_GERMAN} "Installationsprogamm Sprache"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte w<>hlen Sie die Sprache f<>r das Installationsprogramm"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG ben<65>tigt das Microsoft .NET Framework 2.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_GERMAN} "Sie m<>ssen Mitglied der Grupper 'Power Users' or 'Administratoren' sein, damit Sie mRemoteNG installieren k<>nnen."

Installer/Language/languages.nsi

@@ -0,0 +1,29 @@
+; Language names
+!define LanguageNameEnglish "English"
+!define LanguageNameGerman "Deutsch"
+!define LanguageNameDutch "Dutch"
+!define LanguageNameFrench "French"
+!define LanguageNamePolish "Polish"
+!define LanguageNameSpanish "Spanish"
+!define LanguageNameCzech "Czech"
+
+!insertmacro MUI_LANGUAGE "English"
+!include "Language\english.nsi"
+
+!insertmacro MUI_LANGUAGE "German"
+!include "Language\german.nsi"
+
+!insertmacro MUI_LANGUAGE "Dutch"
+!include "Language\dutch.nsi"
+
+!insertmacro MUI_LANGUAGE "French"
+!include "Language\french.nsi"
+
+!insertmacro MUI_LANGUAGE "Polish"
+!include "Language\polish.nsi"
+
+!insertmacro MUI_LANGUAGE "Spanish"
+!include "Language\spanish.nsi"
+
+!insertmacro MUI_LANGUAGE "Czech"
+!include "Language\czech.nsi"

Installer/Language/polish.nsi

@@ -0,0 +1,16 @@
+; Polish installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_POLISH} "mRemoteNG run POLISH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_POLISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_POLISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."

Installer/Language/spanish.nsi

@@ -0,0 +1,16 @@
+; Spanish installer translation
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_SPANISH} "mRemoteNG run SPANISH message"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_SPANISH} "Installer Language"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_SPANISH} "Please select the language of the installer"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_SPANISH} "You must be a member of the 'Power Users' or 'Administrators' group to install mRemoteNG."

Installer/mRemote.nsi

@@ -3,7 +3,7 @@
 !insertmacro VersionCompare
 
 !DEFINE PRODUCT_VERSION_MAJOR 1
-!DEFINE PRODUCT_VERSION_MINOR 63
+!DEFINE PRODUCT_VERSION_MINOR 66
 
 !DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
 !DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
@@ -21,12 +21,11 @@ RequestExecutionLevel admin
 
 ; Version Information
 VIProductVersion ${PRODUCT_VERSION_LONG}
-!DEFINE LANG_ENGLISH "1033-English"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "mRemoteNG"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" ${PRODUCT_VERSION_LONG}
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright <20> 2007-2010 Felix Deimel, Riley McArdle"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "mRemoteNG ${PRODUCT_VERSION} Installer"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" ${PRODUCT_VERSION_LONG}
+VIAddVersionKey "ProductName" "mRemoteNG"
+VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION_LONG}
+VIAddVersionKey "LegalCopyright" "Copyright <20> 2007-2009 Felix Deimel, 2010-2011 Riley McArdle"
+VIAddVersionKey "FileDescription" "mRemoteNG ${PRODUCT_VERSION} Installer"
+VIAddVersionKey "FileVersion" ${PRODUCT_VERSION_LONG}
 
 ; Design
 !define MUI_HEADERIMAGE
@@ -48,7 +47,6 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" ${PRODUCT_VERSION_LONG}
 
 ; Finish Page
 !define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_FINISHPAGE_RUN_Text "Launch mRemoteNG Now"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\mRemoteNG.exe"
 !insertmacro MUI_PAGE_FINISH
 
@@ -56,10 +54,73 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" ${PRODUCT_VERSION_LONG}
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 
-; Set Language
-!insertmacro MUI_LANGUAGE "English"
+; Get Languages
+!include "Language\languages.nsi"
+
+; Set finish page text
+!define MUI_FINISHPAGE_RUN_Text "$(LaunchMremoteNow)"
 
 Function .onInit
+	ClearErrors
+	UserInfo::GetName
+	IfErrors Win9x
+	Pop $0
+	UserInfo::GetAccountType
+	Pop $1
+	# GetOriginalAccountType will check the tokens of the original user of the
+	# current thread/process. If the user tokens were elevated or limited for
+	# this process, GetOriginalAccountType will return the non-restricted
+	# account type.
+	# On Vista with UAC, for example, this is not the same value when running
+	# with `RequestExecutionLevel user`. GetOriginalAccountType will return
+	# "admin" while GetAccountType will return "user".
+	StrCmp $1 "Admin" 0 +3
+		Goto doit
+	StrCmp $1 "Power" 0 +3
+		Goto doit
+	StrCmp $1 "User" 0 +3
+		Goto noop
+	StrCmp $1 "Guest" 0 +3
+		Goto noop
+	MessageBox MB_OK "Unknown error"
+	Goto doit
+
+	Win9x:
+	doit:
+		# We can install
+		Call SelectLanguage
+		Goto end
+	noop:
+		MessageBox MB_OK "$(RequiresAdminUser)"
+		Quit
+	end:
+FunctionEnd
+
+Function SelectLanguage
+	;Language selection dialog
+	Push ""
+	Push ${LANG_ENGLISH}
+	Push ${LanguageNameEnglish}
+	Push ${LANG_GERMAN}
+	Push ${LanguageNameGerman}
+	Push ${LANG_DUTCH}
+	Push ${LanguageNameDutch}
+	Push ${LANG_FRENCH}
+	Push ${LanguageNameFrench}
+	Push ${LANG_POLISH}
+	Push ${LanguageNamePolish}
+	Push ${LANG_SPANISH}
+	Push ${LanguageNameSpanish}
+	Push ${LANG_CZECH}
+	Push ${LanguageNameCzech}
+	Push A ; A means auto count languages
+	       ; for the auto count to work the first empty push (Push "") must remain
+	LangDLL::LangDialog  "$(InstallerLanguage)" "$(SelectInstallerLanguage)"
+
+	Pop $LANGUAGE
+	StrCmp $LANGUAGE "cancel" 0 +2
+		Abort
+
 	; Check .NET version
 	StrCpy $InstallDotNET "No"
 	Call GetDotNETVersion
@@ -77,14 +138,15 @@ Function .onInit
 	${EndIf}
 
 	${If} $InstallDotNET == "Yes"
-		MessageBox MB_OK|MB_ICONEXCLAMATION "mRemoteNG requires Microsoft .NET Framework 2.0."
+		MessageBox MB_OK|MB_ICONEXCLAMATION "$(RequiresNetFramework)"
 		Quit
 	${EndIf}
 FunctionEnd
 
 Section "" ; Install
 	SetOutPath $INSTDIR
-
+	SetShellVarContext all
+	
 	; AddFiles
 	File /r /x "mRemoteNG.vshost.*" "..\mRemoteV1\bin\Release\*.*"
 	File /r "Dependencies\*.*"
@@ -125,6 +187,11 @@ Section "un.Uninstall"
 	RMDIR /r $INSTDIR
 
 	; Start Menu
+	SetShellVarContext all
+	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
+	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
+	RMDir "$SMPROGRAMS\mRemoteNG"
+	SetShellVarContext current
 	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
 	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
 	RMDir "$SMPROGRAMS\mRemoteNG"

mRemoteV1/App/App.Announcement.vb

@@ -1,6 +1,5 @@
-Imports System.IO
-Imports System.Net
-Imports mRemote.App.Runtime
+Imports System.Net
+Imports mRemoteNG.App.Runtime
 
 Namespace App
     Public Class Announcement

mRemoteV1/App/App.Editions.vb

@@ -1,6 +1,4 @@
-Imports System.IO
-
-Namespace App
+Namespace App
     Namespace Editions
         Public Class Spanlink
             Public Shared Enabled As Boolean = True

mRemoteV1/App/App.Info.vb

@@ -15,7 +15,7 @@ Namespace App
 
         Public Class Settings
 #If Not PORTABLE Then
-            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName
+            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.ApplicationData) & "\" & My.Application.Info.ProductName
 #Else
             Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
 #End If

mRemoteV1/App/App.Native.vb

@@ -87,9 +87,33 @@ Namespace App
         Public Shared Function MapVirtualKey(ByVal wCode As Integer, ByVal wMapType As Integer) As Integer
         End Function
 
+        <DllImport("User32")> _
+        Public Shared Function SetClipboardViewer(ByVal hWndNewViewer As IntPtr) As IntPtr
+        End Function
+
+        <DllImport("User32")> _
+        Public Shared Function SendMessage(ByVal Handle As IntPtr, ByVal msg As Integer, ByVal wParam As IntPtr, ByVal lParam As IntPtr) As IntPtr
+        End Function
+
         <DllImport("user32")> _
         Public Shared Function PostMessage(ByVal hWnd As IntPtr, ByVal wMsg As Integer, ByVal wParam As Integer, ByVal lParam As Integer) As Long
         End Function
+
+        <DllImport("user32")> _
+        Public Shared Function RegisterHotKey(ByVal Handle As IntPtr, ByVal ID As Integer, ByVal Modifier As Integer, ByVal Key As Integer) As Integer
+        End Function
+
+        <DllImport("user32")> _
+        Public Shared Function UnregisterHotKey(ByVal Handle As IntPtr, ByVal ID As Integer) As Integer
+        End Function
+
+        <DllImport("kernel32")> _
+        Public Shared Function GlobalAddAtom(ByVal lpString As String) As Integer
+        End Function
+
+        <DllImport("kernel32")> _
+        Public Shared Function GlobalDeleteAtom(ByVal nAtom As Integer) As Integer
+        End Function
 #End Region
 
 #Region "Constants"
@@ -133,6 +157,9 @@ Namespace App
 
         Public Const VK_CONTROL As Integer = &H11
         Public Const VK_C As Integer = &H67
+
+        Public Const WM_DRAWCLIPBOARD As Integer = 776
+        Public Const WM_CHANGECBCHAIN As Integer = 781
 #End Region
     End Class
 End Namespace

mRemoteV1/App/App.Runtime.vb

@@ -2,9 +2,13 @@
 Imports System.IO
 Imports Crownwood
 Imports System.Threading
+Imports System.Xml
+Imports mRemoteNG.App.Native
+Imports System.Environment
 
 Namespace App
     Public Class Runtime
+
 #Region "Public Declarations"
         Public Shared sL As Config.Settings.Load
         Public Shared sS As Config.Settings.Save
@@ -33,13 +37,47 @@ Namespace App
 
         Public Shared LastSelected As String
 
-        Public Shared DefaultConnection As mRemote.Connection.Info
-        Public Shared DefaultInheritance As mRemote.Connection.Info.Inheritance
+        Public Shared DefaultConnection As mRemoteNG.Connection.Info
+        Public Shared DefaultInheritance As mRemoteNG.Connection.Info.Inheritance
 
         Public Shared ExtApps As New ArrayList()
+
+        'HotKeys
+        Public Shared HotKey_CtrlTab As clsHotKeyRegister
+        Public Shared HotKey_ShiftTab As clsHotKeyRegister
 #End Region
 
+        Public NotInheritable Class clsHotKeyRegister : Inherits NativeWindow
+            Private atomID As Integer
 
+            Event Pressed(ByVal ID As Integer)
+
+            Sub New(ByVal Modifier As ModifierKey, ByVal Key As Keys)
+                CreateHandle(New CreateParams)
+                atomID = GlobalAddAtom(GetHashCode())
+                RegisterHotKey(Handle, atomID, Modifier, Key)
+            End Sub
+
+            Sub Unregister()
+                UnregisterHotKey(Handle, atomID)
+            End Sub
+
+            Protected Overrides Sub WndProc(ByRef M As Message)
+                If M.Msg = 786 Then 'W_HOTKEY
+                    If ForegroundWindowRealtedToAppInstance() Then
+                        RaiseEvent Pressed(M.WParam.ToInt32)
+                    End If
+                End If
+                MyBase.WndProc(M)
+            End Sub
+
+            Public Enum ModifierKey
+                'None = 0  'Not a good idea to use, commenting out
+                Alt = 1
+                Ctrl = 2
+                Shift = 4
+            End Enum
+        End Class
         Public Class Windows
             Public Shared treeForm As UI.Window.Tree
             Public Shared treePanel As New DockContent
@@ -245,11 +283,20 @@ Namespace App
             End Sub
 
             Public Shared Sub CreateLogger()
-                log4net.Config.XmlConfigurator.Configure(New FileInfo("mRemote.exe.config"))
+                log4net.Config.XmlConfigurator.Configure(New FileInfo("mRemoteNG.exe.config"))
 
                 log = log4net.LogManager.GetLogger("mRemoteNG.Log")
             End Sub
 
+            Public Shared Sub RegisterHotKeys()
+                ' This causes Ctrl-Tab and Ctrl-Shift-Tab to not work in any other applications. Not good. Disabled for now.
+                ' 'Register HotKey
+                ' 'Ctrl-Tab  |  Advance one tab
+                ' HotKey_CtrlTab = New clsHotKeyRegister(clsHotKeyRegister.ModifierKey.Ctrl, Keys.Tab)
+                ' 'Shift-Tab  |  Reverse one tab
+                ' HotKey_ShiftTab = New clsHotKeyRegister(clsHotKeyRegister.ModifierKey.Ctrl + clsHotKeyRegister.ModifierKey.Shift, Keys.Tab)
+            End Sub
+
             Public Shared Sub UpdateCheck()
                 If My.Settings.CheckForUpdatesAsked And My.Settings.CheckForUpdatesOnStartup Then
                     If My.Settings.UpdatePending Or My.Settings.CheckForUpdatesLastCheck < Date.Now.Subtract(TimeSpan.FromDays(My.Settings.CheckForUpdatesFrequencyDays)) Then
@@ -331,7 +378,6 @@ Namespace App
                         NoReconnectParam = "norc"
                     End If
 
-
                     If ConsParam <> "" Then
                         If File.Exists(cmd(ConsParam)) = False Then
                             If File.Exists(My.Application.Info.DirectoryPath & "\" & cmd(ConsParam)) Then
@@ -369,7 +415,7 @@ Namespace App
                         My.Settings.ResetToolbars = True
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't parse command line args" & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strCommandLineArgsCouldNotBeParsed & vbNewLine & ex.Message)
                 End Try
             End Sub
 
@@ -411,20 +457,25 @@ Namespace App
 
                     If Editions.Spanlink.Enabled Then
                         If SaveReport() Then
+                            ' ToDo: Change Report.log location
                             File.Delete(My.Application.Info.DirectoryPath & "\Report.log")
                         End If
+
                     End If
+                    ' 'Unregister Hotkeys
+                    ' HotKey_CtrlTab.Unregister()
+                    ' HotKey_ShiftTab.Unregister()
 
                     sS.Save()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't save settings or dispose SysTray Icon" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSettingsCouldNotBeSavedOrTrayDispose & vbNewLine & ex.Message, True)
                 End Try
             End Sub
         End Class
 
 #Region "Default Connection"
-        Public Shared Function DefaultConnectionFromSettings() As mRemote.Connection.Info
-            DefaultConnection = New mRemote.Connection.Info
+        Public Shared Function DefaultConnectionFromSettings() As mRemoteNG.Connection.Info
+            DefaultConnection = New mRemoteNG.Connection.Info
             DefaultConnection.IsDefault = True
 
             Return DefaultConnection
@@ -434,7 +485,6 @@ Namespace App
             With DefaultConnection
                 My.Settings.ConDefaultDescription = .Description
                 My.Settings.ConDefaultIcon = .Icon
-                My.Settings.ConDefaultPanel = .Panel
                 My.Settings.ConDefaultUsername = .Username
                 My.Settings.ConDefaultPassword = .Password
                 My.Settings.ConDefaultDomain = .Domain
@@ -476,8 +526,8 @@ Namespace App
 #End Region
 
 #Region "Default Inheritance"
-        Public Shared Function DefaultInheritanceFromSettings() As mRemote.Connection.Info.Inheritance
-            DefaultInheritance = New mRemote.Connection.Info.Inheritance(Nothing)
+        Public Shared Function DefaultInheritanceFromSettings() As mRemoteNG.Connection.Info.Inheritance
+            DefaultInheritance = New mRemoteNG.Connection.Info.Inheritance(Nothing)
             DefaultInheritance.IsDefault = True
 
             Return DefaultInheritance
@@ -513,6 +563,7 @@ Namespace App
                 My.Settings.InhDefaultPostExtApp = .PostExtApp
                 My.Settings.InhDefaultMacAddress = .MacAddress
                 My.Settings.InhDefaultUserField = .UserField
+                ' VNC inheritance
                 My.Settings.InhDefaultVNCAuthMode = .VNCAuthMode
                 My.Settings.InhDefaultVNCColors = .VNCColors
                 My.Settings.InhDefaultVNCCompression = .VNCCompression
@@ -524,14 +575,26 @@ Namespace App
                 My.Settings.InhDefaultVNCProxyUsername = .VNCProxyUsername
                 My.Settings.InhDefaultVNCSmartSizeMode = .VNCSmartSizeMode
                 My.Settings.InhDefaultVNCViewOnly = .VNCViewOnly
+                ' Ext. App inheritance
                 My.Settings.InhDefaultExtApp = .ExtApp
+                ' RDP gateway inheritance
+                My.Settings.InhDefaultRDGatewayUsageMethod = .RDGatewayUsageMethod
+                My.Settings.InhDefaultRDGatewayHostname = .RDGatewayHostname
+                My.Settings.InhDefaultRDGatewayUsername = .RDGatewayUsername
+                My.Settings.InhDefaultRDGatewayPassword = .RDGatewayPassword
+                My.Settings.InhDefaultRDGatewayDomain = .RDGatewayDomain
+                My.Settings.InhDefaultRDGatewayUseConnectionCredentials = .RDGatewayUseConnectionCredentials
             End With
         End Sub
 #End Region
 
 #Region "Panels"
-        Public Shared Function AddPanel(Optional ByVal Title As String = Language.Base.NewPanel, Optional ByVal NoTabber As Boolean = False) As Form
+        Public Shared Function AddPanel(Optional ByVal Title As String = "", Optional ByVal NoTabber As Boolean = False) As Form
             Try
+                If Title = "" Then
+                    Title = My.Resources.strNewPanel
+                End If
+
                 Dim pnlcForm As New DockContent
                 Dim cForm As New UI.Window.Connection(pnlcForm)
                 pnlcForm = cForm
@@ -541,13 +604,13 @@ Namespace App
 
                 'create rename item
                 Dim cMenRen As New ToolStripMenuItem
-                cMenRen.Text = Language.Base.Rename
+                cMenRen.Text = My.Resources.strRename
                 cMenRen.Image = My.Resources.Rename
                 cMenRen.Tag = pnlcForm
                 AddHandler cMenRen.Click, AddressOf cMenConnectionPanelRename_Click
 
                 Dim cMenScreens As New ToolStripMenuItem
-                cMenScreens.Text = Language.Base.SendTo
+                cMenScreens.Text = My.Resources.strSendTo
                 cMenScreens.Image = My.Resources.Monitor
                 cMenScreens.Tag = pnlcForm
                 cMenScreens.DropDownItems.Add("Dummy")
@@ -581,7 +644,7 @@ Namespace App
                 Dim conW As UI.Window.Connection
                 conW = sender.Tag
 
-                Dim nTitle As String = InputBox(Language.Base.NewTitle & ":", , sender.Tag.Text.Replace("&&", "&"))
+                Dim nTitle As String = InputBox(My.Resources.strNewTitle & ":", , sender.Tag.Text.Replace("&&", "&"))
 
                 If nTitle <> "" Then
                     conW.SetFormText(nTitle.Replace("&", "&&"))
@@ -597,7 +660,7 @@ Namespace App
                 cMenScreens.DropDownItems.Clear()
 
                 For i As Integer = 0 To Screen.AllScreens.Length - 1
-                    Dim cMenScreen As New ToolStripMenuItem(Language.Base.Screen & " " & i + 1)
+                    Dim cMenScreen As New ToolStripMenuItem(My.Resources.strScreen & " " & i + 1)
                     cMenScreen.Tag = New ArrayList
                     cMenScreen.Image = My.Resources.Monitor_GoTo
                     TryCast(cMenScreen.Tag, ArrayList).Add(Screen.AllScreens(i))
@@ -628,37 +691,29 @@ Namespace App
 #End Region
 
 #Region "Connections Loading/Saving"
-        Public Shared Sub NewConnections()
+        Public Shared Sub NewConnections(ByVal filename As String)
             Try
                 cL = New Connection.List
                 ctL = New Container.List
 
                 Dim conL As New Config.Connections.Load
 
-                If File.Exists(App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile) = False Then
-                    If Directory.Exists(App.Info.Connections.DefaultConnectionsPath) = False Then
-                        Directory.CreateDirectory(App.Info.Connections.DefaultConnectionsPath)
-                    End If
+                My.Settings.LoadConsFromCustomLocation = False
 
-                    File.Copy(My.Application.Info.DirectoryPath & "\" & App.Info.Connections.DefaultConnectionsFileNew, App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile)
-                    conL.ConnectionFileName = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile
-                    My.Settings.LoadConsFromCustomLocation = False
-                Else
-                    Dim lD As SaveFileDialog = Tools.Controls.ConnectionsSaveAsDialog
-                    If lD.ShowDialog = System.Windows.Forms.DialogResult.OK Then
-                        File.Copy(My.Application.Info.DirectoryPath & "\" & App.Info.Connections.DefaultConnectionsFileNew, lD.FileName, True)
-                        conL.ConnectionFileName = lD.FileName
+                Dim xW As New XmlTextWriter(filename, System.Text.Encoding.UTF8)
+                xW.Formatting = Formatting.Indented
+                xW.Indentation = 4
 
-                        If conL.ConnectionFileName = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile Then
-                            My.Settings.LoadConsFromCustomLocation = False
-                        Else
-                            My.Settings.LoadConsFromCustomLocation = True
-                            My.Settings.CustomConsPath = conL.ConnectionFileName
-                        End If
-                    Else
-                        Exit Sub
-                    End If
-                End If
+                xW.WriteStartDocument()
+                xW.WriteStartElement(My.Resources.strConnections)
+                xW.WriteAttributeString("Export", "", "False")
+                xW.WriteAttributeString("Protected", "", "GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY")
+                xW.WriteAttributeString("ConfVersion", "", "2.2")
+
+                xW.WriteEndElement()
+                xW.WriteEndDocument()
+
+                xW.Close()
 
                 conL.ConnectionList = cL
                 conL.ContainerList = ctL
@@ -668,9 +723,11 @@ Namespace App
 
                 conL.RootTreeNode = Windows.treeForm.tvConnections.Nodes(0)
 
+                ' Load config
+                conL.ConnectionFileName = filename
                 conL.Load()
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new connections file" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strCouldNotCreateNewConnectionsFile & vbNewLine & ex.Message)
             End Try
         End Sub
 
@@ -733,12 +790,28 @@ Namespace App
                         End If
                     End If
 
+                    ' LocalApplicationData to ApplicationData move if needed
+                    Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName
+                    Dim newPath As String = App.Info.Connections.DefaultConnectionsPath
+                    Dim dirinfonew As IO.DirectoryInfo
+                    dirinfonew = New IO.DirectoryInfo(newPath)
+                    If (Not dirinfonew.Exists) Then
+                        Dim dirinfoold As IO.DirectoryInfo
+                        dirinfoold = New IO.DirectoryInfo(oldPath)
+                        If (dirinfoold.Exists) Then
+                            MkDir(dirinfonew.FullName)
+                            For Each fileInfo As FileInfo In dirinfoold.GetFiles
+                                File.Move(fileInfo.FullName, Path.Combine(newPath, fileInfo.Name))
+                            Next
+                        End If
+                    End If
+
                     If File.Exists(conL.ConnectionFileName) = False Then
                         If WithDialog Then
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "Connections file could not be loaded!" & vbNewLine & "Location was: " & conL.ConnectionFileName)
+                            mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strConnectionsFileCouldNotBeLoaded, conL.ConnectionFileName))
                         Else
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Connections file could not be loaded!" & vbNewLine & "Location was: " & conL.ConnectionFileName & vbNewLine & "Starting with new connections file.")
-                            App.Runtime.NewConnections()
+                            mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strConnectionsFileCouldNotBeLoadedNew, conL.ConnectionFileName))
+                            App.Runtime.NewConnections(conL.ConnectionFileName)
                         End If
 
                         Exit Sub
@@ -749,11 +822,10 @@ Namespace App
                             File.Copy(conL.ConnectionFileName, conL.ConnectionFileName & "_BAK", True)
                         End If
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "Couldn't create backup of connections file" & vbNewLine & vbNewLine & ex.Message)
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strConnectionsFileBackupFailed & vbNewLine & vbNewLine & ex.Message)
                     End Try
                 End If
 
-
                 conL.ConnectionList = cL
                 conL.ContainerList = ctL
 
@@ -788,7 +860,7 @@ Namespace App
                     tmrSqlWatcher.Start()
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't load connections file" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeLoaded & vbNewLine & ex.Message)
             End Try
         End Sub
 
@@ -803,9 +875,9 @@ Namespace App
                     For i As Integer = 0 To lD.FileNames.Length - 1
                         nNode = Tree.Node.AddNode(Tree.Node.Type.Container, "Import #" & i)
 
-                        Dim nContI As New mRemote.Container.Info()
+                        Dim nContI As New mRemoteNG.Container.Info()
                         nContI.TreeNode = nNode
-                        nContI.ConnectionInfo = New mRemote.Connection.Info(nContI)
+                        nContI.ConnectionInfo = New mRemoteNG.Connection.Info(nContI)
 
                         If Tree.Node.SelectedNode IsNot Nothing Then
                             If Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.Container Then
@@ -829,7 +901,7 @@ Namespace App
                     Next
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't import connections file" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeImported & vbNewLine & ex.Message)
             End Try
         End Sub
 
@@ -844,7 +916,7 @@ Namespace App
 
                         Dim nNode As TreeNode = Tree.Node.AddNode(Tree.Node.Type.Connection, Path.GetFileNameWithoutExtension(lD.FileNames(i)))
 
-                        Dim nConI As New mRemote.Connection.Info()
+                        Dim nConI As New mRemoteNG.Connection.Info()
                         nConI.Inherit = New Connection.Info.Inheritance(nConI)
 
                         nConI.Name = nNode.Text
@@ -948,18 +1020,18 @@ Namespace App
                     Next
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't import rdp file" & vbNewLine & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpFileCouldNotBeImported & vbNewLine & vbNewLine & ex.Message)
             End Try
         End Sub
 
-        Public Shared Sub ImportConnectionsFromPortScan(ByVal Hosts As ArrayList, ByVal Protocol As mRemote.Connection.Protocol.Protocols)
+        Public Shared Sub ImportConnectionsFromPortScan(ByVal Hosts As ArrayList, ByVal Protocol As mRemoteNG.Connection.Protocol.Protocols)
             For Each Host As Tools.PortScan.ScanHost In Hosts
-                Dim finalProt As mRemote.Connection.Protocol.Protocols
+                Dim finalProt As mRemoteNG.Connection.Protocol.Protocols
                 Dim protOK As Boolean = False
 
                 Dim nNode As TreeNode = Tree.Node.AddNode(Tree.Node.Type.Connection, Host.HostNameWithoutDomain)
 
-                Dim nConI As New mRemote.Connection.Info()
+                Dim nConI As New mRemoteNG.Connection.Info()
                 nConI.Inherit = New Connection.Info.Inheritance(nConI)
 
                 nConI.Name = Host.HostNameWithoutDomain
@@ -1088,11 +1160,12 @@ Namespace App
                     tmrSqlWatcher.Start()
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't save connections file" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionsFileCouldNotBeSaved & vbNewLine & ex.Message)
             End Try
         End Sub
 
         Public Shared Sub SaveConnectionsAs(ByVal SaveSecurity As Security.Save, ByVal RootNode As TreeNode)
+            Dim conS As New Config.Connections.Save
             Try
                 Dim tmrWasEnabled As Boolean
 
@@ -1103,7 +1176,6 @@ Namespace App
                     End If
                 End If
 
-                Dim conS As New Config.Connections.Save
 
                 Dim sD As SaveFileDialog = Tools.Controls.ConnectionsSaveAsDialog
 
@@ -1144,7 +1216,7 @@ Namespace App
 
                 conS.Save()
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't save connections file as" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strConnectionsFileCouldNotSaveAs, conS.ConnectionFileName) & vbNewLine & ex.Message)
             End Try
 
         End Sub
@@ -1188,7 +1260,7 @@ Namespace App
                 Next
 
                 If qHost <> "" Then
-                    nCi.Name = "Quick: " & qHost
+                    nCi.Name = String.Format(My.Resources.strQuick, qHost)
                     nCi.Hostname = qHost
                     nCi.Port = qPort
                     nCi.IsQuicky = True
@@ -1206,7 +1278,7 @@ Namespace App
                     '--------
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Creating quick connect failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectFailed & vbNewLine & ex.Message)
             End Try
 
             Return Nothing
@@ -1216,11 +1288,11 @@ Namespace App
             Try
                 OpenConnection(Connection.Info.Force.None)
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 
-        Public Shared Sub OpenConnection(ByVal Force As mRemote.Connection.Info.Force)
+        Public Shared Sub OpenConnection(ByVal Force As mRemoteNG.Connection.Info.Force)
             Try
                 If Windows.treeForm.tvConnections.SelectedNode.Tag Is Nothing Then
                     Exit Sub
@@ -1238,47 +1310,47 @@ Namespace App
                     Next
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 
-        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info)
+        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info)
             Try
                 OpenConnection(ConnectionInfo, Connection.Info.Force.None)
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 
-        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info, ByVal ConnectionForm As Form)
+        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info, ByVal ConnectionForm As Form)
             Try
                 OpenConnectionFinal(ConnectionInfo, Connection.Info.Force.None, ConnectionForm)
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 
-        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info, ByVal ConnectionForm As Form, ByVal Force As Connection.Info.Force)
+        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info, ByVal ConnectionForm As Form, ByVal Force As Connection.Info.Force)
             Try
                 OpenConnectionFinal(ConnectionInfo, Force, ConnectionForm)
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 
-        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemote.Connection.Info, ByVal Force As mRemote.Connection.Info.Force)
+        Public Shared Sub OpenConnection(ByVal ConnectionInfo As mRemoteNG.Connection.Info, ByVal Force As mRemoteNG.Connection.Info.Force)
             Try
                 OpenConnectionFinal(ConnectionInfo, Force, Nothing)
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 
 
-        Private Shared Sub OpenConnectionFinal(ByVal nCi As mRemote.Connection.Info, ByVal Force As mRemote.Connection.Info.Force, ByVal ConForm As Form)
+        Private Shared Sub OpenConnectionFinal(ByVal nCi As mRemoteNG.Connection.Info, ByVal Force As mRemoteNG.Connection.Info.Force, ByVal ConForm As Form)
             Try
                 If nCi.Hostname = "" And nCi.Protocol <> Connection.Protocol.Protocols.IntApp Then
-                    mC.AddMessage(Messages.MessageClass.WarningMsg, "Cannot open connection: No hostname specified")
+                    mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strConnectionOpenFailedNoHostname)
                     Exit Sub
                 End If
 
@@ -1295,7 +1367,7 @@ Namespace App
                     End If
                 End If
 
-
+                ' Create connection based on protocol type
                 Select Case nCi.Protocol
                     Case Connection.Protocol.Protocols.RDP
                         nProt = New Connection.Protocol.RDP
@@ -1321,7 +1393,7 @@ Namespace App
                         nProt = New Connection.Protocol.IntApp
 
                         If nCi.ExtApp = "" Then
-                            Throw New Exception("No Ext. App specified.")
+                            Throw New Exception(My.Resources.strNoExtAppDefined)
                         End If
                     Case Else
                         Exit Sub
@@ -1371,7 +1443,6 @@ Namespace App
                 AddHandler nProt.Closed, AddressOf Prot_Event_Closed
                 AddHandler nProt.ErrorOccured, AddressOf Prot_Event_ErrorOccured
 
-
                 nProt.InterfaceControl = New Connection.InterfaceControl(cContainer, nProt, nCi)
 
                 nProt.Force = Force
@@ -1403,12 +1474,12 @@ Namespace App
                     End If
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionOpenFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 
         Public Shared Function SwitchToOpenConnection(ByVal nCi As Connection.Info) As Boolean
-            Dim IC As mRemote.Connection.InterfaceControl = FindConnectionContainer(nCi)
+            Dim IC As mRemoteNG.Connection.InterfaceControl = FindConnectionContainer(nCi)
 
             If IC IsNot Nothing Then
                 TryCast(IC.FindForm, UI.Window.Connection).Focus()
@@ -1425,7 +1496,7 @@ Namespace App
 #Region "Event Handlers"
         Public Shared Sub Prot_Event_Disconnected(ByVal sender As Object, ByVal DisconnectedMessage As String)
             Try
-                mC.AddMessage(Messages.MessageClass.InformationMsg, "Protocol Event Disconnected" & vbNewLine & "Message: " & DisconnectedMessage, True)
+                mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strProtocolEventDisconnected, DisconnectedMessage), True)
 
                 Dim Prot As Connection.Protocol.Base = sender
                 If Prot.InterfaceControl.Info.Protocol = Connection.Protocol.Protocols.RDP Then
@@ -1434,14 +1505,14 @@ Namespace App
                     Dim ReasonDescription As String = Reason(1)
                     If ReasonCode > 3 Then
                         If ReasonDescription <> "" Then
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & ReasonDescription & vbNewLine & "Error code " & ReasonCode & ".")
+                            mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strRdpDisconnected & vbNewLine & ReasonDescription & vbNewLine & String.Format(My.Resources.strErrorCode, ReasonCode))
                         Else
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & "Error code " & ReasonCode & ".")
+                            mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strRdpDisconnected & vbNewLine & String.Format(My.Resources.strErrorCode, ReasonCode))
                         End If
                     End If
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Protocol Event Disconnected failed" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strProtocolEventDisconnectFailed, ex.Message), True)
             End Try
         End Sub
 
@@ -1449,15 +1520,14 @@ Namespace App
             Try
                 Dim Prot As Connection.Protocol.Base = sender
 
-                mC.AddMessage(Messages.MessageClass.InformationMsg, "Protocol Event Closed", True)
+                mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnenctionCloseEvent, True)
 
                 If App.Editions.Spanlink.Enabled Then
-                    mC.AddMessage(Messages.MessageClass.ReportMsg, "Connection to " & Prot.InterfaceControl.Info.Hostname & " via " & Prot.InterfaceControl.Info.Protocol.ToString & " closed by user " & My.User.Name & " (Description: " & Prot.InterfaceControl.Info.Description & "; User Field: " & Prot.InterfaceControl.Info.UserField & ")")
+                    mC.AddMessage(Messages.MessageClass.ReportMsg, String.Format(My.Resources.strConnenctionClosedByUserDetail, Prot.InterfaceControl.Info.Hostname, Prot.InterfaceControl.Info.Protocol.ToString, My.User.Name, Prot.InterfaceControl.Info.Description, Prot.InterfaceControl.Info.UserField))
                 Else
-                    mC.AddMessage(Messages.MessageClass.ReportMsg, "Connection to " & Prot.InterfaceControl.Info.Hostname & " via " & Prot.InterfaceControl.Info.Protocol.ToString & " closed by user " & My.User.Name)
+                    mC.AddMessage(Messages.MessageClass.ReportMsg, String.Format(My.Resources.strConnenctionClosedByUser, Prot.InterfaceControl.Info.Hostname, Prot.InterfaceControl.Info.Protocol.ToString, My.User.Name))
                 End If
 
-
                 Prot.InterfaceControl.Info.OpenConnections.Remove(Prot)
 
                 If Prot.InterfaceControl.Info.OpenConnections.Count < 1 And Prot.InterfaceControl.Info.IsQuicky = False Then
@@ -1471,30 +1541,30 @@ Namespace App
                     End If
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Protocol Event Closed failed" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnenctionCloseEventFailed & vbNewLine & ex.Message, True)
             End Try
         End Sub
 
         Public Shared Sub Prot_Event_Connected(ByVal sender As Object)
-            Dim prot As mRemote.Connection.Protocol.Base = sender
+            Dim prot As mRemoteNG.Connection.Protocol.Base = sender
 
-            mC.AddMessage(Messages.MessageClass.InformationMsg, "Protocol Event Connected", True)
-            mC.AddMessage(Messages.MessageClass.ReportMsg, "Connection to " & prot.InterfaceControl.Info.Hostname & " via " & prot.InterfaceControl.Info.Protocol.ToString & " established by user " & My.User.Name & " (Description: " & prot.InterfaceControl.Info.Description & "; User Field: " & prot.InterfaceControl.Info.UserField & ")")
+            mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnectionEventConnected, True)
+            mC.AddMessage(Messages.MessageClass.ReportMsg, String.Format(My.Resources.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol.ToString, My.User.Name, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField))
         End Sub
 
         Public Shared Sub Prot_Event_ErrorOccured(ByVal sender As Object, ByVal ErrorMessage As String)
             Try
-                mC.AddMessage(Messages.MessageClass.InformationMsg, "Protocol Event ErrorOccured", True)
+                mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strConnectionEventErrorOccured, True)
 
                 Dim Prot As Connection.Protocol.Base = sender
 
                 If Prot.InterfaceControl.Info.Protocol = Connection.Protocol.Protocols.RDP Then
                     If ErrorMessage > -1 Then
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Error!" & vbNewLine & "Error Code: " & ErrorMessage & vbNewLine & "Error Description: " & Connection.Protocol.RDP.FatalErrors.GetError(ErrorMessage))
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(My.Resources.strConnectionRdpErrorDetail, ErrorMessage, Connection.Protocol.RDP.FatalErrors.GetError(ErrorMessage)))
                     End If
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Protocol Event ErrorOccured failed" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionEventConnectionFailed & vbNewLine & ex.Message, True)
             End Try
         End Sub
 #End Region
@@ -1528,7 +1598,7 @@ Namespace App
 
 #Region "Misc"
         Public Shared Sub GoToURL(ByVal URL As String)
-            Dim cI As New mRemote.Connection.Info
+            Dim cI As New mRemoteNG.Connection.Info
 
             cI.Name = ""
             cI.Hostname = URL
@@ -1540,7 +1610,7 @@ Namespace App
             cI.SetDefaultPort()
             cI.IsQuicky = True
 
-            App.Runtime.OpenConnection(cI, mRemote.Connection.Info.Force.DoNotJump)
+            App.Runtime.OpenConnection(cI, mRemoteNG.Connection.Info.Force.DoNotJump)
         End Sub
 
         Public Shared Sub GoToWebsite()
@@ -1565,7 +1635,7 @@ Namespace App
                 sWr.WriteLine(Text)
                 sWr.Close()
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Writing to report file failed!")
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLogWriteToFileFailed)
             End Try
         End Sub
 
@@ -1581,7 +1651,7 @@ Namespace App
 
                 Return True
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't save report to final location. (App.Runtime.SaveReport)" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLogWriteToFileFinalLocationFailed & vbNewLine & ex.Message, True)
                 Return False
             End Try
         End Function
@@ -1604,7 +1674,7 @@ Namespace App
 
                 ChangeMainFormText(txt)
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Setting main form text failed" & vbNewLine & ex.Message, True)
+                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSettingMainFormTextFailed & vbNewLine & ex.Message, True)
             End Try
         End Sub
 
@@ -1653,6 +1723,45 @@ Namespace App
                 End If
             Next
         End Sub
+
+        'Determine if the Foreground window is current instance of mRemoteNG, Contained Putty instance or Contained External App instance
+        Public Shared Function ForegroundWindowRealtedToAppInstance() As Boolean
+            If GetForegroundWindow() = frmMain.Handle Then
+                Return True
+            End If
+
+            For Each conns As Connection.Info In cL
+                For Each openCon As Connection.Protocol.Base In conns.OpenConnections
+                    Select Case openCon.InterfaceControl.Info.Protocol
+                        Case Connection.Protocol.Protocols.SSH1
+                            If TryCast(openCon.InterfaceControl.Protocol, Connection.Protocol.PuttyBase).PuttyHandle = GetForegroundWindow() Then
+                                Return True
+                            End If
+                        Case Connection.Protocol.Protocols.SSH2
+                            If TryCast(openCon.InterfaceControl.Protocol, Connection.Protocol.PuttyBase).PuttyHandle = GetForegroundWindow() Then
+                                Return True
+                            End If
+                        Case Connection.Protocol.Protocols.RAW
+                            If TryCast(openCon.InterfaceControl.Protocol, Connection.Protocol.PuttyBase).PuttyHandle = GetForegroundWindow() Then
+                                Return True
+                            End If
+                        Case Connection.Protocol.Protocols.Rlogin
+                            If TryCast(openCon.InterfaceControl.Protocol, Connection.Protocol.PuttyBase).PuttyHandle = GetForegroundWindow() Then
+                                Return True
+                            End If
+                        Case Connection.Protocol.Protocols.Telnet
+                            If TryCast(openCon.InterfaceControl.Protocol, Connection.Protocol.PuttyBase).PuttyHandle = GetForegroundWindow() Then
+                                Return True
+                            End If
+                        Case Connection.Protocol.Protocols.IntApp
+                            If TryCast(openCon.InterfaceControl.Protocol, Connection.Protocol.IntApp).IntAppHandle = GetForegroundWindow() Then
+                                Return True
+                            End If
+                    End Select
+                Next
+            Next
+            Return False
+        End Function
 #End Region
 
 #Region "SQL Watcher"
@@ -1662,7 +1771,7 @@ Namespace App
 
         Private Shared Sub SQLUpdateCheckFinished(ByVal UpdateAvailable As Boolean)
             If UpdateAvailable = True Then
-                mC.AddMessage(Messages.MessageClass.InformationMsg, "SQL Update check finished and there is an update available! Going to refresh connections.", True)
+                mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strSqlUpdateCheckUpdateAvailable, True)
                 LoadConnectionsBG()
             End If
         End Sub

mRemoteV1/App/App.Update.vb

@@ -1,6 +1,6 @@
 Imports System.IO
 Imports System.Net
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace App
     Public Class Update
@@ -191,9 +191,6 @@ Namespace App
         End Sub
 #End Region
 
-
-
-
         Public Class Info
             Private _Version As Version
             Public Property Version() As Version

mRemoteV1/ApplicationEvents.vb

@@ -11,7 +11,7 @@
 
         Private Sub MyApplication_Startup(ByVal sender As Object, ByVal e As Microsoft.VisualBasic.ApplicationServices.StartupEventArgs) Handles Me.Startup
             If My.Settings.SingleInstance Then
-                Dim mutexID As String = "mRemote_SingleInstanceMutex"
+                Dim mutexID As String = "mRemoteNG_SingleInstanceMutex"
 
                 mutex = New System.Threading.Mutex(False, mutexID)
 

mRemoteV1/CHANGELOG.TXT

@@ -1,4 +1,33 @@
-1.63:
+1.66 (2011-05-02):
+  Fixed connections not working
+
+1.65 (2011-05-02):
+  Fixed Ctrl-Tab and Ctrl-Shift-Tab not working in any other applications while mRemoteNG is running
+  Ctrl-Tab and Ctrl-Shift-Tab no longer work to switch tabs within mRemoteNG
+  Fixed bug 36 - Install creates shortcuts only for the installing user
+  Fixed bug 38 - Application uses the wrong Application Data settings folder (in Local Settings)
+  Added code to the installer to check that the user is in the 'Power Users' or 'Administrators' group
+
+1.64 (2011-04-27):
+  Fixed bug 6 - VNC CTRL+key & keyboard combo mappings are broken
+  Fixed bug 12 - Tab switch is not working in config panel
+  Fixed bug 14 - RDP Connection authentication problem
+  Fixed bug 22 - External App parameter macro expansion doesn't work with "try to integrate"
+  Fixed bug 25 - Unhandled exception when mRemoteNG opens
+  Added multilanguage support and German translation to the application
+  Added Czech, Dutch, French, German, Polish, and Spanish translations to the installer
+  Added Ctrl-Tab hotkey to switch to the next tab and Ctrl-Shift-Tab to switch to the previous tab
+  Added Tab key to cycle through entries in the Config grid and Shift-Tab to cycle in reverse
+  Added ability to configure external tools to run before or after a connection is established
+  Fixed missing parameters in macro expansion for external tools
+  Fixed RD Gateway and other inheritance bugs
+  Changed how new connection files are created
+  Changed the internal namespace of the application to mRemoteNG instead of mRemote
+  Added credit for the DockPanel Suite to the About page
+  Updated DockPanel Suite to version 2.5 RC1
+  Updated VNCSharpNG to correct Ctrl and Alt key pass-through behavior
+
+1.63 (2010-02-02):
   New icon and logo
   Fixed problems moving or resizing the main window while PuTTY (SSH/telnet/rlogin/raw) connections are open
   Fixed PuTTY processes not closing on Vista and 7 with UAC enabled
@@ -13,7 +42,7 @@
   Popups can now be allowed in Internet Explorer by holding Ctrl+Alt when clicking a link
   Added PuTTY Settings item to tab context menu
 
-1.62:
+1.62 (2010-01-19):
   Switched to VncSharp, an open source VNC component
   VNC is supported again except for the following features:
     Windows authentication
@@ -29,11 +58,11 @@
   Added RDP, VNC and ICA version numbers to Components Check page
   Fixed a bug with the inheritance buttons on the Config panel disappearing after awhile
 
-1.61:
+1.61 (2010-01-14):
   Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX
   This version of mRemoteNG does not support VNC
 
-1.60:
+1.60 (2010-01-09):
   Changed name to mRemoteNG
   Fixed menu bar not staying docked to left side
   Removed snakes game Easter egg

mRemoteV1/Config/Config.Connections.Load.vb

@@ -1,6 +1,7 @@
 Imports System.Windows.Forms
 Imports System.Xml
-Imports mRemote.App.Runtime
+Imports System.Globalization
+Imports mRemoteNG.App.Runtime
 Imports System.Data
 Imports System.Data.SqlClient
 Imports System.IO
@@ -17,7 +18,7 @@ Namespace Config
             Private sqlQuery As SqlCommand
             Private sqlRd As SqlDataReader
 
-            Private sqlDB As String = "mRemote"
+            Private sqlDB As String = "mRemoteNG"
 
             Private selNode As TreeNode
 #End Region
@@ -83,10 +84,6 @@ Namespace Config
                 End Set
             End Property
 
-
-
-
-
             Private _ConnectionFileName As String
             Public Property ConnectionFileName() As String
                 Get
@@ -201,10 +198,8 @@ Namespace Config
                         sqlRd.Read()
                     End If
 
-                    Dim originalCulture As System.Globalization.CultureInfo = My.Application.Culture
-                    My.Application.ChangeCulture("en-US")
-                    Me.confVersion = Convert.ToDouble(sqlRd.Item("confVersion"))
-                    My.Application.ChangeCulture(originalCulture.ToString)
+                    Dim enCulture As CultureInfo = New CultureInfo("en-US")
+                    Me.confVersion = Convert.ToDouble(sqlRd.Item("confVersion"), enCulture)
 
                     Dim rootNode As TreeNode
                     rootNode = New TreeNode(sqlRd.Item("Name"))
@@ -266,7 +261,7 @@ Namespace Config
 
                     sqlCon.Close()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLoadFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -412,7 +407,7 @@ Namespace Config
                         'AddNodesFromSQL(tNode)
                     End While
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodesFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strAddNodesFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -445,7 +440,7 @@ Namespace Config
                         conI.Port = .Item("Port")
                         conI.PuttySession = .Item("PuttySession")
 
-                        conI.Colors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPColors), .Item("Colors"))
+                        conI.Colors = .Item("Colors")
                         conI.Resolution = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPResolutions), .Item("Resolution"))
 
                         conI.Inherit = New Connection.Info.Inheritance(conI)
@@ -537,9 +532,9 @@ Namespace Config
                         End If
 
                         If Me.confVersion >= 2.2 Then
-                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
                             conI.RDGatewayHostname = .Item("RDGatewayHostname")
-                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials"))
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials"))
                             conI.RDGatewayUsername = .Item("RDGatewayUsername")
                             conI.RDGatewayPassword = Security.Crypt.Decrypt(.Item("RDGatewayPassword"), pW)
                             conI.RDGatewayDomain = .Item("RDGatewayDomain")
@@ -557,7 +552,7 @@ Namespace Config
 
                     Return conI
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetConnectionInfoFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strGetConnectionInfoFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Return Nothing
@@ -625,12 +620,10 @@ Namespace Config
                     End If
 
                     If xDom.DocumentElement.HasAttribute("ConfVersion") Then
-                        Dim originalCulture As System.Globalization.CultureInfo = My.Application.Culture
-                        My.Application.ChangeCulture("en-US")
-                        Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value)
-                        My.Application.ChangeCulture(originalCulture.ToString)
+                        Dim enCulture As System.Globalization.CultureInfo = New CultureInfo("en-US")
+                        Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value, enCulture)
                     Else
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "You are trying to load a connection file that was created using an very early version of mRemote, this could result in an runtime error." & vbNewLine & "If you run into such an error, please create a new connection file!")
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strOldConffile)
                     End If
 
                     ' SECTION 2. Initialize the treeview control.
@@ -668,7 +661,7 @@ Namespace Config
                     End If
 
                     If Me._Import = True And imp = False Then
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "You cannot import a normal connection file." & vbNewLine & "Please use File - Load Connections for normal connection files!")
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strCannotImportNormalSessionFile)
 
                         Exit Sub
                     End If
@@ -707,7 +700,7 @@ Namespace Config
                     App.Runtime.Windows.treeForm.InitialRefresh()
                 Catch ex As Exception
                     App.Runtime.ConnectionsFileLoaded = False
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadFromXML failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strLoadFromXmlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -783,7 +776,7 @@ Namespace Config
                         inTreeNode.Text = inXmlNode.Attributes("Name").Value.Trim
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeFromXML failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strAddNodeFromXmlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -921,7 +914,7 @@ Namespace Config
                             conI.Inherit = New Connection.Info.Inheritance(conI, .Attributes("Inherit").Value)
 
                             conI.Icon = .Attributes("Icon").Value.Replace(".ico", "")
-                            conI.Panel = "General"
+                            conI.Panel = My.Resources.strGeneral
                         End If
 
                         If Me.confVersion > 1.4 Then '1.5
@@ -929,7 +922,7 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.5 Then '1.6
-                            conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value)
+                            conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value)
                             conI.Inherit.ICAEncryption = .Attributes("InheritICAEncryptionStrength").Value
 
                             conI.PreExtApp = .Attributes("PreExtApp").Value
@@ -939,16 +932,16 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.6 Then '1.7
-                            conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value)
-                            conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value)
-                            conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value)
-                            conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value)
+                            conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value)
+                            conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value)
+                            conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value)
+                            conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value)
                             conI.VNCProxyIP = .Attributes("VNCProxyIP").Value
                             conI.VNCProxyPort = .Attributes("VNCProxyPort").Value
                             conI.VNCProxyUsername = .Attributes("VNCProxyUsername").Value
                             conI.VNCProxyPassword = Security.Crypt.Decrypt(.Attributes("VNCProxyPassword").Value, pW)
-                            conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value)
-                            conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value)
+                            conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value)
+                            conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value)
                             conI.VNCViewOnly = .Attributes("VNCViewOnly").Value
 
                             conI.Inherit.VNCCompression = .Attributes("InheritVNCCompression").Value
@@ -965,13 +958,13 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.7 Then '1.8
-                            conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value)
+                            conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value)
 
                             conI.Inherit.RDPAuthenticationLevel = .Attributes("InheritRDPAuthenticationLevel").Value
                         End If
 
                         If Me.confVersion > 1.8 Then '1.9
-                            conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value)
+                            conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value)
                             conI.MacAddress = .Attributes("MacAddress").Value
 
                             conI.Inherit.RenderingEngine = .Attributes("InheritRenderingEngine").Value
@@ -989,14 +982,18 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 2.1 Then '2.2
-                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
+                            ' Get settings
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
                             conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value
-                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value)
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value)
                             conI.RDGatewayUsername = .Attributes("RDGatewayUsername").Value
                             conI.RDGatewayPassword = Security.Crypt.Decrypt(.Attributes("RDGatewayPassword").Value, pW)
                             conI.RDGatewayDomain = .Attributes("RDGatewayDomain").Value
+
+                            ' Get inheritance settings
                             conI.Inherit.RDGatewayUsageMethod = .Attributes("InheritRDGatewayUsageMethod").Value
                             conI.Inherit.RDGatewayHostname = .Attributes("InheritRDGatewayHostname").Value
+                            conI.Inherit.RDGatewayUseConnectionCredentials = .Attributes("InheritRDGatewayUseConnectionCredentials").Value
                             conI.Inherit.RDGatewayUsername = .Attributes("InheritRDGatewayUsername").Value
                             conI.Inherit.RDGatewayPassword = .Attributes("InheritRDGatewayPassword").Value
                             conI.Inherit.RDGatewayDomain = .Attributes("InheritRDGatewayDomain").Value
@@ -1005,12 +1002,12 @@ Namespace Config
 
                     Return conI
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetConnectionInfoFromXml failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strGetConnectionInfoFromXmlFailed & vbNewLine & ex.Message, True)
                     Return Nothing
                 End Try
             End Function
 
-            Private Function Authenticate(ByVal Value As String, ByVal CompareToOriginalValue As Boolean, Optional ByVal RootInfo As mRemote.Root.Info = Nothing) As Boolean
+            Private Function Authenticate(ByVal Value As String, ByVal CompareToOriginalValue As Boolean, Optional ByVal RootInfo As mRemoteNG.Root.Info = Nothing) As Boolean
                 If CompareToOriginalValue Then
                     Do Until Security.Crypt.Decrypt(Value, pW) <> Value
                         pW = Tools.Misc.PasswordDialog(False)

mRemoteV1/Config/Config.Connections.Save.vb

@@ -1,9 +1,10 @@
 Imports System.Windows.Forms
 Imports System.Xml
 Imports System.IO
-Imports mRemote.App.Runtime
+Imports System.Globalization
+Imports mRemoteNG.App.Runtime
 Imports System.Data.SqlClient
-Imports mRemote.Tools.Misc
+Imports mRemoteNG.Tools.Misc
 
 Namespace Config
     Namespace Connections
@@ -178,8 +179,8 @@ Namespace Config
 
                 Dim strProtected As String
                 If tN.Tag IsNot Nothing Then
-                    If TryCast(tN.Tag, mRemote.Root.Info).Password = True Then
-                        pW = TryCast(tN.Tag, mRemote.Root.Info).PasswordString
+                    If TryCast(tN.Tag, mRemoteNG.Root.Info).Password = True Then
+                        pW = TryCast(tN.Tag, mRemoteNG.Root.Info).PasswordString
                         strProtected = Security.Crypt.Encrypt("ThisIsProtected", pW)
                     Else
                         strProtected = Security.Crypt.Encrypt("ThisIsNotProtected", pW)
@@ -191,14 +192,10 @@ Namespace Config
                 sqlQuery = New SqlCommand("DELETE FROM tblRoot", sqlCon)
                 sqlWr = sqlQuery.ExecuteNonQuery
 
-
-                Dim originalCulture As System.Globalization.CultureInfo = My.Application.Culture
-                My.Application.ChangeCulture("en-US")
-                sqlQuery = New SqlCommand("INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES('" & PrepareValueForDB(tN.Text) & "', 0, '" & strProtected & "'," & App.Info.Connections.ConnectionFileVersion & ")", sqlCon)
-                My.Application.ChangeCulture(originalCulture.ToString)
+                Dim enCulture As CultureInfo = New CultureInfo("en-US")
+                sqlQuery = New SqlCommand("INSERT INTO tblRoot (Name, Export, Protected, ConfVersion) VALUES('" & PrepareValueForDB(tN.Text) & "', 0, '" & strProtected & "'," & App.Info.Connections.ConnectionFileVersion.ToString(enCulture) & ")", sqlCon)
                 sqlWr = sqlQuery.ExecuteNonQuery
 
-
                 sqlQuery = New SqlCommand("DELETE FROM tblCons", sqlCon)
                 sqlWr = sqlQuery.ExecuteNonQuery
 
@@ -534,18 +531,16 @@ Namespace Config
                     If exp Then
                         xW.WriteAttributeString("Protected", "", Security.Crypt.Encrypt("ThisIsNotProtected", pW))
                     Else
-                        If TryCast(tN.Tag, mRemote.Root.Info).Password = True Then
-                            pW = TryCast(tN.Tag, mRemote.Root.Info).PasswordString
+                        If TryCast(tN.Tag, mRemoteNG.Root.Info).Password = True Then
+                            pW = TryCast(tN.Tag, mRemoteNG.Root.Info).PasswordString
                             xW.WriteAttributeString("Protected", "", Security.Crypt.Encrypt("ThisIsProtected", pW))
                         Else
                             xW.WriteAttributeString("Protected", "", Security.Crypt.Encrypt("ThisIsNotProtected", pW))
                         End If
                     End If
 
-                    Dim originalCulture As System.Globalization.CultureInfo = My.Application.Culture
-                    My.Application.ChangeCulture("en-US")
-                    xW.WriteAttributeString("ConfVersion", "", App.Info.Connections.ConnectionFileVersion)
-                    My.Application.ChangeCulture(originalCulture.ToString)
+                    Dim enCulture As System.Globalization.CultureInfo = New CultureInfo("en-US")
+                    xW.WriteAttributeString("ConfVersion", "", App.Info.Connections.ConnectionFileVersion.ToString(enCulture))
 
                     Dim tNC As TreeNodeCollection
                     tNC = tN.Nodes

mRemoteV1/Config/Config.Settings.Load.vb

@@ -1,6 +1,6 @@
 Imports System.IO
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Xml
 
 Namespace Config
@@ -206,6 +206,11 @@ Namespace Config
 
 #Region "Private Methods"
             Private Function GetContentFromPersistString(ByVal persistString As String) As IDockContent
+                ' pnlLayout.xml persistence XML fix for refactoring to mRemoteNG
+                If (persistString.StartsWith("mRemote.")) Then
+                    persistString = persistString.Replace("mRemote.", "mRemoteNG.")
+                End If
+
                 Try
                     If persistString = GetType(UI.Window.Config).ToString Then
                         Return Windows.configPanel

mRemoteV1/Config/Config.Settings.Save.vb

@@ -1,4 +1,4 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Xml
 Imports System.IO
 

mRemoteV1/Connection/Connection.Icon.vb

@@ -1,5 +1,5 @@
 Imports System.ComponentModel
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Public Class Icon

mRemoteV1/Connection/Connection.InterfaceControl.vb

@@ -1,6 +1,6 @@
 Imports System.Windows.Forms
 Imports System.Drawing
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Public Class InterfaceControl

mRemoteV1/Connection/Connection.List.vb

@@ -1,5 +1,3 @@
-Imports System.Windows.Forms
-
 Namespace Connection
     Public Class List
         Inherits CollectionBase

mRemoteV1/Connection/Connection.Protocol.Base.vb

@@ -1,6 +1,6 @@
 Imports System.Windows.Forms
 Imports System.Threading
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Namespace Protocol
@@ -39,12 +39,12 @@ Namespace Connection
             End Property
 #End Region
 
-            Private _Force As mRemote.Connection.Info.Force
-            Public Property Force() As mRemote.Connection.Info.Force
+            Private _Force As mRemoteNG.Connection.Info.Force
+            Public Property Force() As mRemoteNG.Connection.Info.Force
                 Get
                     Return Me._Force
                 End Get
-                Set(ByVal value As mRemote.Connection.Info.Force)
+                Set(ByVal value As mRemoteNG.Connection.Info.Force)
                     Me._Force = value
                 End Set
             End Property

mRemoteV1/Connection/Connection.Protocol.HTTP.vb

@@ -1,6 +1,3 @@
-Imports System.Windows.Forms
-Imports mRemote.App.Runtime
-
 Namespace Connection
     Namespace Protocol
         Public Class HTTP

mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb

@@ -1,6 +1,7 @@
 Imports System.Windows.Forms
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -26,7 +27,7 @@ Namespace Connection
 
                     NewExtended()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new Connection.Protocol.HTTPBase" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -64,7 +65,7 @@ Namespace Connection
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.HTTPBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -107,7 +108,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Connect (Connection.Protocol.HTTPBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -163,16 +164,16 @@ Namespace Connection
                         End If
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.WarningMsg, "wBrowser_DocumentTitleChanged (Connection.Protocol.HTTPBase) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strHttpDocumentTileChangeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
 
 #Region "Enums"
             Public Enum RenderingEngine
-                <Description("Internet Explorer")> _
+                <LocalizedDescription("strHttpInternetExplorer")> _
                 IE = 1
-                <Description("Gecko (Firefox)")> _
+                <LocalizedDescription("strHttpGecko")> _
                 Gecko = 2
             End Enum
 

mRemoteV1/Connection/Connection.Protocol.HTTPS.vb

@@ -1,5 +1,5 @@
 Imports System.Windows.Forms
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Namespace Protocol

mRemoteV1/Connection/Connection.Protocol.ICA.vb

@@ -1,7 +1,8 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Threading
 Imports AxWFICALib
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -18,7 +19,7 @@ Namespace Connection
                 Try
                     Me.Control = New AxICAClient
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new Connection.Protocol.ICA" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaControlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -51,7 +52,7 @@ Namespace Connection
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.ICA)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -64,7 +65,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed!" & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
@@ -110,7 +111,7 @@ Namespace Connection
                         ICA.Domain = _dom
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ICA SetCredentials failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetCredentialsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -135,7 +136,7 @@ Namespace Connection
                             ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, RDP.Resolutions.Items(Int(Info.Resolution)).Width, RDP.Resolutions.Items(Int(Info.Resolution)).Height, 0)
                     End Select
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ICA SetResolution failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetResolutionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -174,7 +175,7 @@ Namespace Connection
                     AddHandler ICA.OnConnectFailed, AddressOf ICAEvent_OnConnectFailed
                     AddHandler ICA.OnDisconnect, AddressOf ICAEvent_OnDisconnect
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ICA SetEventHandlers failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -229,15 +230,15 @@ Namespace Connection
             End Enum
 
             Public Enum EncryptionStrength
-                <Description("Basic")> _
+                <LocalizedDescription("strEncBasic")> _
                 EncrBasic = 1
-                <Description("128 Bit (logon only)")> _
+                <LocalizedDescription("strEnc128BitLogonOnly")> _
                 Encr128BitLogonOnly = 127
-                <Description("40 Bit")> _
+                <LocalizedDescription("strEnc40Bit")> _
                 Encr40Bit = 40
-                <Description("56 Bit")> _
+                <LocalizedDescription("strEnc56Bit")> _
                 Encr56Bit = 56
-                <Description("128 Bit")> _
+                <LocalizedDescription("strEnc128Bit")> _
                 Encr128Bit = 128
             End Enum
 #End Region

mRemoteV1/Connection/Connection.Protocol.IntApp.vb

@@ -1,8 +1,6 @@
-Imports mRemote.App.Native
+Imports mRemoteNG.App.Native
 Imports System.Threading
-Imports Microsoft.Win32
-Imports System.Drawing
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Namespace Protocol
@@ -112,12 +110,11 @@ Namespace Connection
 
                     IntAppHandle = IntAppProcess.MainWindowHandle
 
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strIntAppStuff, True)
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "--- IntApp Stuff ---", True)
-
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "IntApp Handle: " & IntAppHandle.ToString, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "IntApp Title: " & IntAppProcess.MainWindowTitle, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "IntApp Handle: " & Me.InterfaceControl.Parent.Handle.ToString, True)
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppHandle, IntAppHandle.ToString), True)
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppTitle, IntAppProcess.MainWindowTitle), True)
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True)
 
                     SetParent(Me.IntAppHandle, Me.InterfaceControl.Parent.Handle)
                     SetWindowLong(Me.IntAppHandle, 0, WS_VISIBLE)
@@ -128,7 +125,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Connect" & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
@@ -138,7 +135,7 @@ Namespace Connection
                 Try
                     SetForegroundWindow(IntAppHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Focus (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -146,7 +143,7 @@ Namespace Connection
                 Try
                     MoveWindow(IntAppHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), Me.InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), Me.InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Resize (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppResizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -156,7 +153,7 @@ Namespace Connection
                         IntAppProcess.Kill()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Killing IntApp Process failed (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppKillFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Try
@@ -164,7 +161,7 @@ Namespace Connection
                         IntAppProcess.Dispose()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Dispose of IntApp process failed (Connection.Protocol.IntApp)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppDisposeFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 MyBase.Close()

mRemoteV1/Connection/Connection.Protocol.Protocols.vb

@@ -1,29 +1,30 @@
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
         Public Enum Protocols
-            <Description("RDP")> _
+            <LocalizedDescription("strRDP")> _
             RDP = 0
-            <Description("VNC")> _
+            <LocalizedDescription("strVnc")> _
             VNC = 1
-            <Description("SSH1")> _
+            <LocalizedDescription("strSsh1")> _
             SSH1 = 2
-            <Description("SSH2")> _
+            <LocalizedDescription("strSsh2")> _
             SSH2 = 3
-            <Description("Telnet")> _
+            <LocalizedDescription("strTelnet")> _
             Telnet = 4
-            <Description("Rlogin")> _
+            <LocalizedDescription("strRlogin")> _
             Rlogin = 5
-            <Description("RAW")> _
+            <LocalizedDescription("strRAW")> _
             RAW = 6
-            <Description("HTTP")> _
+            <LocalizedDescription("strHttp")> _
             HTTP = 7
-            <Description("HTTPS")> _
+            <LocalizedDescription("strHttps")> _
             HTTPS = 8
-            <Description("ICA")> _
+            <LocalizedDescription("strICA")> _
             ICA = 9
-            <Description("Ext. App")> _
+            <LocalizedDescription("strExtApp")> _
             IntApp = 20
             <Browsable(False)> _
             NONE = 999

mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb

@@ -1,8 +1,8 @@
-Imports mRemote.App.Native
+Imports mRemoteNG.App.Native
 Imports System.Threading
 Imports Microsoft.Win32
 Imports System.Drawing
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Namespace Protocol
@@ -165,11 +165,11 @@ Namespace Connection
                     PuttyHandle = PuttyProcess.MainWindowHandle
 
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "--- PuTTY Stuff ---", True)
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strPuttyStuff, True)
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Handle: " & PuttyHandle.ToString, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Title: " & PuttyProcess.MainWindowTitle, True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "Panel Handle: " & Me.InterfaceControl.Parent.Handle.ToString, True)
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyHandle, PuttyHandle.ToString), True)
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyTitle, PuttyProcess.MainWindowTitle), True)
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True)
 
                     SetParent(PuttyHandle, InterfaceControl.Parent.Handle)
                     ShowWindow(PuttyHandle, SW_SHOWMAXIMIZED)
@@ -178,7 +178,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Connect" & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
@@ -187,7 +187,7 @@ Namespace Connection
                 Try
                     'SetForegroundWindow(PuttyHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Focus (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -195,7 +195,7 @@ Namespace Connection
                 Try
                     MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), Me.InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), Me.InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Resize (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyResizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -205,13 +205,13 @@ Namespace Connection
                         PuttyProcess.Kill()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Killing Putty Process failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyKillFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Try
                     PuttyProcess.Dispose()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Dispose of Putty process failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyDisposeFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 MyBase.Close()
@@ -222,7 +222,7 @@ Namespace Connection
                     PostMessage(Me.PuttyHandle, WM_SYSCOMMAND, IDM_RECONF, 0)
                     SetForegroundWindow(Me.PuttyHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ShowSettingsDialog failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -244,7 +244,7 @@ Namespace Connection
 
                     Return arrKeys
                 Catch ex As Exception
-                    App.Runtime.mC.AddMessage(Messages.MessageClass.WarningMsg, "Couldn't get Putty sessions" & vbNewLine & ex.Message, True)
+                    App.Runtime.mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strPuttyGetSessionsFailed & vbNewLine & ex.Message, True)
                     Return Nothing
                 End Try
             End Function
@@ -258,9 +258,9 @@ Namespace Connection
                     p = Process.Start(pSI)
                     p.WaitForExit()
 
-                    mRemote.Connection.PuttySession.PuttySessions = GetSessions()
+                    mRemoteNG.Connection.PuttySession.PuttySessions = GetSessions()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Start Putty (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyStartFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region

mRemoteV1/Connection/Connection.Protocol.RDP.vb

@@ -3,7 +3,8 @@ Imports System.Threading
 Imports AxMSTSCLib
 Imports EOLWTSCOM
 Imports System.ComponentModel
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -58,11 +59,10 @@ Namespace Connection
                             System.Windows.Forms.Application.DoEvents()
                         Loop
                     Catch comEx As System.Runtime.InteropServices.COMException
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create RDP control, please check mRemote requirements." & vbNewLine & vbNewLine & comEx.Message)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpControlCreationFailed & vbNewLine & vbNewLine & comEx.Message)
                         RDP.Dispose()
                         Return False
                     End Try
- 
 
                     Me.RDPVersion = New Version(RDP.Version)
 
@@ -75,7 +75,7 @@ Namespace Connection
                     'not user changeable
                     RDP.AdvancedSettings2.GrabFocusOnConnect = True
                     RDP.AdvancedSettings3.EnableAutoReconnect = True
-                    RDP.AdvancedSettings3.MaxReconnectAttempts = 3
+                    RDP.AdvancedSettings3.MaxReconnectAttempts = My.Settings.RdpReconnectionCount
                     RDP.AdvancedSettings2.keepAliveInterval = 60000 'in milliseconds (10.000 = 10 seconds)
                     RDP.AdvancedSettings5.AuthenticationLevel = 0
                     RDP.AdvancedSettings.EncryptionEnabled = 1
@@ -96,11 +96,11 @@ Namespace Connection
 
                     Me.SetPerformanceFlags()
 
-                    RDP.ConnectingText = Language.Base.Connecting
+                    RDP.ConnectingText = My.Resources.strConnecting
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetProps failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -113,7 +113,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed!" & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpConnectionOpenFailed & vbNewLine & ex.Message)
                 End Try
 
                 Return False
@@ -123,7 +123,7 @@ Namespace Connection
                 Try
                     RDP.Disconnect()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP Disconnect failed, trying to close" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpDisconnectFailed & vbNewLine & ex.Message, True)
                     MyBase.Close()
                 End Try
             End Sub
@@ -132,7 +132,7 @@ Namespace Connection
                 Try
                     Me.Fullscreen = Not Me.Fullscreen
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP ToggleFullscreen failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpToggleFullscreenFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -140,7 +140,7 @@ Namespace Connection
                 Try
                     Me.SmartSize = Not Me.SmartSize
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP ToggleSmartSize failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpToggleSmartSizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -150,7 +150,7 @@ Namespace Connection
                         RDP.Focus()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP Focus failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -159,7 +159,7 @@ Namespace Connection
             Private Sub SetRDGateway()
                 Try
                     If RDP.TransportSettings.GatewayIsSupported = 1 Then
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is supported", True)
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strRdpGatewayIsSupported, True)
                         If Me.Info.RDGatewayUsageMethod <> RDGatewayUsageMethod.Never Then
                             RDP.TransportSettings2.GatewayProfileUsageMethod = 1
                             RDP.TransportSettings.GatewayUsageMethod = Me.Info.RDGatewayUsageMethod
@@ -175,10 +175,10 @@ Namespace Connection
                             End If
                         End If
                     Else
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is not supported", True)
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strRdpGatewayNotSupported, True)
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetRDGateway failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetGatewayFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -186,31 +186,31 @@ Namespace Connection
                 Try
                     If (Me.Force And Connection.Info.Force.UseConsoleSession) = Connection.Info.Force.UseConsoleSession Then
                         If RDPVersion < Versions.RDC61 Then
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.0", True)
+                            mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True)
                             RDP.AdvancedSettings2.ConnectToServerConsole = True
                         Else
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.1", True)
+                            mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True)
                             RDP.AdvancedSettings6.ConnectToAdministerServer = True
                         End If
                     ElseIf (Me.Force And Connection.Info.Force.DontUseConsoleSession) = Connection.Info.Force.DontUseConsoleSession Then
                         If RDPVersion < Versions.RDC61 Then
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.0", True)
+                            mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True)
                             RDP.AdvancedSettings2.ConnectToServerConsole = False
                         Else
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.1", True)
+                            mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True)
                             RDP.AdvancedSettings6.ConnectToAdministerServer = False
                         End If
                     Else
                         If RDPVersion < Versions.RDC61 Then
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.0", True)
+                            mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.0"), True)
                             RDP.AdvancedSettings2.ConnectToServerConsole = Me.Info.UseConsoleSession
                         Else
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.1", True)
+                            mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strRdpSetConsoleSwitch, "6.1"), True)
                             RDP.AdvancedSettings6.ConnectToAdministerServer = Me.Info.UseConsoleSession
                         End If
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetUseConsoleSession failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetConsoleSessionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -253,7 +253,7 @@ Namespace Connection
                         RDP.Domain = _dom
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetCredentials failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetCredentialsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -284,7 +284,7 @@ Namespace Connection
                             RDP.DesktopHeight = Resolutions.Items(Int(Me.Info.Resolution)).Height
                     End Select
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetResolution failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetResolutionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -294,7 +294,7 @@ Namespace Connection
                         RDP.AdvancedSettings2.RDPPort = Me.Info.Port
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetPort failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPortFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -307,7 +307,7 @@ Namespace Connection
                         RDP.FullScreen = True
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetRedirectKeys failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetRedirectKeysFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -319,7 +319,7 @@ Namespace Connection
                     RDP.AdvancedSettings2.RedirectSmartCards = Me.Info.RedirectSmartCards
                     RDP.SecuredSettings2.AudioRedirectionMode = Int(Me.Info.RedirectSound)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetRedirection failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetRedirectionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -336,7 +336,7 @@ Namespace Connection
 
                     RDP.AdvancedSettings2.PerformanceFlags = pFlags
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetPerformanceFlags failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetPerformanceFlagsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -344,7 +344,7 @@ Namespace Connection
                 Try
                     RDP.AdvancedSettings5.AuthenticationLevel = Me.Info.RDPAuthenticationLevel
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetAuthenticationLevel failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetAuthenticationLevelFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -356,7 +356,7 @@ Namespace Connection
                     AddHandler RDP.OnDisconnected, AddressOf RDPEvent_OnDisconnected
                     AddHandler RDP.OnLeaveFullScreenMode, AddressOf RDPEvent_OnLeaveFullscreenMode
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetEventHandlers failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -408,46 +408,46 @@ Namespace Connection
             End Enum
 
             Public Enum RDPColors
-                <Description(Language.Base.RDP256Colors)> _
+                <LocalizedDescription("strRDP256Colors")> _
                 Colors256 = 8
-                <Description("16 Bit")> _
+                <LocalizedDescription("strRDP65536Colors")> _
                 Colors16Bit = 16
-                <Description("24 Bit")> _
+                <LocalizedDescription("strRDP16777216Colors")> _
                 Colors24Bit = 24
-                <Description("32 Bit")> _
+                <LocalizedDescription("strRDP4294967296Colors")> _
                 Colors32Bit = 32
             End Enum
 
             Public Enum RDPSounds
-                <Description(Language.Base.RDPSoundBringToThisComputer)> _
+                <LocalizedDescription("strRDPSoundBringToThisComputer")> _
                 BringToThisComputer = 0
-                <Description(Language.Base.RDPSoundLeaveAtRemoteComputer)> _
+                <LocalizedDescription("strRDPSoundLeaveAtRemoteComputer")> _
                 LeaveAtRemoteComputer = 1
-                <Description(Language.Base.RDPSoundDoNotPlay)> _
+                <LocalizedDescription("strRDPSoundDoNotPlay")> _
                 DoNotPlay = 2
             End Enum
 
             Private Enum RDPPerformanceFlags
-                <Description("Disable Wallpaper")> _
+                <Description("strRDPDisableWallpaper")> _
                 DisableWallpaper = 1
-                <Description("Disable Full Window drag")> _
+                <Description("strRDPDisableFullWindowdrag")> _
                 DisableFullWindowDrag = 2
-                <Description("Disable Menu Animations")> _
+                <Description("strRDPDisableMenuAnimations")> _
                 DisableMenuAnimations = 4
-                <Description("Disable Themes")> _
+                <Description("strRDPDisableThemes")> _
                 DisableThemes = 8
-                <Description("Disable Cursor Shadow")> _
+                <Description("strRDPDisableCursorShadow")> _
                 DisableCursorShadow = 20
-                <Description("Disable Cursor blinking")> _
+                <Description("strRDPDisableCursorblinking")> _
                 DisableCursorBlinking = 40
             End Enum
 
             Public Enum RDPResolutions
-                <Description(Language.Base.RDPFitToPanel)> _
+                <LocalizedDescription("strRDPFitToPanel")> _
                 FitToWindow
-                <Description(Language.Base.Fullscreen)> _
+                <LocalizedDescription("strFullscreen")> _
                 Fullscreen
-                <Description(Language.Base.RDPSmartSize)> _
+                <LocalizedDescription("strRDPSmartSize")> _
                 SmartSize
                 <Description("640x480")> _
                 Res640x480
@@ -488,27 +488,27 @@ Namespace Connection
             End Enum
 
             Public Enum AuthenticationLevel
-                <Description(Language.Base.AlwaysConnectEvenIfAuthFails)> _
+                <LocalizedDescription("strAlwaysConnectEvenIfAuthFails")> _
                 NoAuth = 0
-                <Description(Language.Base.DontConnectWhenAuthFails)> _
+                <LocalizedDescription("strDontConnectWhenAuthFails")> _
                 AuthRequired = 1
-                <Description(Language.Base.WarnIfAuthFails)> _
+                <LocalizedDescription("strWarnIfAuthFails")> _
                 WarnOnFailedAuth = 2
             End Enum
 
             Public Enum RDGatewayUsageMethod
-                <Description("Never")> _
+                <LocalizedDescription("strNever")> _
                 Never = 0 ' TSC_PROXY_MODE_NONE_DIRECT
-                <Description("Always")> _
+                <LocalizedDescription("strAlways")> _
                 Always = 1 ' TSC_PROXY_MODE_DIRECT
-                <Description("Detect")> _
+                <LocalizedDescription("strDetect")> _
                 Detect = 2 ' TSC_PROXY_MODE_DETECT
             End Enum
 
             Public Enum RDGatewayUseConnectionCredentials
-                <Description("Use a different username and password")> _
+                <LocalizedDescription("strUseDifferentUsernameAndPassword")> _
                 No = 0
-                <Description("Use the same username and password")> _
+                <LocalizedDescription("strUseSameUsernameAndPassword")> _
                 Yes = 1
             End Enum
 #End Region
@@ -557,7 +557,7 @@ Namespace Connection
                             End If
                         Next
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP AddResolutions failed" & vbNewLine & ex.Message, True)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddResolutionsFailed & vbNewLine & ex.Message, True)
                     End Try
                 End Sub
 
@@ -584,7 +584,7 @@ Namespace Connection
 
                         Return nRes
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP Add (Resolutions) failed" & vbNewLine & ex.Message, True)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddResolutionFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return Nothing
@@ -612,7 +612,7 @@ Namespace Connection
                             Return True
                         End If
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "OpenConnection failed (TerminalSessions)" & vbNewLine & ex.Message, True)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpOpenConnectionFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return False
@@ -623,7 +623,7 @@ Namespace Connection
                         oWTSCOM.WTSCloseServer(ServerHandle)
                         ServerHandle = 0
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "CloseConnection failed (TerminalSessions)" & vbNewLine & ex.Message, True)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpCloseConnectionFailed & vbNewLine & ex.Message, True)
                     End Try
                 End Sub
 
@@ -646,14 +646,14 @@ Namespace Connection
 
                             If SessionUser <> "" Then
                                 If SessionState = 0 Then
-                                    colSessions.Add(SessionID, Language.Base.Active, SessionUser, SessionName)
+                                    colSessions.Add(SessionID, My.Resources.strActive, SessionUser, SessionName)
                                 Else
-                                    colSessions.Add(SessionID, Language.Base.Inactive, SessionUser, SessionName)
+                                    colSessions.Add(SessionID, My.Resources.strInactive, SessionUser, SessionName)
                                 End If
                             End If
                         Next
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessions failed (TerminalSessions)" & vbNewLine & ex.Message, True)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpGetSessionsFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return colSessions
@@ -692,7 +692,7 @@ Namespace Connection
 
                         List.Add(newSes)
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "Add Session failed" & vbNewLine & ex.Message, True)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpAddSessionFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return newSes
@@ -751,23 +751,23 @@ Namespace Connection
 #Region "Fatal Errors"
             Public Class FatalErrors
                 Protected Shared _description() As String = { _
-                    0 = "An unknown error has occurred.", _
-                    1 = "Internal error code 1.", _
-                    2 = "An out-of-memory error has occurred.", _
-                    3 = "A window-creation error has occurred.", _
-                    4 = "Internal error code 2.", _
-                    5 = "Internal error code 3. This is not a valid state.", _
-                    6 = "Internal error code 4.", _
-                    7 = "An unrecoverable error has occurred during client connection.", _
-                    100 = "Winsock initialization error." _
+                    0 = My.Resources.strRdpErrorUnknown, _
+                    1 = My.Resources.strRdpErrorCode1, _
+                    2 = My.Resources.strRdpErrorOutOfMemory, _
+                    3 = My.Resources.strRdpErrorWindowCreation, _
+                    4 = My.Resources.strRdpErrorCode2, _
+                    5 = My.Resources.strRdpErrorCode3, _
+                    6 = My.Resources.strRdpErrorCode4, _
+                    7 = My.Resources.strRdpErrorConnection, _
+                    100 = My.Resources.strRdpErrorWinsock _
                 }
 
                 Public Shared Function GetError(ByVal id As String) As String
                     Try
                         Return (_description(id))
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetError failed (FatalErrors)" & vbNewLine & ex.Message, True)
-                        Return String.Format("An unknown fatal RDP error has occurred.  Error code {0}.", id)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpErrorGetFailure & vbNewLine & ex.Message, True)
+                        Return String.Format(My.Resources.strRdpErrorUnknown, id)
                     End Try
                 End Function
             End Class

mRemoteV1/Connection/Connection.Protocol.VNC.vb

@@ -1,6 +1,6 @@
-Imports mRemote.App.Runtime
-Imports VncSharp
+Imports mRemoteNG.App.Runtime
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -105,14 +105,14 @@ Namespace Connection
                     '    VNC.RestrictPixel = False
                     'End If
 
-                    'VNC.ConnectingText = Language.Base.Connecting & " (SmartCode VNC viewer)"
-                    'VNC.DisconnectedText = Language.Base.Disconnected
+                    'VNC.ConnectingText = My.Resources.strInheritConnecting & " (SmartCode VNC viewer)"
+                    'VNC.DisconnectedText = My.Resources.strInheritDisconnected
                     'VNC.MessageBoxes = False
                     'VNC.EndInit()
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetProps failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -123,7 +123,7 @@ Namespace Connection
                 Try
                     VNC.Connect(Me.Info.Hostname, Me.Info.VNCViewOnly, Info.VNCSmartSizeMode <> SmartSizeMode.SmartSNo)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncConnectionOpenFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
 
@@ -134,7 +134,7 @@ Namespace Connection
                 Try
                     VNC.Disconnect()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC Disconnect failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncConnectionDisconnectFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -147,7 +147,7 @@ Namespace Connection
                             VNC.SendSpecialKeys(SpecialKeys.CtrlEsc)
                     End Select
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SendSpecialKeys failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSendSpecialKeysFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -156,7 +156,7 @@ Namespace Connection
                     SmartSize = Not SmartSize
                     RefreshScreen()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC ToggleSmartSize failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncToggleSmartSizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -164,7 +164,7 @@ Namespace Connection
                 Try
                     ViewOnly = Not ViewOnly
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC ToggleViewOnly failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncToggleViewOnlyFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -177,7 +177,7 @@ Namespace Connection
                     '    mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support chat")
                     'End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC StartChat failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncStartChatFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -197,7 +197,7 @@ Namespace Connection
                 Try
                     VNC.FullScreenUpdate()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC RefreshScreen failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncRefreshFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -207,11 +207,12 @@ Namespace Connection
                 Try
                     AddHandler VNC.ConnectComplete, AddressOf VNCEvent_Connected
                     AddHandler VNC.ConnectionLost, AddressOf VNCEvent_Disconnected
+                    AddHandler mRemoteNG.frmMain.clipboardchange, AddressOf VNCEvent_ClipboardChanged
                     If Not String.IsNullOrEmpty(Info.Password) Then
                         VNC.GetPassword = AddressOf VNCEvent_Authenticate
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetEventHandlers failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -227,6 +228,10 @@ Namespace Connection
                 MyBase.Close()
             End Sub
 
+            Private Sub VNCEvent_ClipboardChanged()
+                Me.VNC.FillServerClipboard()
+            End Sub
+
             Private Function VNCEvent_Authenticate() As String
                 Return Info.Password
             End Function
@@ -243,7 +248,7 @@ Namespace Connection
             End Enum
 
             Public Enum Compression
-                <Description(Language.Base.NoCompression)> _
+                <LocalizedDescription("strNoCompression")> _
                 CompNone = 99
                 <Description("0")> _
                 Comp0 = 0
@@ -287,36 +292,36 @@ Namespace Connection
             End Enum
 
             Public Enum AuthMode
-                <Description("VNC")> _
+                <LocalizedDescription("VNC")> _
                 AuthVNC
-                <Description("Windows")> _
+                <LocalizedDescription("Windows")> _
                 AuthWin
             End Enum
 
             Public Enum ProxyType
-                <Description(Language.Base.None)> _
+                <LocalizedDescription("strNone")> _
                 ProxyNone
-                <Description("HTTP")> _
+                <LocalizedDescription("strHttp")> _
                 ProxyHTTP
-                <Description("Socks 5")> _
+                <LocalizedDescription("strSocks5")> _
                 ProxySocks5
-                <Description("Ultra VNC Repeater")> _
+                <LocalizedDescription("strUltraVncRepeater")> _
                 ProxyUltra
             End Enum
 
             Public Enum Colors
-                <Description(Language.Base.Normal)> _
+                <LocalizedDescription("strNormal")> _
                 ColNormal
                 <Description("8-bit")> _
                 Col8Bit
             End Enum
 
             Public Enum SmartSizeMode
-                <Description(Language.Base.NoSmartSize)> _
+                <LocalizedDescription("strNoSmartSize")> _
                 SmartSNo
-                <Description(Language.Base.Free)> _
+                <LocalizedDescription("strFree")> _
                 SmartSFree
-                <Description(Language.Base.Aspect)> _
+                <LocalizedDescription("strAspect")> _
                 SmartSAspect
             End Enum
 #End Region

mRemoteV1/Connection/Connection.QuickConnect.vb

@@ -1,4 +1,4 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Connection
     Public Class QuickConnect
@@ -13,7 +13,7 @@ Namespace Connection
                         End If
                     Next
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "QuickConnect History Exists failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectHistoryExistsFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Return False
@@ -23,7 +23,7 @@ Namespace Connection
                 Try
                     qBox.Items.Insert(0, Text)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "QuickConnect History Add failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectAddFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
         End Class

mRemoteV1/Container/Container.Info.vb

@@ -1,21 +1,21 @@
 Imports System.Windows.Forms
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
+Imports mRemoteNG.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/Container/Container.List.vb

@@ -1,5 +1,3 @@
-Imports System.Windows.Forms
-
 Namespace Container
     Public Class List
         Inherits CollectionBase

mRemoteV1/Credential/Credential.Info.vb

@@ -1,15 +1,14 @@
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
-Imports mRemote.Tools.Misc.PropertyGridValue
+Imports mRemoteNG.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/Forms/frmChoosePanel.Designer.vb

@@ -46,7 +46,7 @@ Partial Class frmChoosePanel
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(69, 23)
         Me.btnOK.TabIndex = 20
-        Me.btnOK.Text = Language.Base.Button_OK
+        Me.btnOK.Text = My.Resources.strButtonOK
         Me.btnOK.UseVisualStyleBackColor = True
         '
         'lblDescription
@@ -55,18 +55,18 @@ Partial Class frmChoosePanel
         Me.lblDescription.Name = "lblDescription"
         Me.lblDescription.Size = New System.Drawing.Size(229, 29)
         Me.lblDescription.TabIndex = 0
-        Me.lblDescription.Text = Language.Base.SelectAPanel
+        Me.lblDescription.Text = My.Resources.strLabelSelectPanel
         '
         'btnNew
         '
         Me.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnNew.Image = Global.mRemote.My.Resources.Resources.Panel_Add
+        Me.btnNew.Image = Global.mRemoteNG.My.Resources.Resources.Panel_Add
         Me.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnNew.Location = New System.Drawing.Point(10, 44)
         Me.btnNew.Name = "btnNew"
         Me.btnNew.Size = New System.Drawing.Size(57, 23)
         Me.btnNew.TabIndex = 40
-        Me.btnNew.Text = Language.Base.Button_New
+        Me.btnNew.Text = My.Resources.strButtonNew
         Me.btnNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnNew.UseVisualStyleBackColor = True
         '
@@ -78,7 +78,7 @@ Partial Class frmChoosePanel
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(69, 23)
         Me.btnCancel.TabIndex = 30
-        Me.btnCancel.Text = Language.Base.Button_Cancel
+        Me.btnCancel.Text = My.Resources.strButtonCancel
         Me.btnCancel.UseVisualStyleBackColor = True
         '
         'frmChoosePanel
@@ -94,13 +94,13 @@ Partial Class frmChoosePanel
         Me.Controls.Add(Me.btnOK)
         Me.Controls.Add(Me.cbPanels)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
-        Me.Icon = Global.mRemote.My.Resources.Resources.Panels_Icon
+        Me.Icon = Global.mRemoteNG.My.Resources.Resources.Panels_Icon
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "frmChoosePanel"
         Me.ShowInTaskbar = False
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = Language.Base.SelectPanel
+        Me.Text = My.Resources.strTitleSelectPanel
         Me.ResumeLayout(False)
 
     End Sub

mRemoteV1/Forms/frmChoosePanel.vb

@@ -1,4 +1,4 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Public Class frmChoosePanel
     Public Property Panel() As String
@@ -17,11 +17,11 @@ Public Class frmChoosePanel
     End Sub
 
     Private Sub ApplyLanguage()
-        btnOK.Text = Language.Base.Button_OK
-        lblDescription.Text = Language.Base.SelectAPanel
-        btnNew.Text = Language.Base.Button_New
-        btnCancel.Text = Language.Base.Button_Cancel
-        Text = Language.Base.SelectPanel
+        btnOK.Text = My.Resources.strButtonOK
+        lblDescription.Text = My.Resources.strLabelSelectPanel
+        btnNew.Text = My.Resources.strButtonNew
+        btnCancel.Text = My.Resources.strButtonCancel
+        Text = My.Resources.strTitleSelectPanel
     End Sub
 
     Private Sub AddAvailablePanels()
@@ -42,7 +42,7 @@ Public Class frmChoosePanel
     End Sub
 
     Private Sub btnNew_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnNew.Click
-        Dim pnlName As String = InputBox(Language.Base.PanelName & ":", Language.Base.NewPanel, Language.Base.NewPanel)
+        Dim pnlName As String = InputBox(My.Resources.strPanelName & ":", My.Resources.strNewPanel, My.Resources.strNewPanel)
 
         If pnlName <> "" Then
             AddPanel(pnlName)

mRemoteV1/Forms/frmMain.Designer.vb

@@ -23,31 +23,45 @@ Partial Class frmMain
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container
-        Dim DockPanelSkin3 As WeifenLuo.WinFormsUI.Docking.DockPanelSkin = New WeifenLuo.WinFormsUI.Docking.DockPanelSkin
-        Dim AutoHideStripSkin3 As WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin = New WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin
-        Dim DockPanelGradient7 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
-        Dim TabGradient15 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPaneStripSkin3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin = New WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin
-        Dim DockPaneStripGradient3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient
-        Dim TabGradient16 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPanelGradient8 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
-        Dim TabGradient17 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPaneStripToolWindowGradient3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient
-        Dim TabGradient18 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim TabGradient19 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPanelGradient9 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
-        Dim TabGradient20 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim TabGradient21 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelSkin1 As WeifenLuo.WinFormsUI.Docking.DockPanelSkin = New WeifenLuo.WinFormsUI.Docking.DockPanelSkin
+        Dim AutoHideStripSkin1 As WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin = New WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin
+        Dim DockPanelGradient1 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient1 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPaneStripSkin1 As WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin = New WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin
+        Dim DockPaneStripGradient1 As WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient
+        Dim TabGradient2 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelGradient2 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient3 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPaneStripToolWindowGradient1 As WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient
+        Dim TabGradient4 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim TabGradient5 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelGradient3 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient6 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim TabGradient7 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
         Me.pnlDock = New WeifenLuo.WinFormsUI.Docking.DockPanel
         Me.msMain = New System.Windows.Forms.MenuStrip
         Me.mMenFile = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileNewConnection = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileNewFolder = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileSep1 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenFileNew = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenFileLoad = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep1 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenFileSave = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenFileSaveAs = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenFileSep2 = New System.Windows.Forms.ToolStripSeparator
+        Me.mMenFileImportExport = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromXMLFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromRDPFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromActiveDirectoryToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromPortScanToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator
+        Me.ExportToXMLFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileSep3 = New System.Windows.Forms.ToolStripSeparator
+        Me.mMenFileDelete = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileRename = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileDuplicate = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileSep4 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenFileExit = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenView = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewAddConnectionPanel = New System.Windows.Forms.ToolStripMenuItem
@@ -63,6 +77,7 @@ Partial Class frmMain
         Me.mMenViewJumpToConnectionsConfig = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewJumpToSessionsScreenshots = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewJumpToErrorsInfos = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenViewResetLayout = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewSep2 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenViewQuickConnectToolbar = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewExtAppsToolbar = New System.Windows.Forms.ToolStripMenuItem
@@ -92,21 +107,28 @@ Partial Class frmMain
         Me.lblQuickConnect = New System.Windows.Forms.ToolStripLabel
         Me.cmbQuickConnect = New System.Windows.Forms.ToolStripComboBox
         Me.tsContainer = New System.Windows.Forms.ToolStripContainer
-        Me.tsQuickConnect = New System.Windows.Forms.ToolStrip
-        Me.btnQuickyPlay = New System.Windows.Forms.ToolStripSplitButton
-        Me.mMenQuickyCon = New System.Windows.Forms.ToolStripMenuItem
         Me.tsExtAppsToolbar = New System.Windows.Forms.ToolStrip
         Me.cMenExtAppsToolbar = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.cMenToolbarShowText = New System.Windows.Forms.ToolStripMenuItem
+        Me.tsQuickConnect = New System.Windows.Forms.ToolStrip
+        Me.btnQuickyPlay = New System.Windows.Forms.ToolStripSplitButton
+        Me.mMenQuickyCon = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton
+        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton
+        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton
+        Me.ToolStripSplitButton1 = New System.Windows.Forms.ToolStripDropDownButton
+        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem
         Me.tmrShowUpdate = New System.Windows.Forms.Timer(Me.components)
         Me.tmrAutoSave = New System.Windows.Forms.Timer(Me.components)
-        Me.mMenViewResetLayout = New System.Windows.Forms.ToolStripMenuItem
         Me.msMain.SuspendLayout()
         Me.tsContainer.ContentPanel.SuspendLayout()
         Me.tsContainer.TopToolStripPanel.SuspendLayout()
         Me.tsContainer.SuspendLayout()
-        Me.tsQuickConnect.SuspendLayout()
         Me.cMenExtAppsToolbar.SuspendLayout()
+        Me.tsQuickConnect.SuspendLayout()
+        Me.ToolStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnlDock
@@ -119,51 +141,51 @@ Partial Class frmMain
         Me.pnlDock.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow
         Me.pnlDock.Location = New System.Drawing.Point(0, 0)
         Me.pnlDock.Name = "pnlDock"
-        Me.pnlDock.Size = New System.Drawing.Size(842, 449)
-        DockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight
-        DockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight
-        AutoHideStripSkin3.DockStripGradient = DockPanelGradient7
-        TabGradient15.EndColor = System.Drawing.SystemColors.Control
-        TabGradient15.StartColor = System.Drawing.SystemColors.Control
-        TabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark
-        AutoHideStripSkin3.TabGradient = TabGradient15
-        DockPanelSkin3.AutoHideStripSkin = AutoHideStripSkin3
-        TabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight
-        TabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight
-        TabGradient16.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripGradient3.ActiveTabGradient = TabGradient16
-        DockPanelGradient8.EndColor = System.Drawing.SystemColors.Control
-        DockPanelGradient8.StartColor = System.Drawing.SystemColors.Control
-        DockPaneStripGradient3.DockStripGradient = DockPanelGradient8
-        TabGradient17.EndColor = System.Drawing.SystemColors.ControlLight
-        TabGradient17.StartColor = System.Drawing.SystemColors.ControlLight
-        TabGradient17.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripGradient3.InactiveTabGradient = TabGradient17
-        DockPaneStripSkin3.DocumentGradient = DockPaneStripGradient3
-        TabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption
-        TabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
-        TabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption
-        TabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText
-        DockPaneStripToolWindowGradient3.ActiveCaptionGradient = TabGradient18
-        TabGradient19.EndColor = System.Drawing.SystemColors.Control
-        TabGradient19.StartColor = System.Drawing.SystemColors.Control
-        TabGradient19.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripToolWindowGradient3.ActiveTabGradient = TabGradient19
-        DockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight
-        DockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight
-        DockPaneStripToolWindowGradient3.DockStripGradient = DockPanelGradient9
-        TabGradient20.EndColor = System.Drawing.SystemColors.GradientInactiveCaption
-        TabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
-        TabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption
-        TabGradient20.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripToolWindowGradient3.InactiveCaptionGradient = TabGradient20
-        TabGradient21.EndColor = System.Drawing.Color.Transparent
-        TabGradient21.StartColor = System.Drawing.Color.Transparent
-        TabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark
-        DockPaneStripToolWindowGradient3.InactiveTabGradient = TabGradient21
-        DockPaneStripSkin3.ToolWindowGradient = DockPaneStripToolWindowGradient3
-        DockPanelSkin3.DockPaneStripSkin = DockPaneStripSkin3
-        Me.pnlDock.Skin = DockPanelSkin3
+        Me.pnlDock.Size = New System.Drawing.Size(842, 424)
+        DockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight
+        DockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight
+        AutoHideStripSkin1.DockStripGradient = DockPanelGradient1
+        TabGradient1.EndColor = System.Drawing.SystemColors.Control
+        TabGradient1.StartColor = System.Drawing.SystemColors.Control
+        TabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark
+        AutoHideStripSkin1.TabGradient = TabGradient1
+        DockPanelSkin1.AutoHideStripSkin = AutoHideStripSkin1
+        TabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight
+        TabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight
+        TabGradient2.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripGradient1.ActiveTabGradient = TabGradient2
+        DockPanelGradient2.EndColor = System.Drawing.SystemColors.Control
+        DockPanelGradient2.StartColor = System.Drawing.SystemColors.Control
+        DockPaneStripGradient1.DockStripGradient = DockPanelGradient2
+        TabGradient3.EndColor = System.Drawing.SystemColors.ControlLight
+        TabGradient3.StartColor = System.Drawing.SystemColors.ControlLight
+        TabGradient3.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripGradient1.InactiveTabGradient = TabGradient3
+        DockPaneStripSkin1.DocumentGradient = DockPaneStripGradient1
+        TabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption
+        TabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
+        TabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption
+        TabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText
+        DockPaneStripToolWindowGradient1.ActiveCaptionGradient = TabGradient4
+        TabGradient5.EndColor = System.Drawing.SystemColors.Control
+        TabGradient5.StartColor = System.Drawing.SystemColors.Control
+        TabGradient5.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripToolWindowGradient1.ActiveTabGradient = TabGradient5
+        DockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight
+        DockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight
+        DockPaneStripToolWindowGradient1.DockStripGradient = DockPanelGradient3
+        TabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption
+        TabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
+        TabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption
+        TabGradient6.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripToolWindowGradient1.InactiveCaptionGradient = TabGradient6
+        TabGradient7.EndColor = System.Drawing.Color.Transparent
+        TabGradient7.StartColor = System.Drawing.Color.Transparent
+        TabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark
+        DockPaneStripToolWindowGradient1.InactiveTabGradient = TabGradient7
+        DockPaneStripSkin1.ToolWindowGradient = DockPaneStripToolWindowGradient1
+        DockPanelSkin1.DockPaneStripSkin = DockPaneStripSkin1
+        Me.pnlDock.Skin = DockPanelSkin1
         Me.pnlDock.TabIndex = 13
         '
         'msMain
@@ -182,60 +204,149 @@ Partial Class frmMain
         '
         'mMenFile
         '
-        Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileNew, Me.mMenFileLoad, Me.mMenFileSep1, Me.mMenFileSave, Me.mMenFileSaveAs, Me.mMenFileSep2, Me.mMenFileExit})
+        Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileNewConnection, Me.mMenFileNewFolder, Me.mMenFileSep1, Me.mMenFileNew, Me.mMenFileLoad, Me.mMenFileSave, Me.mMenFileSaveAs, Me.mMenFileSep2, Me.mMenFileImportExport, Me.mMenFileSep3, Me.mMenFileDelete, Me.mMenFileRename, Me.mMenFileDuplicate, Me.mMenFileSep4, Me.mMenFileExit})
         Me.mMenFile.Name = "mMenFile"
         Me.mMenFile.Size = New System.Drawing.Size(37, 20)
         Me.mMenFile.Text = "&File"
         '
-        'mMenFileNew
+        'mMenFileNewConnection
         '
-        Me.mMenFileNew.Image = Global.mRemote.My.Resources.Resources.Connections_New
-        Me.mMenFileNew.Name = "mMenFileNew"
-        Me.mMenFileNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
-        Me.mMenFileNew.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileNew.Text = "New Connections"
+        Me.mMenFileNewConnection.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Add
+        Me.mMenFileNewConnection.Name = "mMenFileNewConnection"
+        Me.mMenFileNewConnection.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys)
+        Me.mMenFileNewConnection.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileNewConnection.Text = "New Connection"
         '
-        'mMenFileLoad
+        'mMenFileNewFolder
         '
-        Me.mMenFileLoad.Image = Global.mRemote.My.Resources.Resources.Connections_Load
-        Me.mMenFileLoad.Name = "mMenFileLoad"
-        Me.mMenFileLoad.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
-        Me.mMenFileLoad.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileLoad.Text = "Open Connections"
+        Me.mMenFileNewFolder.Image = Global.mRemoteNG.My.Resources.Resources.Folder_Add
+        Me.mMenFileNewFolder.Name = "mMenFileNewFolder"
+        Me.mMenFileNewFolder.ShortcutKeys = System.Windows.Forms.Keys.F7
+        Me.mMenFileNewFolder.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileNewFolder.Text = "New Folder"
         '
         'mMenFileSep1
         '
         Me.mMenFileSep1.Name = "mMenFileSep1"
-        Me.mMenFileSep1.Size = New System.Drawing.Size(253, 6)
+        Me.mMenFileSep1.Size = New System.Drawing.Size(331, 6)
+        '
+        'mMenFileNew
+        '
+        Me.mMenFileNew.Image = Global.mRemoteNG.My.Resources.Resources.Connections_New
+        Me.mMenFileNew.Name = "mMenFileNew"
+        Me.mMenFileNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
+        Me.mMenFileNew.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileNew.Text = "New Connection File"
+        '
+        'mMenFileLoad
+        '
+        Me.mMenFileLoad.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Load
+        Me.mMenFileLoad.Name = "mMenFileLoad"
+        Me.mMenFileLoad.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
+        Me.mMenFileLoad.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileLoad.Text = "Open Connection File..."
         '
         'mMenFileSave
         '
-        Me.mMenFileSave.Image = Global.mRemote.My.Resources.Resources.Connections_Save
+        Me.mMenFileSave.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Save
         Me.mMenFileSave.Name = "mMenFileSave"
         Me.mMenFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenFileSave.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileSave.Text = "Save Connections"
+        Me.mMenFileSave.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileSave.Text = "Save Connection File"
         '
         'mMenFileSaveAs
         '
-        Me.mMenFileSaveAs.Image = Global.mRemote.My.Resources.Resources.Connections_SaveAs
+        Me.mMenFileSaveAs.Image = Global.mRemoteNG.My.Resources.Resources.Connections_SaveAs
         Me.mMenFileSaveAs.Name = "mMenFileSaveAs"
         Me.mMenFileSaveAs.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _
                     Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenFileSaveAs.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileSaveAs.Text = "Save Connections As"
+        Me.mMenFileSaveAs.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileSaveAs.Text = "Save Connection File As..."
         '
         'mMenFileSep2
         '
         Me.mMenFileSep2.Name = "mMenFileSep2"
-        Me.mMenFileSep2.Size = New System.Drawing.Size(253, 6)
+        Me.mMenFileSep2.Size = New System.Drawing.Size(331, 6)
+        '
+        'mMenFileImportExport
+        '
+        Me.mMenFileImportExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ImportFromXMLFileToolStripMenuItem, Me.ImportFromRDPFileToolStripMenuItem, Me.ImportFromActiveDirectoryToolStripMenuItem, Me.ImportFromPortScanToolStripMenuItem, Me.ToolStripSeparator6, Me.ExportToXMLFileToolStripMenuItem})
+        Me.mMenFileImportExport.Name = "mMenFileImportExport"
+        Me.mMenFileImportExport.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileImportExport.Text = "Import/Export Folder"
+        '
+        'ImportFromXMLFileToolStripMenuItem
+        '
+        Me.ImportFromXMLFileToolStripMenuItem.Name = "ImportFromXMLFileToolStripMenuItem"
+        Me.ImportFromXMLFileToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
+        Me.ImportFromXMLFileToolStripMenuItem.Text = "Import from XML File..."
+        '
+        'ImportFromRDPFileToolStripMenuItem
+        '
+        Me.ImportFromRDPFileToolStripMenuItem.Name = "ImportFromRDPFileToolStripMenuItem"
+        Me.ImportFromRDPFileToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
+        Me.ImportFromRDPFileToolStripMenuItem.Text = "Import from RDP File..."
+        '
+        'ImportFromActiveDirectoryToolStripMenuItem
+        '
+        Me.ImportFromActiveDirectoryToolStripMenuItem.Name = "ImportFromActiveDirectoryToolStripMenuItem"
+        Me.ImportFromActiveDirectoryToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
+        Me.ImportFromActiveDirectoryToolStripMenuItem.Text = "Import from Active Directory..."
+        '
+        'ImportFromPortScanToolStripMenuItem
+        '
+        Me.ImportFromPortScanToolStripMenuItem.Name = "ImportFromPortScanToolStripMenuItem"
+        Me.ImportFromPortScanToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
+        Me.ImportFromPortScanToolStripMenuItem.Text = "Import from Port Scan..."
+        '
+        'ToolStripSeparator6
+        '
+        Me.ToolStripSeparator6.Name = "ToolStripSeparator6"
+        Me.ToolStripSeparator6.Size = New System.Drawing.Size(232, 6)
+        '
+        'ExportToXMLFileToolStripMenuItem
+        '
+        Me.ExportToXMLFileToolStripMenuItem.Name = "ExportToXMLFileToolStripMenuItem"
+        Me.ExportToXMLFileToolStripMenuItem.Size = New System.Drawing.Size(235, 22)
+        Me.ExportToXMLFileToolStripMenuItem.Text = "Export to XML File..."
+        '
+        'mMenFileSep3
+        '
+        Me.mMenFileSep3.Name = "mMenFileSep3"
+        Me.mMenFileSep3.Size = New System.Drawing.Size(331, 6)
+        '
+        'mMenFileDelete
+        '
+        Me.mMenFileDelete.Image = Global.mRemoteNG.My.Resources.Resources.Delete
+        Me.mMenFileDelete.Name = "mMenFileDelete"
+        Me.mMenFileDelete.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileDelete.Text = "Delete..."
+        '
+        'mMenFileRename
+        '
+        Me.mMenFileRename.Image = Global.mRemoteNG.My.Resources.Resources.Rename
+        Me.mMenFileRename.Name = "mMenFileRename"
+        Me.mMenFileRename.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileRename.Text = "Rename"
+        '
+        'mMenFileDuplicate
+        '
+        Me.mMenFileDuplicate.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Duplicate
+        Me.mMenFileDuplicate.Name = "mMenFileDuplicate"
+        Me.mMenFileDuplicate.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileDuplicate.Text = "Duplicate"
+        '
+        'mMenFileSep4
+        '
+        Me.mMenFileSep4.Name = "mMenFileSep4"
+        Me.mMenFileSep4.Size = New System.Drawing.Size(331, 6)
         '
         'mMenFileExit
         '
-        Me.mMenFileExit.Image = Global.mRemote.My.Resources.Resources.Quit
+        Me.mMenFileExit.Image = Global.mRemoteNG.My.Resources.Resources.Quit
         Me.mMenFileExit.Name = "mMenFileExit"
         Me.mMenFileExit.ShortcutKeys = CType((System.Windows.Forms.Keys.Alt Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys)
-        Me.mMenFileExit.Size = New System.Drawing.Size(256, 22)
+        Me.mMenFileExit.Size = New System.Drawing.Size(334, 22)
         Me.mMenFileExit.Text = "Exit"
         '
         'mMenView
@@ -247,14 +358,14 @@ Partial Class frmMain
         '
         'mMenViewAddConnectionPanel
         '
-        Me.mMenViewAddConnectionPanel.Image = Global.mRemote.My.Resources.Resources.Panel_Add
+        Me.mMenViewAddConnectionPanel.Image = Global.mRemoteNG.My.Resources.Resources.Panel_Add
         Me.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"
         Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewAddConnectionPanel.Text = "Add Connection Panel"
         '
         'mMenViewConnectionPanels
         '
-        Me.mMenViewConnectionPanels.Image = Global.mRemote.My.Resources.Resources.Panels
+        Me.mMenViewConnectionPanels.Image = Global.mRemoteNG.My.Resources.Resources.Panels
         Me.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"
         Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewConnectionPanels.Text = "Connection Panels"
@@ -268,7 +379,7 @@ Partial Class frmMain
         '
         Me.mMenViewConnections.Checked = True
         Me.mMenViewConnections.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewConnections.Image = Global.mRemote.My.Resources.Resources.Root
+        Me.mMenViewConnections.Image = Global.mRemoteNG.My.Resources.Resources.Root
         Me.mMenViewConnections.Name = "mMenViewConnections"
         Me.mMenViewConnections.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewConnections.Text = "Connections"
@@ -295,7 +406,7 @@ Partial Class frmMain
         '
         Me.mMenViewErrorsAndInfos.Checked = True
         Me.mMenViewErrorsAndInfos.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.mMenViewErrorsAndInfos.Image = Global.mRemote.My.Resources.Resources.ErrorsAndInfos
+        Me.mMenViewErrorsAndInfos.Image = Global.mRemoteNG.My.Resources.Resources.ErrorsAndInfos
         Me.mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos"
         Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewErrorsAndInfos.Text = "Errors and Infos"
@@ -315,7 +426,7 @@ Partial Class frmMain
         'mMenViewJumpTo
         '
         Me.mMenViewJumpTo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewJumpToConnectionsConfig, Me.mMenViewJumpToSessionsScreenshots, Me.mMenViewJumpToErrorsInfos})
-        Me.mMenViewJumpTo.Image = Global.mRemote.My.Resources.Resources.JumpTo
+        Me.mMenViewJumpTo.Image = Global.mRemoteNG.My.Resources.Resources.JumpTo
         Me.mMenViewJumpTo.Name = "mMenViewJumpTo"
         Me.mMenViewJumpTo.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewJumpTo.Text = "Jump To"
@@ -325,7 +436,7 @@ Partial Class frmMain
         Me.mMenViewJumpToConnectionsConfig.Name = "mMenViewJumpToConnectionsConfig"
         Me.mMenViewJumpToConnectionsConfig.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
                     Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys)
-        Me.mMenViewJumpToConnectionsConfig.Size = New System.Drawing.Size(260, 22)
+        Me.mMenViewJumpToConnectionsConfig.Size = New System.Drawing.Size(262, 22)
         Me.mMenViewJumpToConnectionsConfig.Text = "Connections && Config"
         '
         'mMenViewJumpToSessionsScreenshots
@@ -333,7 +444,7 @@ Partial Class frmMain
         Me.mMenViewJumpToSessionsScreenshots.Name = "mMenViewJumpToSessionsScreenshots"
         Me.mMenViewJumpToSessionsScreenshots.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
                     Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenViewJumpToSessionsScreenshots.Size = New System.Drawing.Size(260, 22)
+        Me.mMenViewJumpToSessionsScreenshots.Size = New System.Drawing.Size(262, 22)
         Me.mMenViewJumpToSessionsScreenshots.Text = "Sessions && Screenshots"
         '
         'mMenViewJumpToErrorsInfos
@@ -341,9 +452,15 @@ Partial Class frmMain
         Me.mMenViewJumpToErrorsInfos.Name = "mMenViewJumpToErrorsInfos"
         Me.mMenViewJumpToErrorsInfos.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
                     Or System.Windows.Forms.Keys.E), System.Windows.Forms.Keys)
-        Me.mMenViewJumpToErrorsInfos.Size = New System.Drawing.Size(260, 22)
+        Me.mMenViewJumpToErrorsInfos.Size = New System.Drawing.Size(262, 22)
         Me.mMenViewJumpToErrorsInfos.Text = "Errors && Infos"
         '
+        'mMenViewResetLayout
+        '
+        Me.mMenViewResetLayout.Name = "mMenViewResetLayout"
+        Me.mMenViewResetLayout.Size = New System.Drawing.Size(228, 22)
+        Me.mMenViewResetLayout.Text = "Reset Layout"
+        '
         'mMenViewSep2
         '
         Me.mMenViewSep2.Name = "mMenViewSep2"
@@ -351,7 +468,7 @@ Partial Class frmMain
         '
         'mMenViewQuickConnectToolbar
         '
-        Me.mMenViewQuickConnectToolbar.Image = Global.mRemote.My.Resources.Resources.Play_Quick
+        Me.mMenViewQuickConnectToolbar.Image = Global.mRemoteNG.My.Resources.Resources.Play_Quick
         Me.mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar"
         Me.mMenViewQuickConnectToolbar.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewQuickConnectToolbar.Text = "Quick Connect Toolbar"
@@ -370,7 +487,7 @@ Partial Class frmMain
         '
         'mMenViewFullscreen
         '
-        Me.mMenViewFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
+        Me.mMenViewFullscreen.Image = Global.mRemoteNG.My.Resources.Resources.Fullscreen
         Me.mMenViewFullscreen.Name = "mMenViewFullscreen"
         Me.mMenViewFullscreen.ShortcutKeys = System.Windows.Forms.Keys.F11
         Me.mMenViewFullscreen.Size = New System.Drawing.Size(228, 22)
@@ -385,17 +502,18 @@ Partial Class frmMain
         '
         'mMenToolsSSHTransfer
         '
-        Me.mMenToolsSSHTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
+        Me.mMenToolsSSHTransfer.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer
         Me.mMenToolsSSHTransfer.Name = "mMenToolsSSHTransfer"
         Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsSSHTransfer.Text = "SSH File Transfer"
         '
         'mMenToolsUVNCSC
         '
-        Me.mMenToolsUVNCSC.Image = Global.mRemote.My.Resources.Resources.UVNC_SC
+        Me.mMenToolsUVNCSC.Image = Global.mRemoteNG.My.Resources.Resources.UVNC_SC
         Me.mMenToolsUVNCSC.Name = "mMenToolsUVNCSC"
         Me.mMenToolsUVNCSC.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsUVNCSC.Text = "UltraVNC SingleClick"
+        Me.mMenToolsUVNCSC.Visible = False
         '
         'mMenToolsExternalApps
         '
@@ -406,7 +524,7 @@ Partial Class frmMain
         '
         'mMenToolsPortScan
         '
-        Me.mMenToolsPortScan.Image = Global.mRemote.My.Resources.Resources.PortScan
+        Me.mMenToolsPortScan.Image = Global.mRemoteNG.My.Resources.Resources.PortScan
         Me.mMenToolsPortScan.Name = "mMenToolsPortScan"
         Me.mMenToolsPortScan.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsPortScan.Text = "Port Scan"
@@ -418,7 +536,7 @@ Partial Class frmMain
         '
         'mMenToolsComponentsCheck
         '
-        Me.mMenToolsComponentsCheck.Image = Global.mRemote.My.Resources.Resources.ComponentsCheck
+        Me.mMenToolsComponentsCheck.Image = Global.mRemoteNG.My.Resources.Resources.ComponentsCheck
         Me.mMenToolsComponentsCheck.Name = "mMenToolsComponentsCheck"
         Me.mMenToolsComponentsCheck.Size = New System.Drawing.Size(184, 22)
         Me.mMenToolsComponentsCheck.Text = "Components Check"
@@ -460,7 +578,7 @@ Partial Class frmMain
         '
         'mMenInfoDonate
         '
-        Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate
+        Me.mMenInfoDonate.Image = Global.mRemoteNG.My.Resources.Resources.Donate
         Me.mMenInfoDonate.Name = "mMenInfoDonate"
         Me.mMenInfoDonate.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoDonate.Text = "Donate"
@@ -473,7 +591,7 @@ Partial Class frmMain
         '
         'mMenInfoBugReport
         '
-        Me.mMenInfoBugReport.Image = Global.mRemote.My.Resources.Resources.Bug
+        Me.mMenInfoBugReport.Image = Global.mRemoteNG.My.Resources.Resources.Bug
         Me.mMenInfoBugReport.Name = "mMenInfoBugReport"
         Me.mMenInfoBugReport.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoBugReport.Text = "Report a Bug"
@@ -485,14 +603,14 @@ Partial Class frmMain
         '
         'mMenInfoAnnouncements
         '
-        Me.mMenInfoAnnouncements.Image = Global.mRemote.My.Resources.Resources.News
+        Me.mMenInfoAnnouncements.Image = Global.mRemoteNG.My.Resources.Resources.News
         Me.mMenInfoAnnouncements.Name = "mMenInfoAnnouncements"
         Me.mMenInfoAnnouncements.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoAnnouncements.Text = "Announcements"
         '
         'mMenToolsUpdate
         '
-        Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
+        Me.mMenToolsUpdate.Image = Global.mRemoteNG.My.Resources.Resources.Update
         Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
         Me.mMenToolsUpdate.Size = New System.Drawing.Size(190, 22)
         Me.mMenToolsUpdate.Text = "Check for Updates"
@@ -504,7 +622,7 @@ Partial Class frmMain
         '
         'mMenInfoAbout
         '
-        Me.mMenInfoAbout.Image = Global.mRemote.My.Resources.Resources.mRemote
+        Me.mMenInfoAbout.Image = Global.mRemoteNG.My.Resources.Resources.mRemote
         Me.mMenInfoAbout.Name = "mMenInfoAbout"
         Me.mMenInfoAbout.Size = New System.Drawing.Size(190, 22)
         Me.mMenInfoAbout.Text = "About mRemoteNG"
@@ -525,7 +643,7 @@ Partial Class frmMain
         Me.cmbQuickConnect.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
         Me.cmbQuickConnect.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
         Me.cmbQuickConnect.Name = "cmbQuickConnect"
-        Me.cmbQuickConnect.Size = New System.Drawing.Size(120, 25)
+        Me.cmbQuickConnect.Size = New System.Drawing.Size(200, 25)
         '
         'tsContainer
         '
@@ -538,7 +656,7 @@ Partial Class frmMain
         '
         Me.tsContainer.ContentPanel.Controls.Add(Me.pnlDock)
         Me.tsContainer.ContentPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-        Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 449)
+        Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 424)
         Me.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill
         '
         'tsContainer.LeftToolStripPanel
@@ -559,37 +677,9 @@ Partial Class frmMain
         Me.tsContainer.TopToolStripPanel.Controls.Add(Me.msMain)
         Me.tsContainer.TopToolStripPanel.Controls.Add(Me.tsQuickConnect)
         Me.tsContainer.TopToolStripPanel.Controls.Add(Me.tsExtAppsToolbar)
+        Me.tsContainer.TopToolStripPanel.Controls.Add(Me.ToolStrip1)
         Me.tsContainer.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
         '
-        'tsQuickConnect
-        '
-        Me.tsQuickConnect.Dock = System.Windows.Forms.DockStyle.None
-        Me.tsQuickConnect.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.lblQuickConnect, Me.cmbQuickConnect, Me.btnQuickyPlay, Me.mMenQuickyCon})
-        Me.tsQuickConnect.Location = New System.Drawing.Point(3, 24)
-        Me.tsQuickConnect.Name = "tsQuickConnect"
-        Me.tsQuickConnect.Size = New System.Drawing.Size(251, 25)
-        Me.tsQuickConnect.TabIndex = 18
-        '
-        'btnQuickyPlay
-        '
-        Me.btnQuickyPlay.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnQuickyPlay.Image = Global.mRemote.My.Resources.Resources.Play_Quick
-        Me.btnQuickyPlay.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnQuickyPlay.Name = "btnQuickyPlay"
-        Me.btnQuickyPlay.Size = New System.Drawing.Size(32, 22)
-        Me.btnQuickyPlay.Text = "Connect"
-        '
-        'mMenQuickyCon
-        '
-        Me.mMenQuickyCon.AutoSize = False
-        Me.mMenQuickyCon.AutoToolTip = True
-        Me.mMenQuickyCon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.mMenQuickyCon.Image = Global.mRemote.My.Resources.Resources.Root
-        Me.mMenQuickyCon.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.mMenQuickyCon.Name = "mMenQuickyCon"
-        Me.mMenQuickyCon.Size = New System.Drawing.Size(30, 22)
-        Me.mMenQuickyCon.Text = "Connections"
-        '
         'tsExtAppsToolbar
         '
         Me.tsExtAppsToolbar.ContextMenuStrip = Me.cMenExtAppsToolbar
@@ -613,6 +703,91 @@ Partial Class frmMain
         Me.cMenToolbarShowText.Size = New System.Drawing.Size(128, 22)
         Me.cMenToolbarShowText.Text = "Show Text"
         '
+        'tsQuickConnect
+        '
+        Me.tsQuickConnect.Dock = System.Windows.Forms.DockStyle.None
+        Me.tsQuickConnect.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.lblQuickConnect, Me.cmbQuickConnect, Me.btnQuickyPlay, Me.mMenQuickyCon})
+        Me.tsQuickConnect.Location = New System.Drawing.Point(3, 24)
+        Me.tsQuickConnect.Name = "tsQuickConnect"
+        Me.tsQuickConnect.Size = New System.Drawing.Size(331, 25)
+        Me.tsQuickConnect.TabIndex = 18
+        '
+        'btnQuickyPlay
+        '
+        Me.btnQuickyPlay.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnQuickyPlay.Image = Global.mRemoteNG.My.Resources.Resources.Play_Quick
+        Me.btnQuickyPlay.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnQuickyPlay.Name = "btnQuickyPlay"
+        Me.btnQuickyPlay.Size = New System.Drawing.Size(32, 22)
+        Me.btnQuickyPlay.Text = "Connect"
+        '
+        'mMenQuickyCon
+        '
+        Me.mMenQuickyCon.AutoSize = False
+        Me.mMenQuickyCon.AutoToolTip = True
+        Me.mMenQuickyCon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.mMenQuickyCon.Image = Global.mRemoteNG.My.Resources.Resources.Root
+        Me.mMenQuickyCon.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.mMenQuickyCon.Name = "mMenQuickyCon"
+        Me.mMenQuickyCon.Size = New System.Drawing.Size(30, 22)
+        Me.mMenQuickyCon.Text = "Connections"
+        '
+        'ToolStrip1
+        '
+        Me.ToolStrip1.Dock = System.Windows.Forms.DockStyle.None
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripSplitButton1})
+        Me.ToolStrip1.Location = New System.Drawing.Point(3, 74)
+        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.ToolStrip1.Size = New System.Drawing.Size(264, 25)
+        Me.ToolStrip1.TabIndex = 19
+		Me.ToolStrip1.Visible = False
+        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.Image = Global.mRemoteNG.My.Resources.Resources.Play
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(72, 22)
+        Me.ToolStripButton1.Text = "Connect"
+        '
+        'ToolStripButton2
+        '
+        Me.ToolStripButton2.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot
+        Me.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton2.Name = "ToolStripButton2"
+        Me.ToolStripButton2.Size = New System.Drawing.Size(85, 22)
+        Me.ToolStripButton2.Text = "Screenshot"
+        '
+        'ToolStripButton3
+        '
+        Me.ToolStripButton3.Image = Global.mRemoteNG.My.Resources.Resources.Refresh
+        Me.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton3.Name = "ToolStripButton3"
+        Me.ToolStripButton3.Size = New System.Drawing.Size(66, 22)
+        Me.ToolStripButton3.Text = "Refresh"
+        '
+        'ToolStripSplitButton1
+        '
+        Me.ToolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripSplitButton1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripMenuItem1, Me.ToolStripMenuItem2})
+        Me.ToolStripSplitButton1.Image = Global.mRemoteNG.My.Resources.Resources.Keyboard
+        Me.ToolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripSplitButton1.Name = "ToolStripSplitButton1"
+        Me.ToolStripSplitButton1.Size = New System.Drawing.Size(29, 22)
+        Me.ToolStripSplitButton1.Text = "Special Keys"
+        '
+        'ToolStripMenuItem1
+        '
+        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
+        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(135, 22)
+        Me.ToolStripMenuItem1.Text = "Ctrl-Alt-Del"
+        '
+        'ToolStripMenuItem2
+        '
+        Me.ToolStripMenuItem2.Name = "ToolStripMenuItem2"
+        Me.ToolStripMenuItem2.Size = New System.Drawing.Size(135, 22)
+        Me.ToolStripMenuItem2.Text = "Ctrl-Esc"
+        '
         'tmrShowUpdate
         '
         Me.tmrShowUpdate.Enabled = True
@@ -622,19 +797,13 @@ Partial Class frmMain
         '
         Me.tmrAutoSave.Interval = 10000
         '
-        'mMenViewResetLayout
-        '
-        Me.mMenViewResetLayout.Name = "mMenViewResetLayout"
-        Me.mMenViewResetLayout.Size = New System.Drawing.Size(228, 22)
-        Me.mMenViewResetLayout.Text = "Reset Layout"
-        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(842, 523)
         Me.Controls.Add(Me.tsContainer)
-        Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
+        Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon
         Me.MainMenuStrip = Me.msMain
         Me.Name = "frmMain"
         Me.Text = "mRemoteNG"
@@ -645,9 +814,11 @@ Partial Class frmMain
         Me.tsContainer.TopToolStripPanel.PerformLayout()
         Me.tsContainer.ResumeLayout(False)
         Me.tsContainer.PerformLayout()
+        Me.cMenExtAppsToolbar.ResumeLayout(False)
         Me.tsQuickConnect.ResumeLayout(False)
         Me.tsQuickConnect.PerformLayout()
-        Me.cMenExtAppsToolbar.ResumeLayout(False)
+        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStrip1.PerformLayout()
         Me.ResumeLayout(False)
 
     End Sub
@@ -660,10 +831,9 @@ Partial Class frmMain
     Friend WithEvents mMenInfo As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenFileNew As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenFileLoad As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep1 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents mMenFileSave As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenFileSaveAs As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents mMenFileSep2 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents mMenFileSep1 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents mMenFileExit As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenToolsSep1 As System.Windows.Forms.ToolStripSeparator
     Friend WithEvents mMenToolsOptions As System.Windows.Forms.ToolStripMenuItem
@@ -713,5 +883,27 @@ Partial Class frmMain
     Friend WithEvents mMenInfoForum As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenToolsUpdate As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenViewResetLayout As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileDuplicate As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileSep2 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents mMenFileNewConnection As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileNewFolder As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileImportExport As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromXMLFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromRDPFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromActiveDirectoryToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromPortScanToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator6 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents ExportToXMLFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileSep3 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents mMenFileDelete As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileRename As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileSep4 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
+    Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
+    Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton
+    Friend WithEvents ToolStripButton3 As System.Windows.Forms.ToolStripButton
+    Friend WithEvents ToolStripSplitButton1 As System.Windows.Forms.ToolStripDropDownButton
+    Friend WithEvents ToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem2 As System.Windows.Forms.ToolStripMenuItem
 
 End Class

mRemoteV1/Forms/frmMain.resx

@@ -124,8 +124,8 @@
   <data name="mMenViewConfig.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA
-        CwIBm8luNgAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
+        Cv8BNGKaggAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
         pA1bmfODND+DpqUzt5Vfm7NtZx9n52xnui9zm/m5p9/vlINcHnjhnPf83ud5n/d9fhIAkv9FQ0NDrU6n
         29fr9cnS0tKqq87lFQ8MDNxqaWm5oVKpjPFEEql0Gp2dnYb29vbrGo3m9mWgHIDBYGh7PzmZ1en1gtE4
         kgoLEYTCAmLxOE5OTzExMXHw2mAQTCZT9vmLF8oLIBFAJpNde/N2iGP5EOKJhBh70SjYIAchEsHu3h4O
@@ -143,8 +143,8 @@
   <data name="mMenViewSessions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA
-        CwIBm8luNgAAA4RJREFUOE9lk21MU3cUh/9L5pxabCoz2YsmLiwbDp0TddMU1sLo7e3LtZTSQim2ILft
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAK/wAA
+        Cv8BNGKaggAAA4RJREFUOE9lk21MU3cUh/9L5pxabCoz2YsmLiwbDp0TddMU1sLo7e3LtZTSQim2ILft
         ENoKtIVSXksEKRStwwoVDSZGCGPIyDbYCG5s02TZFudCtiDIjNFszjiWrFmZWf3tln2Z8uHJOV/Oc345
         ySEAyP9hd24gcUo4zKmJrzRlJk6HVIJol4IfrcsQ3M1LfaaUShE8KdnKJ3EeGY6LatIEy7iFG/i+DP6V
         EPMUAsrVCKr5aFcKYN2bEMnf94KqlE4mVurllYJgFo/EOZ6xZkso+zl80KDExVoanqxE2IU8FO5YjSbd
@@ -275,6 +275,9 @@
   <metadata name="cMenExtAppsToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>184, 56</value>
+  </metadata>
   <metadata name="tmrShowUpdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>112, 17</value>
   </metadata>

mRemoteV1/Forms/frmMain.vb

@@ -1,11 +1,14 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Reflection
 Imports Crownwood
-Imports mRemote.App.Native
+Imports mRemoteNG.App.Native
+Imports System.Runtime.InteropServices
 Imports PSTaskDialog
 
 Public Class frmMain
     Public prevWindowsState As FormWindowState
+    Public Shared Event clipboardchange()
+    Private fpChainedWindowHandle As IntPtr
 
 #Region "Startup & Shutdown"
     Private Sub frmMain_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
@@ -17,13 +20,17 @@ Public Class frmMain
         Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now)
 
         Startup.ParseCommandLineArgs()
+        fpChainedWindowHandle = SetClipboardViewer(Me.Handle)
 
-
+        ' Create gui config load and save objects
         sL = New Config.Settings.Load(Me)
         sS = New Config.Settings.Save(Me)
 
         Startup.CreateLogger()
 
+        Startup.RegisterHotKeys()
+
+        ' Load GUI Configuration
         sL.Load()
 
         mC = New Messages.Collector(Windows.errorsForm)
@@ -65,49 +72,73 @@ Public Class frmMain
     End Sub
 
     Private Sub ApplyLanguage()
-        mMenFile.Text = Language.Base.Menu_File
-        mMenFileNew.Text = Language.Base.Menu_NewConnections
-        mMenFileLoad.Text = Language.Base.Menu_OpenConnections
-        mMenFileSave.Text = Language.Base.Menu_SaveConnections
-        mMenFileSaveAs.Text = Language.Base.Menu_SaveConnectionsAs
-        mMenFileExit.Text = Language.Base.Menu_Exit
-        mMenView.Text = Language.Base.Menu_View
-        mMenViewAddConnectionPanel.Text = Language.Base.Menu_AddConnectionPanel
-        mMenViewConnectionPanels.Text = Language.Base.Menu_ConnectionPanels
-        mMenViewConnections.Text = Language.Base.Menu_Connections
-        mMenViewConfig.Text = Language.Base.Menu_Config
-        mMenViewSessions.Text = Language.Base.Menu_Sessions
-        mMenViewErrorsAndInfos.Text = Language.Base.Menu_ErrorsAndInfos
-        mMenViewScreenshotManager.Text = Language.Base.Menu_ScreenshotManager
-        mMenViewJumpTo.Text = Language.Base.Menu_JumpTo
-        mMenViewJumpToConnectionsConfig.Text = Language.Base.Menu_ConnectionsConfig
-        mMenViewJumpToSessionsScreenshots.Text = Language.Base.Menu_SessionsScreenshots
-        mMenViewJumpToErrorsInfos.Text = Language.Base.Menu_ErrorsInfos
-        mMenViewQuickConnectToolbar.Text = Language.Base.Menu_QuickyToolbar
-        mMenViewExtAppsToolbar.Text = Language.Base.Menu_ExternalApplicationsToolbar
-        mMenViewFullscreen.Text = Language.Base.Menu_FullScreenKioskMode
-        mMenTools.Text = Language.Base.Menu_Tools
-        mMenToolsSSHTransfer.Text = Language.Base.Menu_SSHFileTransfer
-        mMenToolsExternalApps.Text = Language.Base.Menu_ExternalApplications
-        mMenToolsPortScan.Text = Language.Base.Menu_PortScan
-        mMenToolsUpdate.Text = Language.Base.Menu_Update
-        mMenToolsOptions.Text = Language.Base.Menu_Options
-        mMenInfo.Text = Language.Base.Menu_Info
-        mMenInfoHelp.Text = Language.Base.Menu_Help
-        mMenInfoForum.Text = Language.Base.Menu_Forum
-        mMenInfoBugReport.Text = Language.Base.Menu_BugReport
-        mMenInfoDonate.Text = Language.Base.Menu_Donate
-        mMenInfoWebsite.Text = Language.Base.Menu_Website
-        mMenInfoAbout.Text = Language.Base.Menu_About
-        lblQuickConnect.Text = Language.Base.Toolbar_Quicky
-        btnQuickyPlay.Text = Language.Base.Toolbar_Play
-        mMenQuickyCon.Text = Language.Base.Menu_Connections
-        cMenToolbarShowText.Text = Language.Base.Toolbar_ShowText
+        mMenFile.Text = My.Resources.strMenuFile
+        mMenFileNew.Text = My.Resources.strMenuNewConnectionFile
+        mMenFileNewConnection.Text = My.Resources.strNewConnection
+        mMenFileNewFolder.Text = My.Resources.strNewFolder
+        mMenFileLoad.Text = My.Resources.strMenuOpenConnectionFile
+        mMenFileSave.Text = My.Resources.strMenuSaveConnectionFile
+        mMenFileSaveAs.Text = My.Resources.strMenuSaveConnectionFileAs
+        mMenFileImportExport.Text = My.Resources.strImportExport
+        ImportFromActiveDirectoryToolStripMenuItem.Text = My.Resources.strImportAD
+        ImportFromPortScanToolStripMenuItem.Text = My.Resources.strImportPortScan
+        ImportFromRDPFileToolStripMenuItem.Text = My.Resources.strImportRDPFiles
+        ImportFromXMLFileToolStripMenuItem.Text = My.Resources.strImportmRemoteXML
+        ExportToXMLFileToolStripMenuItem.Text = My.Resources.strExportmRemoteXML
+        mMenFileExit.Text = My.Resources.strMenuExit
+
+        mMenView.Text = My.Resources.strMenuView
+        mMenViewAddConnectionPanel.Text = My.Resources.strMenuAddConnectionPanel
+        mMenViewConnectionPanels.Text = My.Resources.strMenuConnectionPanels
+        mMenViewConnections.Text = My.Resources.strMenuConnections
+        mMenViewConfig.Text = My.Resources.strMenuConfig
+        mMenViewSessions.Text = My.Resources.strMenuSessions
+        mMenViewErrorsAndInfos.Text = My.Resources.strMenuNotifications
+        mMenViewScreenshotManager.Text = My.Resources.strMenuScreenshotManager
+        mMenViewJumpTo.Text = My.Resources.strMenuJumpTo
+        mMenViewJumpToConnectionsConfig.Text = My.Resources.strMenuConnectionsAndConfig
+        mMenViewJumpToSessionsScreenshots.Text = My.Resources.strMenuSessionsAndScreenshots
+        mMenViewJumpToErrorsInfos.Text = My.Resources.strMenuNotifications
+        mMenViewResetLayout.Text = My.Resources.strMenuResetLayout
+        mMenViewQuickConnectToolbar.Text = My.Resources.strMenuQuickConnectToolbar
+        mMenViewExtAppsToolbar.Text = My.Resources.strMenuExternalToolsToolbar
+        mMenViewFullscreen.Text = My.Resources.strMenuFullScreen
+
+        mMenTools.Text = My.Resources.strMenuTools
+        mMenToolsSSHTransfer.Text = My.Resources.strMenuSSHFileTransfer
+        mMenToolsExternalApps.Text = My.Resources.strMenuExternalTools
+        mMenToolsPortScan.Text = My.Resources.strMenuPortScan
+        mMenToolsComponentsCheck.Text = My.Resources.strComponentsCheck
+        mMenToolsUpdate.Text = My.Resources.strMenuCheckForUpdates
+        mMenToolsOptions.Text = My.Resources.strMenuOptions
+
+        mMenInfo.Text = My.Resources.strMenuHelp
+        mMenInfoHelp.Text = My.Resources.strMenuHelpContents
+        mMenInfoForum.Text = My.Resources.strMenuSupportForum
+        mMenInfoBugReport.Text = My.Resources.strMenuReportBug
+        mMenInfoDonate.Text = My.Resources.strMenuDonate
+        mMenInfoWebsite.Text = My.Resources.strMenuWebsite
+        mMenInfoAbout.Text = My.Resources.strMenuAbout
+        mMenInfoAnnouncements.Text = My.Resources.strMenuAnnouncements
+
+        lblQuickConnect.Text = My.Resources.strLabelConnect
+        btnQuickyPlay.Text = My.Resources.strMenuConnect
+        mMenQuickyCon.Text = My.Resources.strMenuConnections
+
+        cMenToolbarShowText.Text = My.Resources.strMenuShowText
+
+        ToolStripButton1.Text = My.Resources.strConnect
+        ToolStripButton2.Text = My.Resources.strScreenshot
+        ToolStripButton3.Text = My.Resources.strRefresh
+
+        ToolStripSplitButton1.Text = My.Resources.strSpecialKeys
+        ToolStripMenuItem1.Text = My.Resources.strKeysCtrlAltDel
+        ToolStripMenuItem2.Text = My.Resources.strKeysCtrlEsc
     End Sub
 
     Private Sub frmMain_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
         If My.Settings.ConfirmExit And wL.Count > 0 Then
-            Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.AssemblyName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
+            Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.AssemblyName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
             If cTaskDialog.VerificationChecked Then
                 My.Settings.ConfirmExit = False
             End If
@@ -219,13 +250,65 @@ Public Class frmMain
 
 #Region "Menu"
 #Region "File"
+    Private Sub mMenFile_DropDownOpening(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFile.DropDownOpening
+        Select Case Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode)
+            Case Tree.Node.Type.Root
+                mMenFileImportExport.Enabled = True
+                mMenFileDelete.Enabled = False
+                mMenFileRename.Enabled = True
+                mMenFileDuplicate.Enabled = False
+                mMenFileDelete.Text = My.Resources.strMenuDelete
+                mMenFileRename.Text = My.Resources.strMenuRenameFolder
+                mMenFileDuplicate.Text = My.Resources.strMenuDuplicate
+            Case Tree.Node.Type.Container
+                mMenFileImportExport.Enabled = True
+                mMenFileDelete.Enabled = True
+                mMenFileRename.Enabled = True
+                mMenFileDuplicate.Enabled = True
+                mMenFileDelete.Text = My.Resources.strMenuDeleteFolder
+                mMenFileRename.Text = My.Resources.strMenuRenameFolder
+                mMenFileDuplicate.Text = My.Resources.strMenuDuplicateFolder
+            Case Tree.Node.Type.Connection
+                mMenFileImportExport.Enabled = False
+                mMenFileDelete.Enabled = True
+                mMenFileRename.Enabled = True
+                mMenFileDuplicate.Enabled = True
+                mMenFileDelete.Text = My.Resources.strMenuDeleteConnection
+                mMenFileRename.Text = My.Resources.strMenuRenameConnection
+                mMenFileDuplicate.Text = My.Resources.strMenuDuplicateConnection
+            Case Else
+                mMenFileImportExport.Enabled = False
+                mMenFileDelete.Enabled = False
+                mMenFileRename.Enabled = False
+                mMenFileDuplicate.Enabled = False
+                mMenFileDelete.Text = My.Resources.strMenuDelete
+                mMenFileRename.Text = My.Resources.strMenuRename
+                mMenFileDuplicate.Text = My.Resources.strMenuDuplicate
+        End Select
+    End Sub
+
+    Private Sub mMenFileNewConnection_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileNewConnection.Click
+        App.Runtime.Windows.treeForm.AddConnection()
+        SaveConnectionsBG()
+    End Sub
+
+    Private Sub mMenFileNewFolder_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileNewFolder.Click
+        App.Runtime.Windows.treeForm.AddFolder()
+        SaveConnectionsBG()
+    End Sub
+
     Private Sub mMenFileNew_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileNew.Click
-        NewConnections()
+        Dim lD As SaveFileDialog = Tools.Controls.ConnectionsSaveAsDialog
+        If lD.ShowDialog = System.Windows.Forms.DialogResult.OK Then
+            NewConnections(lD.FileName)
+        Else
+            Exit Sub
+        End If
     End Sub
 
     Private Sub mMenFileLoad_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileLoad.Click
         If App.Runtime.ConnectionsFileLoaded Then
-            Select Case MsgBox(Language.Base.SaveConnectionsFileBeforeOpeningAnother, MsgBoxStyle.YesNoCancel Or MsgBoxStyle.Question)
+            Select Case MsgBox(My.Resources.strSaveConnectionsFileBeforeOpeningAnother, MsgBoxStyle.YesNoCancel Or MsgBoxStyle.Question)
                 Case MsgBoxResult.Yes
                     App.Runtime.SaveConnections()
                 Case MsgBoxResult.Cancel
@@ -247,6 +330,21 @@ Public Class frmMain
     Private Sub mMenFileExit_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileExit.Click
         App.Runtime.Shutdown.Quit()
     End Sub
+
+    Private Sub mMenFileDelete_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileDelete.Click
+        Tree.Node.DeleteSelectedNode()
+        SaveConnectionsBG()
+    End Sub
+
+    Private Sub mMenFileRename_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileRename.Click
+        Tree.Node.StartRenameSelectedNode()
+        SaveConnectionsBG()
+    End Sub
+
+    Private Sub mMenFileDuplicate_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileDuplicate.Click
+        Tree.Node.CloneNode(Tree.Node.SelectedNode)
+        SaveConnectionsBG()
+    End Sub
 #End Region
 
 #Region "View"
@@ -268,6 +366,12 @@ Public Class frmMain
 
             Me.mMenViewConnectionPanels.DropDownItems.Add(tItem)
         Next
+
+        If Me.mMenViewConnectionPanels.DropDownItems.Count > 0 Then
+            Me.mMenViewConnectionPanels.Enabled = True
+        Else
+            Me.mMenViewConnectionPanels.Enabled = False
+        End If
     End Sub
 
     Private Sub ConnectionPanelMenuItem_Click(ByVal sender As Object, ByVal e As System.EventArgs)
@@ -429,7 +533,7 @@ Public Class frmMain
         Try
             btnQuickyPlay.DropDownItems.Clear()
 
-            For Each fI As FieldInfo In GetType(mRemote.Connection.Protocol.Protocols).GetFields
+            For Each fI As FieldInfo In GetType(mRemoteNG.Connection.Protocol.Protocols).GetFields
                 If fI.Name <> "value__" And fI.Name <> "NONE" And fI.Name <> "IntApp" Then
                     Dim nBtn As New ToolStripMenuItem
                     nBtn.Text = fI.Name
@@ -444,21 +548,21 @@ Public Class frmMain
 
     Private Sub QuickyProtocolButton_Click(ByVal sender As Object, ByVal e As System.EventArgs)
         Try
-            Dim conI As Connection.Info = CreateQuicky(QuickyText, Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.Protocols), sender.Text))
+            Dim conI As Connection.Info = CreateQuicky(QuickyText, Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.Protocols), sender.Text))
 
             If conI.Port = 0 Then
                 conI.SetDefaultPort()
 
-                If mRemote.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then
-                    mRemote.Connection.QuickConnect.History.Add(conI.Hostname)
+                If mRemoteNG.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then
+                    mRemoteNG.Connection.QuickConnect.History.Add(conI.Hostname)
                 End If
             Else
-                If mRemote.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then
-                    mRemote.Connection.QuickConnect.History.Add(conI.Hostname & ":" & conI.Port)
+                If mRemoteNG.Connection.QuickConnect.History.Exists(conI.Hostname) = False Then
+                    mRemoteNG.Connection.QuickConnect.History.Add(conI.Hostname & ":" & conI.Port)
                 End If
             End If
 
-            App.Runtime.OpenConnection(conI, mRemote.Connection.Info.Force.DoNotJump)
+            App.Runtime.OpenConnection(conI, mRemoteNG.Connection.Info.Force.DoNotJump)
         Catch ex As Exception
             mC.AddMessage(Messages.MessageClass.ErrorMsg, "QuickyProtocolButton_Click (frmMain) failed" & vbNewLine & ex.Message, True)
         End Try
@@ -557,7 +661,7 @@ Public Class frmMain
 
     Private Sub ConMenItem_MouseDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs)
         If e.Button = MouseButtons.Left Then
-            If TypeOf sender.Tag Is mRemote.Connection.Info Then
+            If TypeOf sender.Tag Is mRemoteNG.Connection.Info Then
                 App.Runtime.OpenConnection(sender.Tag)
             End If
         End If
@@ -583,9 +687,11 @@ Public Class frmMain
 
     Protected Overloads Overrides Sub WndProc(ByRef m As Message)
         Try
-            'Debug.Print(m.Msg)
+#If Config = "Debug" Then
+            Debug.Print(m.Msg)
+#End If
 
-            Select m.Msg
+            Select Case m.Msg
                 Case WM_GETTEXT
                     bWmGetTextFlag = True
                 Case WM_WINDOWPOSCHANGED
@@ -606,6 +712,13 @@ Public Class frmMain
                             Exit For
                         End If
                     Next
+                Case WM_DRAWCLIPBOARD
+                    SendMessage(fpChainedWindowHandle, m.Msg, m.LParam, m.WParam)
+                    RaiseEvent clipboardchange()
+                Case WM_CHANGECBCHAIN
+                    'Send to the next window
+                    SendMessage(fpChainedWindowHandle, m.Msg, m.LParam, m.WParam)
+                    fpChainedWindowHandle = m.LParam
                 Case Else
                     bWmGetTextFlag = False
                     bWmWindowPosChangedFlag = False
@@ -650,10 +763,10 @@ Public Class frmMain
 
         For i As Integer = 0 To Screen.AllScreens.Length - 1
             SysMenSubItems(i) = 200 + i
-            SysMenu.AppendMenuItem(popMen, Tools.SystemMenu.Flags.MF_STRING, SysMenSubItems(i), Language.Base.Screen & " " & i + 1)
+            SysMenu.AppendMenuItem(popMen, Tools.SystemMenu.Flags.MF_STRING, SysMenSubItems(i), My.Resources.strScreen & " " & i + 1)
         Next
 
-        SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 0, Tools.SystemMenu.Flags.MF_POPUP Or Tools.SystemMenu.Flags.MF_BYPOSITION, popMen, Language.Base.SendTo)
+        SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 0, Tools.SystemMenu.Flags.MF_POPUP Or Tools.SystemMenu.Flags.MF_BYPOSITION, popMen, My.Resources.strSendTo)
         SysMenu.InsertMenuItem(SysMenu.SystemMenuHandle, 1, Tools.SystemMenu.Flags.MF_BYPOSITION Or Tools.SystemMenu.Flags.MF_SEPARATOR, IntPtr.Zero, Nothing)
     End Sub
 #End Region

mRemoteV1/Forms/frmPassword.Designer.vb

@@ -64,7 +64,7 @@ Partial Class frmPassword
         Me.lblPassword.Name = "lblPassword"
         Me.lblPassword.Size = New System.Drawing.Size(56, 13)
         Me.lblPassword.TabIndex = 2
-        Me.lblPassword.Text = Language.Base.Password
+        Me.lblPassword.Text = My.Resources.strLabelPassword
         '
         'lblVerify
         '
@@ -73,7 +73,7 @@ Partial Class frmPassword
         Me.lblVerify.Name = "lblVerify"
         Me.lblVerify.Size = New System.Drawing.Size(36, 13)
         Me.lblVerify.TabIndex = 3
-        Me.lblVerify.Text = Language.Base.Verify
+        Me.lblVerify.Text = My.Resources.strLabelVerify
         '
         'btnOK
         '
@@ -83,7 +83,7 @@ Partial Class frmPassword
         Me.btnOK.Name = "btnOK"
         Me.btnOK.Size = New System.Drawing.Size(69, 23)
         Me.btnOK.TabIndex = 4
-        Me.btnOK.Text = Language.Base.Button_OK
+        Me.btnOK.Text = My.Resources.strButtonOK
         Me.btnOK.UseVisualStyleBackColor = True
         '
         'btnCancel
@@ -95,7 +95,7 @@ Partial Class frmPassword
         Me.btnCancel.Name = "btnCancel"
         Me.btnCancel.Size = New System.Drawing.Size(69, 23)
         Me.btnCancel.TabIndex = 5
-        Me.btnCancel.Text = Language.Base.Button_Cancel
+        Me.btnCancel.Text = My.Resources.strButtonCancel
         Me.btnCancel.UseVisualStyleBackColor = True
         '
         'lblStatus
@@ -107,13 +107,13 @@ Partial Class frmPassword
         Me.lblStatus.Name = "lblStatus"
         Me.lblStatus.Size = New System.Drawing.Size(189, 14)
         Me.lblStatus.TabIndex = 6
-        Me.lblStatus.Text = Language.Base.Status
+        Me.lblStatus.Text = "Status"
         Me.lblStatus.TextAlign = System.Drawing.ContentAlignment.TopRight
         Me.lblStatus.Visible = False
         '
         'pbLock
         '
-        Me.pbLock.Image = Global.mRemote.My.Resources.Resources.Lock
+        Me.pbLock.Image = Global.mRemoteNG.My.Resources.Resources.Lock
         Me.pbLock.Location = New System.Drawing.Point(7, 8)
         Me.pbLock.Name = "pbLock"
         Me.pbLock.Size = New System.Drawing.Size(64, 64)
@@ -152,7 +152,7 @@ Partial Class frmPassword
         Me.ShowIcon = False
         Me.ShowInTaskbar = False
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = Language.Base.Security
+        Me.Text = My.Resources.strTitlePassword
         CType(Me.pbLock, System.ComponentModel.ISupportInitialize).EndInit()
         Me.pnlImage.ResumeLayout(False)
         Me.pnlImage.PerformLayout()

mRemoteV1/Forms/frmPassword.vb

@@ -86,12 +86,12 @@
     End Sub
 
     Private Sub ApplyLanguage()
-        lblPassword.Text = Language.Base.Password
-        lblVerify.Text = Language.Base.Verify
-        btnOK.Text = Language.Base.Button_OK
-        btnCancel.Text = Language.Base.Button_Cancel
-        lblStatus.Text = Language.Base.Status
-        Text = Language.Base.Security
+        lblPassword.Text = My.Resources.strLabelPassword
+        lblVerify.Text = My.Resources.strLabelVerify
+        btnOK.Text = My.Resources.strButtonOK
+        btnCancel.Text = My.Resources.strButtonCancel
+        lblStatus.Text = "Status"
+        Text = My.Resources.strTitlePassword
     End Sub
 
     Private Sub txtPassword_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPassword.GotFocus

mRemoteV1/Help/ConfigurationSQL.htm

@@ -16,27 +16,27 @@
 <p>
         <span class="heading1">Steps to configure your SQL Server</span></p>
 <ul>
-    <li>Create a new Database called &quot;mRemote&quot; on your SQL Server.</li>
+    <li>Create a new Database called &quot;mRemoteNG&quot; on your SQL Server.</li>
     <li>Run the SQL Script below on the newly created Database.</li>
     <li>Give the users that you want to grant access to the mRemote Connections Database 
             Read/Write permissions on the Database.</li>
     </ul>
 <p class="heading1">
-        Steps to configure mRemote for SQL</p>
+        Steps to configure mRemoteNG for SQL</p>
 <ul>
-    <li>Start mRemote if it&#39;s not already running.</li>
+    <li>Start mRemoteNG if it&#39;s not already running.</li>
     <li>Go to Options - Connections.</li>
     <li>Check the box that says &quot;Use SQL Server to load &amp; save connections&quot;.</li>
     <li>Fill in your SQL Server hostname or ip address.</li>
     <li>If you do not use your Windows logon info to authenticate against the SQL Server 
         fill in the correct Username and Password.</li>
     <li>Click OK to apply the changes. The main window title should now change to 
-        &quot;mRemote | SQL Server&quot;.</li>
+        &quot;mRemoteNG | SQL Server&quot;.</li>
     <li>Now click on File - Save to update the tables on your SQL Server with the data 
         from the loaded connections xml file. (Do not click File - New, this doesn&#39;t 
         work yet)</li>
     <li>You should now be able to do everything you were able to do with the XML storage 
-        plus see the changes live on another mRemote instance that is connected to the 
+        plus see the changes live on another mRemoteNG instance that is connected to the 
         same Database.</li>
 </ul>
 

mRemoteV1/Language/Language.Base.vb

@@ -1,11 +0,0 @@
-Namespace Language
-    Public Class Base
-        Inherits Language.EN
-        Public Shared ReadOnly CurrentLanguage As Languages = Languages.EN
-    End Class
-
-    Public Enum Languages
-        EN = 1
-        DE = 2
-    End Enum
-End Namespace

mRemoteV1/Language/Language.DE.vb

@@ -1,390 +0,0 @@
-Namespace Language
-    Public Class DE
-        Public Const Button_Cancel As String = "&Abbrechen"
-        Public Const Button_New As String = "&Neu"
-        Public Const Button_OK As String = "&OK"
-        Public Const Button_Close As String = "&Schließen"
-        Public Const Button_Scan As String = "&Scannnen"
-        Public Const Button_Stop As String = "&Stop"
-        Public Const Button_Import As String = "&Importieren"
-
-        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_HostnameIP As String = "Hostname/IP"
-        Public Const Descr_HostnameIP As String = "Der Hostname od. die IP zu der eine Verbinung aufgebaut werden soll."
-        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"
-        Public Const Descr_EncryptionStrength As String = "Wählen sie die Verschlüsselungsstärke des Remote Hosts."
-        Public Const Props_AuthenticationLevel As String = "Serverauthentifizierung"
-        Public Const Descr_AuthenticationLevel As String = "Wählen sie welche Authentifizierungs-Variante verwendet wird."
-        Public Const Props_UseConsoleSession As String = "Verwende Console Session"
-        Public Const Descr_UseConsoleSession As String = "Zur Console Session des Remote Hosts verbinden."
-        Public Const Props_Resolution As String = "Auflösung"
-        Public Const Descr_Resolution As String = "Wählen sie die Auflösung in welcher der Host geöffnet werden soll."
-        Public Const Props_Colors As String = "Farben"
-        Public Const Descr_Colors As String = "Wählen sie die Farb Qualität."
-        Public Const Props_CacheBitmaps As String = "Bitmaps zwischenspeichern"
-        Public Const Descr_CacheBitmaps As String = "Wählen sie ob Bitmap caching zum Einsatz kommen soll."
-        Public Const Props_DisplayWallpaper As String = "Hintergrundbild anzeigen"
-        Public Const Descr_DisplayWallpaper As String = "Wählen sie ob Hintergrundbilder am Remote Host angezeigt werden sollen."
-        Public Const Props_DisplayThemes As String = "Themen anzeigen"
-        Public Const Descr_DisplayThemes As String = "Wählen sie ob Themen am Remote Host angezeigt werden sollen."
-        Public Const Props_RedKeyCombinations As String = "Tastenkombinationen"
-        Public Const Descr_RedKeyCombinations As String = "Wählen sie ob Tastenkombinationen wie z.B. Alt+Tab auf den Remote Host umgeleitet werden sollen."
-        Public Const Props_RedDiskDrives As String = "Festplatten"
-        Public Const Descr_RedDiskDrives As String = "Wählen sie ob ihre lokalen Festplatten am Remote Host angezeigt werden sollen."
-        Public Const Props_RedPrinters As String = "Drucker"
-        Public Const Descr_RedPrinters As String = "Wählen sie ob ihre lokalen Drucker am Remote Host angezeigt werden sollen."
-        Public Const Props_RedPorts As String = "Ports"
-        Public Const Descr_RedPorts As String = "Wählen sie ob ihre lokalen Ports wie z.B. COM, Parallel auf dem Remote Host angezeigt werden sollen."
-        Public Const Props_RedSmartCards As String = "Smart Cards"
-        Public Const Descr_RedSmartCards As String = "Wählen sie ob ihre lokalen Smart Cards auf dem Remote Host zur Verfügung stehen sollen."
-        Public Const Props_RedSounds As String = "Töne"
-        Public Const Descr_RedSound As String = "Wählen sie wie Töne auf dem Remote Host wiedergegeben werden sollen."
-        Public Const Props_PreExtApp As String = "Pre Ext. App"
-        Public Const Descr_PreExtApp As String = "Wählen sie eine Ext. App die gestartet werden soll bevor die Verbindung zum Remote Host aufgebaut wurde."
-        Public Const Props_PostExtApp As String = "Post Ext. App"
-        Public Const Descr_PostExtApp As String = "Wählen sie eine Ext. App die gestartet werden soll nachdem die Verbindung zum Remote Host getrennt wurde."
-        Public Const Props_Compression As String = "Kompremierung"
-        Public Const Descr_Compression As String = "Wählen sie die Kompressionsrate die verwendet werden soll."
-        Public Const Props_Encoding As String = "Codierung"
-        Public Const Descr_Encoding As String = "Wählen sie die Codierung die verwendet werden soll."
-        Public Const Props_AuthMode As String = "Auth. Modus"
-        Public Const Descr_AuthMode As String = "Wählen sie wie sie sich am VNC server authentifizieren wollen."
-        Public Const Props_ProxyType As String = "Proxy Typ"
-        Public Const Descr_ProxyType As String = "Wenn sie einen Proxy verwenden um auf den Remote Host zugreifen zu können, wählen sie hier den Typ."
-        Public Const Props_ProxyIP As String = "Proxy IP"
-        Public Const Descr_ProxyIP As String = "Geben sie die IP des Proxy Servers ein."
-        Public Const Props_ProxyPort As String = "Proxy Port"
-        Public Const Descr_ProxyPort As String = "Geben sie den Port des Proxy Servers ein."
-        Public Const Props_ProxyUsername As String = "Proxy Benutzername"
-        Public Const Descr_ProxyUsername As String = "Geben sie ihren Benutzernamen ein."
-        Public Const Props_ProxyPassword As String = "Proxy Passwort"
-        Public Const Descr_ProxyPassword As String = "Geben sie ihr Password ein."
-        Public Const Props_SmartSizeMode As String = "SmartSize Modus"
-        Public Const Descr_SmartSizeMode As String = "Wählen sie den SmartSize Modus der verwendet werden soll."
-        Public Const Props_ViewOnly As String = "View-Only"
-        Public Const Descr_ViewOnly As String = "Wählen sie ob sie eine View-Only Verbindung aufbauen wollen."
-        Public Const Props_RenderingEngine As String = "Rendering Engine"
-        Public Const Descr_RenderingEngine As String = "Wählen sie eine der Rendering Engines die verwendet wird um html darzustellen."
-        Public Const Props_MacAddress As String = "MAC Adresse"
-        Public Const Descr_MacAddress As String = "Geben sie die MAC Adresse des Remote Hosts ein (kann für Ext. Apps verwendet werden)."
-        Public Const Props_UserField As String = "Benutzer Feld"
-        Public Const Descr_UserField As String = "Dieses Feld ist frei beschreibbar."
-
-        Public Const Props_General As String = "Generell"
-        Public Const Props_Display As String = "Anzeige"
-        Public Const Props_Connection As String = "Verbindung"
-        Public Const Props_Appearance As String = "Aussehen"
-        Public Const Props_Redirect As String = "Umleitung"
-        Public Const Props_Misc As String = "Verschiedenes"
-        Public Const Props_InheritEverything As String = "Alles vererben"
-        Public Const Props_ExtApp As String = "Ext. App"
-        Public Const Descr_ExtApp As String = "Wählen sie die Ext. App die gestartet werden soll."
-
-
-        Public Const Menu_About As String = "Über"
-        Public Const Menu_AddConnectionPanel As String = "Verbindungs Panel hinzufügen"
-        Public Const Menu_Forum As String = "Support Forum" ' TODO: Translate
-        Public Const Menu_BugReport As String = "Bug Report" ' TODO: Translate
-        Public Const Menu_Config As String = "Konfiguration"
-        Public Const Menu_ConnectionPanels As String = "Verbindungs Panels"
-        Public Const Menu_Connections As String = "Verbindungen"
-        Public Const Menu_ConnectionsConfig As String = "Verbindungen && Konfiguration"
-        Public Const Menu_Donate As String = "Spenden"
-        Public Const Menu_ErrorsAndInfos As String = "Fehler und Infos"
-        Public Const Menu_ErrorsInfos As String = "Fehler && Infos"
-        Public Const Menu_Exit As String = "Beenden"
-        Public Const Menu_ExternalApplications As String = "Externe Programme"
-        Public Const Menu_ExternalApplicationsToolbar As String = "Externe Programme Symbolleiste"
-        Public Const Menu_File As String = "&Datei"
-        Public Const Menu_FullScreenKioskMode As String = "Vollbild (Kiosk Modus)"
-        Public Const Menu_Help As String = "Hilfe"
-        Public Const Menu_Info As String = "&Info"
-        Public Const Menu_JumpTo As String = "Springe zu"
-        Public Const Menu_NewConnections As String = "Neu Verbindungen"
-        Public Const Menu_OpenConnections As String = "Verbindungen öffnen"
-        Public Const Menu_Options As String = "Optionen"
-        Public Const Menu_PortScan As String = "Port Scan"
-        Public Const Menu_QuickyToolbar As String = "Quicky Symbolleiste"
-        Public Const Menu_SaveConnections As String = "Verbindungen speichern"
-        Public Const Menu_SaveConnectionsAs As String = "Verbindungen speichern unter"
-        Public Const Menu_ScreenshotManager As String = "Screenshot Manager"
-        Public Const Menu_Sessions As String = "Sessions"
-        Public Const Menu_SessionsScreenshots As String = "Sessions && Screenshots"
-        Public Const Menu_SSHFileTransfer As String = "SSH Datei Transfer"
-        Public Const Menu_Tools As String = "E&xtras"
-        Public Const Menu_Update As String = "Update"
-        Public Const Menu_View As String = "&Ansicht"
-        Public Const Menu_Website As String = "Webseite"
-
-        Public Const Toolbar_Play As String = "Los!"
-        Public Const Toolbar_Quicky As String = "&Quicky:"
-        Public Const Toolbar_ShowText As String = "Text anzeigen"
-
-        Public Const Password As String = "Passwort:"
-        Public Const Security As String = "Sicherheit"
-        Public Const SelectAPanel As String = "Wähle ein Panel aus der Liste oder klicke auf Neu um ein neues zu erstellen. Klicke OK um fortzufahren."
-        Public Const SelectPanel As String = "Wähle Panel"
-        Public Const Status As String = "Status"
-        Public Const Verify As String = "Überprüfen:"
-        Public Const Aspect As String = "Aspekt"
-        Public Const Free As String = "Frei"
-        Public Const NoSmartSize As String = "Kein SmartSize"
-        Public Const Normal As String = "Normal"
-        Public Const None As String = "Kein"
-        Public Const NoCompression As String = "Keine Kompression"
-        Public Const Connecting As String = "Verbinde..."
-        Public Const Disconnected As String = "Getrennt"
-        Public Const RDP256Colors As String = "256 Farben"
-        Public Const RDPSoundBringToThisComputer As String = "Auf diesem Computer wiedergeben"
-        Public Const RDPSoundLeaveAtRemoteComputer As String = "Auf dem Remotecomputer wiedergeben"
-        Public Const RDPSoundDoNotPlay As String = "Nicht wiedergeben"
-        Public Const RDPFitToPanel As String = "An das Panel anpassen"
-        Public Const RDPSmartSize As String = "Smart Size"
-        Public Const Active As String = "Aktiv"
-        Public Const Inactive As String = "Inaktiv"
-        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"
-        Public Const SmartSize As String = "SmartSize"
-        Public Const Screenshot As String = "Screenshot"
-        Public Const StartChat As String = "Chat starten"
-        Public Const TransferFile As String = "Datei übertragen"
-        Public Const RefreshScreen As String = "Anzeige aktualisieren"
-        Public Const SendSpecialKeys As String = "Tastenkombination senden"
-        Public Const RenameTab As String = "Tab umbenennen"
-        Public Const DuplicateTab As String = "Tab klonen"
-        Public Const Reconnect As String = "Wiederverbinden"
-        Public Const Disconnect As String = "Trennen"
-        Public Const Message As String = "Nachricht"
-        Public Const Copy As String = "Kopieren"
-        Public Const Paste As String = "Einfügen"
-        Public Const Delete As String = "Löschen"
-        Public Const Filename As String = "Dateiname"
-        Public Const Arguments As String = "Parameter"
-        Public Const WaitForExit As String = "Auf Beendigung warten"
-        Public Const Add As String = "Hinzufügen"
-        Public Const Remove As String = "Entfernen"
-        Public Const Start As String = "Starten"
-        Public Const Application As String = "Applikation"
-        Public Const Editor As String = "Editor"
-        Public Const Browse As String = "Öffnen..."
-        Public Const DisplayName As String = Props_Display & " " & Props_Name
-        Public Const ReallyDeleteSelectedApplications As String = "Sind sie sicher dass sie die ausgewählte(n) Applikation(en) löschen möchten?"
-
-        Public Const Key_Control As String = "Strg"
-        Public Const Key_Alt As String = "Alt"
-        Public Const Key_Del As String = "Entf"
-        Public Const Key_Esc As String = "Esc"
-
-        Public Const Advanced As String = "Erweitert"
-        Public Const TestProxy As String = "Test Proxy"
-        Public Const Seconds As String = "Sekunden"
-        Public Const MaxPuttyWaitTime As String = "Maximale Zeit die auf PuTTY und integrierte Ext. Apps gewartet wird"
-        Public Const AutomaticallyTryToReconnect As String = "Automatisch versuchen zu verbinden wenn Verbindung getrennt wird (nur RDP && ICA)"
-        Public Const Address As String = "Addresse"
-        Public Const UseAuthentication As String = "Benutze Authentifizierung"
-        Public Const UseProxyForAutomaticUpdates As String = "Proxy für automatische Updates verwenden"
-        Public Const ToConfigurePuttySessions As String = "Hier klicken um PuTTY Sessions zu konfigurieren:"
-        Public Const LaunchPutty As String = "Starte PuTTY"
-        Public Const UseCustomPuttyPath As String = "Eigener PuTTY Pfad:"
-        Public Const AutomaticallyGetSessionInfo As String = "Automatisch Session Informationen einholen"
-        Public Const WriteLogFile As String = "Log File schreiben (mRemoteNG.log)"
-        Public Const StartupExit As String = "Start/Ende"
-        Public Const AllowOnlySingleInstance As String = "Nur eine Instanz zulassen (mRemote Neustart benötigt)"
-        Public Const ReconnectAtStartup As String = "Offene Verbindungen speichern und beim nächsten Start wiederverbinden"
-        Public Const CheckForUpdatesOnStartup As String = "Beim Start auf Updates prüfen"
-        Public Const ConfirmExit As String = "Schließen bestätigen wenn Verbindungen bestehen"
-        Public Const SaveConsOnExit As String = "Verbindungen beim Schließen speichern"
-        Public Const MinimizeToSysTray As String = "In die System Tray minimieren"
-        Public Const ShowFullConsFilePath As String = "Vollen Verbindungsdateipfad im Titel anzeigen"
-        Public Const AlwaysShowSysTrayIcon As String = "System Tray Icon immer anzeigen"
-        Public Const ShowDescriptionTooltips As String = "Beschreibungs Tooltips in der Verbindungsliste anzeigen"
-        Public Const TabsAndPanels As String = "Tabs && Panele"
-        Public Const ShowProtocolOnTabs As String = "Protokoll im Tab Titel anzeigen"
-        Public Const ShowLogonInfoOnTabs As String = "Anmeldeinformationen im Tab Titel anzeigen"
-        Public Const OpenNewTabRight As String = "Neue Tabs rechts vom momentan selektierten Tab öffnen"
-        Public Const AlwaysShowPanelSelection As String = "Panel Auswahl Dialog immer anzeigen"
-        Public Const DoubleClickTabClosesIt As String = "Doppelklick schließt Tabs"
-        Public Const SetHostnameLikeDisplayName As String = "Beim Anlegen einer neuen Verbindung Hostname wie Anzeige Name setzen"
-        Public Const Experimental As String = "Experimentell"
-        Public Const UseSQLServer As String = "SQL Server für das Laden && Speichern der Verbindungen verwenden"
-        Public Const SQLInfo As String = "Für mehr Infos bitte Hilfeeintrag lesen (Info - Help - Getting started - SQL Configuration)"
-        Public Const SQLServer As String = "SQL Server"
-        Public Const AutoSaveMins As String = "Minuten (0 = Ausgeschalten)"
-        Public Const AutoSaveEvery As String = "Automatisch speichern jede:"
-        Public Const TheFollowing As String = "die folgenden"
-        Public Const MyCurrentWindowsCreds As String = "meine aktuellen (windows login info)"
-        Public Const NoInformation As String = "keine"
-        Public Const EmptyUsernamePasswordDomainFields As String = "Bei leeren Benutzername, Passwort oder Domänen Feldern benutze:"
-        Public Const SingleClickOnOpenConnectionSwitchesToIt As String = "Ein einzelner Klick auf eine geöffnete Verbindung springt zu dieser"
-        Public Const SingleClickOnConnectionOpensIt As String = "Ein einzelner Klick auf eine Verbindung öffnet diese"
-        Public Const SwitchToErrorsAndInfos As String = "Öffne das Fehler && Infos Panel bei"
-        Public Const Errors As String = "Fehler"
-        Public Const Warnings As String = "Warnungen"
-        Public Const Informations As String = "Informationen"
-        Public Const UseOnlyErrorsAndInfosPanel As String = "Nur Fehler && Infos Panel benutzen (Keine Popups)"
-        Public Const Applications As String = "Applikationen"
-        Public Const ProxyTestSucceeded As String = "Proxy test erfolgreich!"
-        Public Const ProxyTestFailed As String = "Proxy test fehlgeschlagen!"
-
-        Public Const StartIP As String = "Start IP"
-        Public Const EndIP As String = "End IP"
-        Public Const ProtocolToImport As String = "Zu importierendes Protokoll"
-        Public Const OpenPorts As String = "Offene Ports"
-        Public Const ClosedPorts As String = "Geschlossene Ports"
-        Public Const StartPort As String = "Start Port"
-        Public Const EndPort As String = "End Port"
-        Public Const QuickConnect As String = "Quick Connect"
-        Public Const UncheckProperties As String = "Deaktivieren sie alle Eigenschaften die nicht gespeichert werden sollen."
-        Public Const Export As String = "Export"
-        Public Const SaveAll As String = "Alle speichern"
-        Public Const RemoveAll As String = "Alle entfernen"
-        Public Const Save As String = "Speichern"
-        Public Const SaveImageFilter As String = "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png" ' TODO: Translate
-        Public Const Screenshots As String = "Screenshots"
-        Public Const Activity As String = "Aktivität"
-        Public Const Type As String = "Type"
-        Public Const Refresh As String = "Aktualisieren"
-        Public Const LogOff As String = "Ausloggen"
-        Public Const LocalFile As String = "Lokale Datei"
-        Public Const RemoteFile As String = "Remote Datei"
-        Public Const User As String = "Benutzer"
-        Public Const Host As String = "Host"
-        Public Const Transfer As String = "Transfer"
-        Public Const AddConnection As String = "Verbindung hinzufügen"
-        Public Const AddFolder As String = "Ordner hinzufügen"
-        Public Const Connect As String = "Verbinden"
-        Public Const ConnectWithOptions As String = "Verbinden (mit Optionen)"
-        Public Const ConnectToConsoleSession As String = "Mit der Console Session verbinden"
-        Public Const ConnectInFullscreen As String = "Im Vollbild verbinden"
-        Public Const ChoosePanelBeforeConnecting As String = "Panel vor Verbindung auswählen"
-        Public Const Tools As String = "Extras"
-        Public Const ImportExport As String = "Importieren/Exportieren"
-        Public Const ExportmRemoteXML As String = "mRemote XML exportieren"
-        Public Const ImportmRemoteXML As String = "mRemote XML importieren"
-        Public Const ImportAD As String = "Aus Active Directory importieren"
-        Public Const ImportRDPFiles As String = "Aus .RDP Datei(en) importieren"
-        Public Const ImportPortScan As String = "Von Port Scan importieren"
-        Public Const Sort As String = "Sortieren"
-        Public Const SortAsc As String = "Aufsteigend (A-Z)"
-        Public Const SortDesc As String = "Abfallend (Z-A)"
-        Public Const Duplicate As String = "Duplizieren"
-        Public Const Rename As String = "Umbenennen"
-        Public Const MoveUp As String = "Nach oben"
-        Public Const MoveDown As String = "Nach unten"
-        Public Const ExpandAllFolders As String = "Alle Ordner erweitern"
-        Public Const CollapseAllFolders As String = "Alle Ordner schließen"
-        Public Const NewConnection As String = "Neue Verbindung"
-        Public Const NewFolder As String = "Neuer Ordner"
-        Public Const CheckForUpdate As String = "Auf Update prüfen"
-        Public Const DownloadAndInstall As String = "Downloaden && Installieren"
-        Public Const AvailableVersion As String = "Verfügbare Version"
-        Public Const CurrentVersion As String = "Aktuelle Version"
-        Public Const Version As String = "Version"
-        Public Const UpdateAvailable As String = "Update verfügbar!"
-        Public Const NoUpdateAvailable As String = "Kein Update verfügbar!"
-        Public Const UpdateDownloadComplete As String = "Download fertiggestellt!" & vbNewLine & "mRemote wird nun geschlossen und die Installation gestartet."
-        Public Const SendTo As String = "Senden an..."
-        Public Const Screen As String = "Bildschirm"
-
-        Public Const UnclosedConnectionPanels As String = "Es sind noch geöffnete Verbindungs Panele vorhanden, wollen sie wirklich beenden?"
-        Public Const SaveConnectionsFileBeforeOpeningAnother As String = "Wollen sie die aktuelle Verbindungs-Datei speichern bevor eine andere geladen wird?"
-        Public Const NewPanel As String = "Neues Panel"
-        Public Const PanelName As String = "Panel Name"
-        Public Const NewTitle As String = "Neuer Titel"
-
-        Public Const AlwaysConnectEvenIfAuthFails As String = "Immer verbinden, auch wenn Authentifizierung fehlschlägt"
-        Public Const DontConnectWhenAuthFails As String = "Keine Verbindung herstellen wenn Authentifizierung fehlschlägt"
-        Public Const WarnIfAuthFails As String = "Warnung anzeigen wenn Authentifizierung fehlschlägt"
-        Public Const UltraVNCSCListeningPort As String = "UltraVNC SingleClick Port"
-        Public Const ListeningForIncomingVNCConnections As String = "Warte auf eingehende VNC Verbindungen auf Port"
-
-        Public Const CheckProperInstallationOfComponentsAtStartup As String = "Überprüfe die Installation aller Komponenten beim Start"
-        Public Const XULrunnerPath As String = "XULrunner Pfad"
-        Public Const Inherit As String = "Vererbe"
-
-        Public Const ComponentsCheck As String = "Komponenten Check"
-
-        Public Const EncryptCompleteConnectionFile As String = "Connections Datei vollständig verschlüsseln"
-
-        Public Const EmptyPasswordContinue As String = "Wollen sie ohne Passwort fortfahren?"
-
-        'CompCheck
-        Public Const CcAlwaysShowScreen As String = "Bei jedem Start anzeigen"
-        Public Const CcCheckAgain As String = "Aktualisieren"
-        Public Const CcNotInstalledProperly As String = "nicht korrekt installiert"
-        Public Const CcCheckSucceeded As String = "Check erfolgreich!"
-        Public Const CcCheckFailed As String = "Check fehlgeschlagen!"
-        Public Const CcRDPOK As String = "Alle RDP Komponenten wurden gefunden und scheinen korrekt registriert zu sein."
-        Public Const CcRDPFailed As String = "Um RDP korrekt betreiben können muss mindestens Remote Desktop Connection (Terminal Services Client) 6.0 installiert sein. Hier können sie die Software herunterladen: http://support.microsoft.com/kb/925876" & vbNewLine & _
-                                            "Wenn sie RDP 6.0 bereits installiert haben und der Check noch immer fehlschlägt, versuchen sie die Datei mstscax.dll manuell zu registrieren. Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\windows\system32\mstscax.dll"" (Wobei c:\ ihr System-Laufwerk ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit RDP haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
-        Public Const CcVNCOK As String = "Alle VNC Komponenten wurden gefunden und scheinen korrekt registriert zu sein."
-        Public Const CcVNCFailed As String = "VNC benötigt die Datei scvncctrl.dll (wird mitgeliefert). Diese muss registriert sein. Wenn sie eines der nicht-Setup Pakete verwenden muss dies manuell durchgeführt werden." & vbNewLine & _
-                                            "Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\Programme\mRemote\scvncctrl.dll"" (Wobei c:\Programme\mRemote\ ihr mRemote Installations-Pfad ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit VNC haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
-        Public Const CcPuttyOK As String = "PuTTY wurde gefunden und scheint betriebsbereit zu sein."
-        Public Const CcPuttyFailed As String = "Die Protokolle, SSH, Telnet, Rlogin und RAW benötigen PuTTY. PuTTY wird in allen mRemote Paketen mitgeliefert und befindet sich im Installations-Pfad." & vbNewLine & _
-                                            "Bitte versichern sie sich dass sich die Datei Putty.exe in ihrem mRemote Installations-Pfad befindet (Standard: c:\Programme\mRemote\) oder dass sie einen korrekten Pfad in den Optionen (Extras - Optionen - Erweitert - Eigener PuTTY Pfad) angegeben haben."
-        Public Const CcICAOK As String = "Alle ICA Komponenten wurden gefunden und scheinen korrekt registriert zu sein."
-        Public Const CcICAFailed As String = "ICA benötigt eine funktionierende Citrix Presentation Server Client Installation und dass die Datei wfica.ocx korrekt registriert ist. Hier können sie den Client herunterladen: http://www.citrix.com/download/" & vbNewLine & _
-                                            "Wenn sie Citrix Presentation Server Client installiert haben und noch immer Probleme haben diesen Check erfolgreich abzuschließen, versuchen sie die Datei wfica.ocx manuell zu registrieren." & vbNewLine & _
-                                            "Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\Programme\Citrix\ICA Client\wfica.ocx"" (Wobei c:\Programme\Citrix\ICA Client\ ihr Citrix Presentation Server Client Installations-Pfad ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit ICA haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
-        Public Const CcGeckoOK As String = "XULrunner wurde gefunden und scheint korrekt installiert zu sein."
-        Public Const CcGeckoFailed As String = "Um die Gecko Rendering Engine benutzen zu können benötigen sie XULrunner 1.8.1.x und einen korrekt eingetragenen Pfad in den Optionen." & vbNewLine & _
-                                            "Hier können sie XULrunner 1.8.1.3 herunterladen: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/" & vbNewLine & _
-                                            "Wenn der Download abgeschlossen ist entpacken sie das Paket (Der Speicherort ist dabei ihnen überlassen). Als nächstes öffnen sie (in mRemote) Extras - Optionen - Erweitert und geben sie den korrekten Pfad im XULrunner Feld an." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit der Gecko Engine in mRemote haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
-        Public Const CcEOLOK As String = "EOLWTSCOM wurde gefunden und scheint korrekt registriert zu sein."
-        Public Const CcEOLFailed As String = "Das (RDP) Sessions feature benötigt die Datei eolwtscom.dll. Diese muss korrekt registriert sein." & vbNewLine & _
-                                            "Alle mRemote Pakete beinhalten diese Datei, jedoch muss sie, wenn sie eines der nicht-Setup Pakete verwenden manuell registriert werden." & vbNewLine & _
-                                            "Öffnen sie hierzu den Ausführen Dialog (Start - Ausführen) und geben sie Folgendes ein: regsvr32 ""c:\Programme\mRemote\eolwtscom.dll"" (Wobei c:\Programme\mRemote\ ihr mRemote Installations-Pfad ist)." & vbNewLine & _
-                                            "Wenn sie noch immer Probleme mit dem (RDP) Sessions Feature in mRemote haben, konsultieren sie bitte das mRemote Forum: http://forum.mremoteng.org/"
-
-        Public Const PropertiesWillOnlyBeSavedMRemoteXML As String = "(Diese Einstellungen werden nur gespeichert wenn sie mRemote XML als Dateiformat auswählen!)"
-    End Class
-End Namespace

mRemoteV1/Language/Language.EN.vb

@@ -1,401 +0,0 @@
-Namespace Language
-    Public Class EN
-        Public Const Button_Cancel As String = "&Cancel"
-        Public Const Button_New As String = "&New"
-        Public Const Button_OK As String = "&OK"
-        Public Const Button_Close As String = "&Close"
-        Public Const Button_Scan As String = "&Scan"
-        Public Const Button_Stop As String = "&Stop"
-        Public Const Button_Import As String = "&Import"
-
-        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_HostnameIP As String = "Hostname/IP"
-        Public Const Descr_HostnameIP As String = "Enter the hostname or ip you want to connect to."
-        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"
-        Public Const Descr_EncryptionStrength As String = "Select the encryption strength of the remote host."
-        Public Const Props_AuthenticationLevel As String = "Server authentication"
-        Public Const Descr_AuthenticationLevel As String = "Select which authentication level this connection should use."
-        Public Const Props_UseConsoleSession As String = "Use console session"
-        Public Const Descr_UseConsoleSession As String = "Connect to the console session of the remote host."
-        Public Const Props_Resolution As String = "Resolution"
-        Public Const Descr_Resolution As String = "Choose the resolution or mode this connection will open in."
-        Public Const Props_Colors As String = "Colors"
-        Public Const Descr_Colors As String = "Select the color quality to be used."
-        Public Const Props_CacheBitmaps As String = "Cache Bitmaps"
-        Public Const Descr_CacheBitmaps As String = "Select whether to use bitmap caching or not."
-        Public Const Props_DisplayWallpaper As String = "Display Wallpaper"
-        Public Const Descr_DisplayWallpaper As String = "Select yes if the wallpaper of the remote host should be displayed."
-        Public Const Props_DisplayThemes As String = "Display Themes"
-        Public Const Descr_DisplayThemes As String = "Select yes if the theme of the remote host should be displayed."
-        Public Const Props_RedKeyCombinations As String = "Key combinations"
-        Public Const Descr_RedKeyCombinations As String = "Select whether key combinations (ie. Alt+Tab) should be redirected to the remote host."
-        Public Const Props_RedDiskDrives As String = "Disk Drives"
-        Public Const Descr_RedDiskDrives As String = "Select whether local disk drives should be shown on the remote host."
-        Public Const Props_RedPrinters As String = "Printers"
-        Public Const Descr_RedPrinters As String = "Select whether local printers should be shown on the remote host."
-        Public Const Props_RedPorts As String = "Ports"
-        Public Const Descr_RedPorts As String = "Select whether local ports (ie. com, parallel) should be shown on the remote host."
-        Public Const Props_RedSmartCards As String = "Smart Cards"
-        Public Const Descr_RedSmartCards As String = "Select whether local Smart Cards should be available on the remote host."
-        Public Const Props_RedSounds As String = "Sounds"
-        Public Const Descr_RedSound As String = "Select how remote sound should be redirected."
-        Public Const Props_PreExtApp As String = "Pre Ext. App"
-        Public Const Descr_PreExtApp As String = "Select a Ext. App to be started before the connection to the remote host is established."
-        Public Const Props_PostExtApp As String = "Post Ext. App"
-        Public Const Descr_PostExtApp As String = "Select a Ext. App to be started after the disconnection to the remote host."
-        Public Const Props_Compression As String = "Compression"
-        Public Const Descr_Compression As String = "Select the compression value to be used."
-        Public Const Props_Encoding As String = "Encoding"
-        Public Const Descr_Encoding As String = "Select the encoding mode to be used."
-        Public Const Props_AuthMode As String = "Auth. Mode"
-        Public Const Descr_AuthMode As String = "Select how you want to authenticate against the VNC server."
-        Public Const Props_ProxyType As String = "Proxy Type"
-        Public Const Descr_ProxyType As String = "If you use a proxy to tunnel VNC connections, select which type it is."
-        Public Const Props_ProxyIP As String = "Proxy IP"
-        Public Const Descr_ProxyIP As String = "Enter the Proxy IP to be used."
-        Public Const Props_ProxyPort As String = "Proxy Port"
-        Public Const Descr_ProxyPort As String = "Enter the port the Proxy Server listens on."
-        Public Const Props_ProxyUsername As String = "Proxy Username"
-        Public Const Descr_ProxyUsername As String = "Enter your username for authenticating against the Proxy."
-        Public Const Props_ProxyPassword As String = "Proxy Password"
-        Public Const Descr_ProxyPassword As String = "Enter your password for authenticating against the Proxy."
-        Public Const Props_SmartSizeMode As String = "SmartSize Mode"
-        Public Const Descr_SmartSizeMode As String = "Select the SmartSize mode to be used."
-        Public Const Props_ViewOnly As String = "View Only"
-        Public Const Descr_ViewOnly As String = "If you want to establish a view-only connection to the host select yes."
-        Public Const Props_RenderingEngine As String = "Rendering Engine"
-        Public Const Descr_RenderingEngine As String = "Select one of the available rendering engines that will be used to display html."
-        Public Const Props_MacAddress As String = "MAC Address"
-        Public Const Descr_MacAddress As String = "Enter the MAC Address of the remote host if you wish to use it in Ext. Apps."
-        Public Const Props_UserField As String = "User Field"
-        Public Const Descr_UserField As String = "Feel free to enter any information you need here."
-        Public Const Props_RDGatewayUsageMethod As String = "Use Gateway"
-        Public Const Descr_RDGatewayUsageMethod As String = "Specifies when to use a Remote Desktop Gateway (RD Gateway) server."
-        Public Const Props_RDGatewayHostname As String = "Gateway Hostname"
-        Public Const Descr_RDGatewayHostname As String = "Specifies the host name of the Remote Desktop Gateway server."
-        Public Const Props_RDGatewayUseConnectionCredentials As String = "Gateway Credentials"
-        Public Const Descr_RDGatewayUseConnectionCredentials As String = "Specifies whether or not to log on to the gateway using the same username and password as the connection."
-        Public Const Props_RDGatewayUsername As String = "Gateway Username"
-        Public Const Descr_RDGatewayUsername As String = "Specifies the user name that a user provides to connect to the RD Gateway server."
-        Public Const Props_RDGatewayPassword As String = "Gateway Password"
-        Public Const Descr_RDGatewayPassword As String = "Specifies the password that a user provides to connect to the RD Gateway server."
-        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_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."
-        
-
-        Public Const Menu_About As String = "About"
-        Public Const Menu_AddConnectionPanel As String = "Add Connection Panel"
-        Public Const Menu_Forum As String = "Support Forum"
-        Public Const Menu_BugReport As String = "Report a Bug"
-        Public Const Menu_Config As String = "Config"
-        Public Const Menu_ConnectionPanels As String = "Connection Panels"
-        Public Const Menu_Connections As String = "Connections"
-        Public Const Menu_ConnectionsConfig As String = "Connections && Config"
-        Public Const Menu_Donate As String = "Donate"
-        Public Const Menu_ErrorsAndInfos As String = "Notifications"
-        Public Const Menu_ErrorsInfos As String = "Notifications"
-        Public Const Menu_Exit As String = "Exit"
-        Public Const Menu_ExternalApplications As String = "External Applications"
-        Public Const Menu_ExternalApplicationsToolbar As String = "External Applications Toolbar"
-        Public Const Menu_File As String = "&File"
-        Public Const Menu_FullScreenKioskMode As String = "Full Screen"
-        Public Const Menu_Help As String = "mRemoteNG Help"
-        Public Const Menu_Info As String = "&Help"
-        Public Const Menu_JumpTo As String = "Jump To"
-        Public Const Menu_NewConnections As String = "New Connections"
-        Public Const Menu_OpenConnections As String = "Open Connections"
-        Public Const Menu_Options As String = "Options"
-        Public Const Menu_PortScan As String = "Port Scan"
-        Public Const Menu_QuickyToolbar As String = "Quick Connect Toolbar"
-        Public Const Menu_SaveConnections As String = "Save Connections"
-        Public Const Menu_SaveConnectionsAs As String = "Save Connections As"
-        Public Const Menu_ScreenshotManager As String = "Screenshot Manager"
-        Public Const Menu_Sessions As String = "Sessions"
-        Public Const Menu_SessionsScreenshots As String = "Sessions && Screenshots"
-        Public Const Menu_SSHFileTransfer As String = "SSH File Transfer"
-        Public Const Menu_Tools As String = "&Tools"
-        Public Const Menu_Update As String = "Check for Updates"
-        Public Const Menu_View As String = "&View"
-        Public Const Menu_Website As String = "Website"
-
-        Public Const Toolbar_Play As String = "Connect"
-        Public Const Toolbar_Quicky As String = "&Connect:"
-        Public Const Toolbar_ShowText As String = "Show Text"
-
-        Public Const Password As String = "Password:"
-        Public Const Security As String = "Security"
-        Public Const SelectAPanel As String = "Select a panel from the list below or click New to add a new one. Click OK to continue."
-        Public Const SelectPanel As String = "Select Panel"
-        Public Const Status As String = "Status"
-        Public Const Verify As String = "Verify:"
-        Public Const Aspect As String = "Aspect"
-        Public Const Free As String = "Free"
-        Public Const NoSmartSize As String = "No SmartSize"
-        Public Const Normal As String = "Normal"
-        Public Const None As String = "None"
-        Public Const NoCompression As String = "No Compression"
-        Public Const Connecting As String = "Connecting..."
-        Public Const Disconnected As String = "Disconnected"
-        Public Const RDP256Colors As String = "256 Colors"
-        Public Const RDPSoundBringToThisComputer As String = "Bring to this computer"
-        Public Const RDPSoundLeaveAtRemoteComputer As String = "Leave at remote computer"
-        Public Const RDPSoundDoNotPlay As String = "Do not play"
-        Public Const RDPFitToPanel As String = "Fit To Panel"
-        Public Const RDPSmartSize As String = "Smart Size"
-        Public Const Active As String = "Active"
-        Public Const Inactive As String = "Inactive"
-        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"
-        Public Const SmartSize As String = "SmartSize"
-        Public Const Screenshot As String = "Screenshot"
-        Public Const StartChat As String = "Start Chat"
-        Public Const TransferFile As String = "Transfer File"
-        Public Const RefreshScreen As String = "Refresh Screen"
-        Public Const SendSpecialKeys As String = "Send special Keys"
-        Public Const RenameTab As String = "Rename Tab"
-        Public Const DuplicateTab As String = "Duplicate Tab"
-        Public Const Reconnect As String = "Reconnect"
-        Public Const Disconnect As String = "Disconnect"
-        Public Const Message As String = "Message"
-        Public Const Copy As String = "Copy"
-        Public Const Paste As String = "Paste"
-        Public Const Delete As String = "Delete"
-        Public Const Filename As String = "Filename"
-        Public Const Arguments As String = "Arguments"
-        Public Const WaitForExit As String = "Wait for exit"
-        Public Const Add As String = "Add"
-        Public Const Remove As String = "Remove"
-        Public Const Start As String = "Start"
-        Public Const Application As String = "Application"
-        Public Const Editor As String = "Editor"
-        Public Const Browse As String = "Browse..."
-        Public Const DisplayName As String = Props_Display & " " & Props_Name
-        Public Const ReallyDeleteSelectedApplications As String = "Do you really want to delete the selected application(s)?"
-
-
-        Public Const Key_Control As String = "Ctrl"
-        Public Const Key_Alt As String = "Alt"
-        Public Const Key_Del As String = "Del"
-        Public Const Key_Esc As String = "Esc"
-
-        Public Const Advanced As String = "Advanced"
-        Public Const TestProxy As String = "Test Proxy"
-        Public Const Seconds As String = "seconds"
-        Public Const MaxPuttyWaitTime As String = "Max. PuTTY && Integrated Ext. Apps wait time"
-        Public Const AutomaticallyTryToReconnect As String = "Automatically try to reconnect when disconnected from server (RDP && ICA only)"
-        Public Const Address As String = "Address"
-        Public Const UseAuthentication As String = "This proxy server requires authentication"
-        Public Const UseProxyForAutomaticUpdates As String = "Use a proxy server to connect"
-        Public Const ToConfigurePuttySessions As String = "To configure PuTTY sessions click this button:"
-        Public Const LaunchPutty As String = "Launch PuTTY"
-        Public Const UseCustomPuttyPath As String = "Use custom PuTTY path:"
-        Public Const AutomaticallyGetSessionInfo As String = "Automatically get session information"
-        Public Const WriteLogFile As String = "Write log file (mRemoteNG.log)"
-        Public Const StartupExit As String = "Startup/Exit"
-        Public Const AllowOnlySingleInstance As String = "Allow only a single instance of the application (mRemoteNG restart required)"
-        Public Const ReconnectAtStartup As String = "Reconnect to previously opened sessions on startup"
-        Public Const CheckForUpdatesOnStartup As String = "Check for updates and announcements"
-        Public Const ConfirmExit As String = "Confirm exit if there are open connections"
-        Public Const SaveConsOnExit As String = "Save connections on exit"
-        Public Const MinimizeToSysTray As String = "Minimize to System Tray"
-        Public Const ShowFullConsFilePath As String = "Show full connections file path in window title"
-        Public Const AlwaysShowSysTrayIcon As String = "Always show System Tray Icon"
-        Public Const ShowDescriptionTooltips As String = "Show description tooltips in connection tree"
-        Public Const TabsAndPanels As String = "Tabs && Panels"
-        Public Const ShowProtocolOnTabs As String = "Show protocols on tab names"
-        Public Const ShowLogonInfoOnTabs As String = "Show logon information on tab names"
-        Public Const OpenNewTabRight As String = "Open new tab to the right of the currently selected tab"
-        Public Const AlwaysShowPanelSelection As String = "Always show panel selection dialog when opening connectins"
-        Public Const DoubleClickTabClosesIt As String = "Double click on tab closes it"
-        Public Const SetHostnameLikeDisplayName As String = "Set hostname like display name when creating new connections"
-        Public Const Experimental As String = "Experimental"
-        Public Const UseSQLServer As String = "Use SQL Server to load && save connections"
-        Public Const SQLInfo As String = "Please see Help - Getting started - SQL Configuration for more Info!"
-        Public Const SQLServer As String = "SQL Server"
-        Public Const AutoSaveMins As String = "Minutes (0 means disabled)"
-        Public Const AutoSaveEvery As String = "Auto Save every:"
-        Public Const TheFollowing As String = "the following"
-        Public Const MyCurrentWindowsCreds As String = "my current credentials (windows logon info)"
-        Public Const NoInformation As String = "no information"
-        Public Const EmptyUsernamePasswordDomainFields As String = "For empty Username, Password or Domain fields use:"
-        Public Const SingleClickOnOpenConnectionSwitchesToIt As String = "Single click on opened connection switches to it"
-        Public Const SingleClickOnConnectionOpensIt As String = "Single click on connection opens it"
-        Public Const SwitchToErrorsAndInfos As String = "Switch to Notifications panel on"
-        Public Const Errors As String = "Errors"
-        Public Const Warnings As String = "Warnings"
-        Public Const Informations As String = "Informations"
-        Public Const UseOnlyErrorsAndInfosPanel As String = "Use only Notifications panel (no messagebox popups)"
-        Public Const Applications As String = "Applications"
-        Public Const ProxyTestSucceeded As String = "Proxy test succeeded!"
-        Public Const ProxyTestFailed As String = "Proxy test failed!"
-
-        Public Const StartIP As String = "Start IP"
-        Public Const EndIP As String = "End IP"
-        Public Const ProtocolToImport As String = "Protocol to import"
-        Public Const OpenPorts As String = "Open Ports"
-        Public Const ClosedPorts As String = "Closed Ports"
-        Public Const StartPort As String = "Start Port"
-        Public Const EndPort As String = "End Port"
-        Public Const QuickConnect As String = "Quick Connect"
-        Public Const UncheckProperties As String = "Uncheck the properties you want not to be saved!"
-        Public Const Export As String = "Export"
-        Public Const SaveAll As String = "Save All"
-        Public Const RemoveAll As String = "Remove All"
-        Public Const Save As String = "Save"
-        Public Const SaveImageFilter As String = "Graphics Interchange Format File (.gif)|*.gif|Joint Photographic Experts Group File (.jpeg)|*.jpeg|Joint Photographic Experts Group File (.jpg)|*.jpg|Portable Network Graphics File (.png)|*.png"
-        Public Const Screenshots As String = "Screenshots"
-        Public Const Activity As String = "Activity"
-        Public Const Type As String = "Type"
-        Public Const Refresh As String = "Refresh"
-        Public Const LogOff As String = "Log off"
-        Public Const LocalFile As String = "Local File"
-        Public Const RemoteFile As String = "Remote File"
-        Public Const User As String = "User"
-        Public Const Host As String = "Host"
-        Public Const Transfer As String = "Transfer"
-        Public Const AddConnection As String = "Add Connection"
-        Public Const AddFolder As String = "Add Folder"
-        Public Const Connect As String = "Connect"
-        Public Const ConnectWithOptions As String = "Connect (with options)"
-        Public Const ConnectToConsoleSession As String = "Connect to console session"
-        Public Const ConnectInFullscreen As String = "Connect in fullscreen"
-        Public Const ChoosePanelBeforeConnecting As String = "Choose panel before connecting"
-        Public Const Tools As String = "Tools"
-        Public Const ImportExport As String = "Import/Export"
-        Public Const ExportmRemoteXML As String = "Export mRemote/mRemoteNG XML"
-        Public Const ImportmRemoteXML As String = "Import mRemote/mRemoteNG XML"
-        Public Const ImportAD As String = "Import from Active Directory"
-        Public Const ImportRDPFiles As String = "Import from .RDP file(s)"
-        Public Const ImportPortScan As String = "Import from Port Scan"
-        Public Const Sort As String = "Sort"
-        Public Const SortAsc As String = "Ascending (A-Z)"
-        Public Const SortDesc As String = "Descending (Z-A)"
-        Public Const Duplicate As String = "Duplicate"
-        Public Const Rename As String = "Rename"
-        Public Const MoveUp As String = "Move up"
-        Public Const MoveDown As String = "Move down"
-        Public Const ExpandAllFolders As String = "Expand all folders"
-        Public Const CollapseAllFolders As String = "Collapse all folders"
-        Public Const NewConnection As String = "New Connection"
-        Public Const NewFolder As String = "New Folder"
-        Public Const CheckForUpdate As String = "Check Again"
-        Public Const DownloadAndInstall As String = "Download and Install"
-        Public Const AvailableVersion As String = "Current version"
-        Public Const CurrentVersion As String = "Installed version"
-        Public Const Version As String = "Version"
-        Public Const UpdateAvailable As String = "mRemoteNG requires an update"
-        Public Const NoUpdateAvailable As String = "mRemoteNG is up to date"
-        Public Const UpdateDownloadComplete As String = "Download complete!" & vbNewLine & "mRemoteNG will now quit and begin with the installation."
-        Public Const SendTo As String = "Send to..."
-        Public Const Screen As String = "Screen"
-
-        Public Const SaveConnectionsFileBeforeOpeningAnother As String = "Do you want to save the current connections file before loading another?"
-        Public Const NewPanel As String = "New Panel"
-        Public Const PanelName As String = "Panel name"
-        Public Const NewTitle As String = "New Title"
-
-        Public Const AlwaysConnectEvenIfAuthFails As String = "Always connect, even if authentication fails"
-        Public Const DontConnectWhenAuthFails As String = "Don't connect if authentication fails"
-        Public Const WarnIfAuthFails As String = "Warn me if authentication fails"
-        Public Const UltraVNCSCListeningPort As String = "UltraVNC SingleClick Listening Port"
-        Public Const ListeningForIncomingVNCConnections As String = "Listening for incoming VNC connections on port"
-
-        Public Const CheckProperInstallationOfComponentsAtStartup As String = "Check proper installation of components at startup"
-        Public Const XULrunnerPath As String = "XULrunner path"
-        Public Const Inherit As String = "Inherit"
-        Public Const ComponentsCheck As String = "Components Check"
-
-        Public Const EncryptCompleteConnectionFile As String = "Completely encrypt connection file"
-
-        Public Const EmptyPasswordContinue As String = "Do you want to continue with no password?"
-
-        'CompCheck
-        Public Const CcAlwaysShowScreen As String = "Always show this screen at startup"
-        Public Const CcCheckAgain As String = "Refresh"
-        Public Const CcNotInstalledProperly As String = "not installed properly"
-        Public Const CcCheckSucceeded As String = "Check succeeded!"
-        Public Const CcCheckFailed As String = "Check failed!"
-        Public Const CcRDPOK As String = "All RDP components were found and seem to be registered properly." & vbNewLine & _
-                                    "Remote Desktop Connection Control Version {0}"
-        Public Const CcRDPFailed As String = "For RDP to work properly you need to have at least Remote Desktop Connection (Terminal Services Client) 6.1 installed. You can get it here: http://support.microsoft.com/kb/951616" & vbNewLine & _
-                                     "If you have RDP 6.1 installed and the check still fails, try to register mstscax.dll manually. To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\windows\system32\mstscax.dll"" (Where c:\ is your system drive)." & vbNewLine & _
-                                     "If you still have trouble getting RDP to work please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
-        Public Const CcVNCOK As String = "All VNC components were found and seem to be registered properly." & vbNewLine & _
-                                    "VncSharpNG Control Version {0}"
-        Public Const CcVNCFailed As String = "VNC requires VncSharpNG.dll to be located in your mRemoteNG application folder." & vbNewLine & _
-                                     "Please make sure that you have the VncSharpNG.dll file in your mRemoteNG application folder (usually C:\Program Files\mRemoteNG\)." & vbNewLine & _
-                                     "If you are still not able to pass this check or use VNC in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
-        Public Const CcPuttyOK As String = "The PuTTY executable was found and should be ready to use."
-        Public Const CcPuttyFailed As String = "The SSH, Telnet, Rlogin and RAW protocols need PuTTY to work. PuTTY comes with every mRemoteNG package and is located in the installation path." & vbNewLine & _
-                                     "Please make sure that either you have the Putty.exe in your mRemoteNG directory (default: c:\Program Files\mRemoteNG\) or that you specified a valid path to your PuTTY executable in the Options (Tools - Options - Advanced - Custom PuTTY path)"
-        Public Const CcICAOK As String = "All ICA components were found and seem to be registered properly." & vbNewLine & _
-                                    "Citrix ICA Client Control Version {0}"
-        Public Const CcICAFailed As String = "ICA requires that the Citrix Presentation Server Client is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/" & vbNewLine & _
-                                     "If you have the Citrix Presentation Server Client installed and the check still fails, try to register wfica.ocx manually." & vbNewLine & _
-                                     "To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\Citrix\ICA Client\wfica.ocx"" (Where c:\Program Files\Citrix\ICA Client\ is the path to your Citrix Presentation Server Client installation)." & vbNewLine & _
-                                     "If you are still not able to pass this check or use ICA in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
-        Public Const CcGeckoOK As String = "XULrunner was found and seems to be installed properly."
-        Public Const CcGeckoFailed As String = "To use the Gecko Rendering Engine you need to have XULrunner 1.8.1.x and the path to the installation set in your Options." & vbNewLine & _
-                                     "You can download XULrunner 1.8.1.3 here: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/" & vbNewLine & _
-                                     "When you are finished downloading extract the package to a path of your choice. Then in mRemoteNG go to Tools - Options - Advanced and enter the correct path in the XULrunner path field." & vbNewLine & _
-                                     "If you are still not able to pass this check or use the Gecko Engine in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
-        Public Const CcEOLOK As String = "EOLWTSCOM was found and seems to be registered properly."
-        Public Const CcEOLFailed As String = "The (RDP) Sessions feature requires that you have a registered copy of eolwtscom.dll on your system." & vbNewLine & _
-                                     "mRemoteNG ships with this component but will not register it automatically unless you run the setup package." & vbNewLine & _
-                                     "To do register it manually do this: Open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\mRemoteNG\eolwtscom.dll"" (Where c:\Program Files\mRemoteNG\ is the path to your mRemoteNG installation)." & vbNewLine & _
-                                     "If you are still not able to pass this check or use the (RDP) Sessions feature in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/"
-
-        Public Const PropertiesWillOnlyBeSavedMRemoteXML As String = "(These properties will only be saved if you select mRemote/mRemoteNG XML as output file format!)"
-    End Class
-End Namespace

mRemoteV1/Language/Resources.en-US.resx

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="metadata">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" />
+							</xsd:sequence>
+							<xsd:attribute name="name" use="required" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+							<xsd:attribute ref="xml:space" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="assembly">
+						<xsd:complexType>
+							<xsd:attribute name="alias" type="xsd:string" />
+							<xsd:attribute name="name" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+							<xsd:attribute ref="xml:space" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>2.0</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="strPropertyDescriptionColors" xml:space="preserve">
+    <value>Select the color quality to be used.</value>
+  </data>
+	<data name="strPropertyNameColors" xml:space="preserve">
+    <value>Colors</value>
+  </data>
+	<data name="strComponentsCheck" xml:space="preserve">
+		<value>Components Check</value>
+	</data>
+	<data name="strCcAlwaysShowScreen" xml:space="preserve">
+		<value>Always show this screen at startup</value>
+	</data>
+	<data name="strCcCheckAgain" xml:space="preserve">
+		<value>Refresh</value>
+	</data>
+	<data name="strConnecting" xml:space="preserve">
+		<value>Connecting...</value>
+	</data>
+</root>

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
 

mRemoteV1/My Project/Application.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:2.0.50727.1433
+'     Dieser Code wurde von einem Tool generiert.
+'     Laufzeitversion:2.0.50727.4927
 '
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
+'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+'     der Code erneut generiert wird.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -14,10 +14,10 @@ Option Explicit On
 
 Namespace My
     
-    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
-    ' or if you encounter build errors in this file, go to the Project Designer
-    ' (go to Project Properties or double-click the My Project node in
-    ' Solution Explorer), and make changes on the Application tab.
+    'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern
+    ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer.
+    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Eigenes Projekt" im
+    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
     '
     Partial Friend Class MyApplication
         
@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.mRemote.frmMain
+            Me.MainForm = Global.mRemoteNG.frmMain
         End Sub
     End Class
 End Namespace

mRemoteV1/My Project/AssemblyInfo.vb

@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("mRemoteNG")> 
-<Assembly: AssemblyCopyright("Copyright © 2007-2010 Felix Deimel, Riley McArdle")> 
+<Assembly: AssemblyCopyright("Copyright © 2007-2009 Felix Deimel, 2010-2011 Riley McArdle")> 
 <Assembly: AssemblyTrademark("")> 
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.63")> 
-<Assembly: AssemblyFileVersion("1.63")> 
+<Assembly: AssemblyVersion("1.66")> 
+<Assembly: AssemblyFileVersion("1.66")> 

mRemoteV1/My Project/Settings.settings

@@ -2,455 +2,473 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
   <Profiles />
   <Settings>
-    <Setting Name="MainFormLocation" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
+    <Setting Name="MainFormLocation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
       <Value Profile="(Default)">999, 999</Value>
     </Setting>
-    <Setting Name="MainFormSize" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Size" Scope="User">
+    <Setting Name="MainFormSize" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Size" Scope="User">
       <Value Profile="(Default)">900, 600</Value>
     </Setting>
-    <Setting Name="MainFormState" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Windows.Forms.FormWindowState" Scope="User">
+    <Setting Name="MainFormState" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Windows.Forms.FormWindowState" Scope="User">
       <Value Profile="(Default)">Normal</Value>
     </Setting>
-    <Setting Name="MainFormKiosk" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="MainFormKiosk" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="DoUpgrade" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="DoUpgrade" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="CustomPuttyPath" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="CustomPuttyPath" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ShowNoMessageBoxes" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ShowNoMessageBoxes" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="SwitchToMCOnInformation" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SwitchToMCOnInformation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="SwitchToMCOnWarning" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SwitchToMCOnWarning" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="SwitchToMCOnError" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SwitchToMCOnError" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="AutomaticallyGetSessionInfo" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="AutomaticallyGetSessionInfo" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="LoadConsFromCustomLocation" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="LoadConsFromCustomLocation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="CustomConsPath" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="CustomConsPath" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="SaveConsOnExit" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SaveConsOnExit" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ConfirmExit" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConfirmExit" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="CheckForUpdatesOnStartup" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="CheckForUpdatesOnStartup" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ShowDescriptionTooltipsInTree" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ShowDescriptionTooltipsInTree" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ShowSystemTrayIcon" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ShowSystemTrayIcon" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="OpenTabsRightOfSelected" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="OpenTabsRightOfSelected" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ShowLogonInfoOnTabs" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ShowLogonInfoOnTabs" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="SingleClickOnConnectionOpensIt" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SingleClickOnConnectionOpensIt" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="EmptyCredentials" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="EmptyCredentials" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">noinfo</Value>
     </Setting>
-    <Setting Name="DefaultUsername" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="DefaultUsername" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="DefaultPassword" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="DefaultPassword" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="DefaultDomain" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="DefaultDomain" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="WriteLogFile" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="WriteLogFile" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="UseCustomPuttyPath" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="UseCustomPuttyPath" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ShowCompleteConsPathInTitle" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ShowCompleteConsPathInTitle" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="FirstStart" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="FirstStart" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ShowProtocolOnTabs" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ShowProtocolOnTabs" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="ResetPanels" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="UpdateUseProxy" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="UpdateUseProxy" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="UpdateProxyAddress" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="UpdateProxyAddress" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="UpdateProxyPort" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+    <Setting Name="UpdateProxyPort" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">80</Value>
     </Setting>
-    <Setting Name="UpdateProxyUseAuthentication" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="UpdateProxyUseAuthentication" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="UpdateProxyAuthUser" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="UpdateProxyAuthUser" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="UpdateProxyAuthPass" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="UpdateProxyAuthPass" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultDescription" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultDescription" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultIcon" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
-      <Value Profile="(Default)">mRemote</Value>
-    </Setting>
-    <Setting Name="ConDefaultPanel" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
-      <Value Profile="(Default)">General</Value>
-    </Setting>
-    <Setting Name="ConDefaultUsername" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultUsername" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultPassword" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultPassword" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultDomain" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultDomain" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultProtocol" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultProtocol" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">RDP</Value>
     </Setting>
-    <Setting Name="ConDefaultPuttySession" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultPuttySession" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">Default Settings</Value>
     </Setting>
-    <Setting Name="ConDefaultUseConsoleSession" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultUseConsoleSession" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultResolution" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultResolution" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">FitToWindow</Value>
     </Setting>
-    <Setting Name="ConDefaultColors" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultColors" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">Colors16Bit</Value>
     </Setting>
-    <Setting Name="ConDefaultCacheBitmaps" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultCacheBitmaps" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ConDefaultDisplayWallpaper" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultDisplayWallpaper" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultDisplayThemes" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultDisplayThemes" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRedirectKeys" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultRedirectKeys" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRedirectDiskDrives" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultRedirectDiskDrives" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRedirectPrinters" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultRedirectPrinters" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRedirectPorts" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultRedirectPorts" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRedirectSmartCards" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultRedirectSmartCards" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRedirectSound" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultRedirectSound" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">DoNotPlay</Value>
     </Setting>
-    <Setting Name="MaxPuttyWaitTime" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+    <Setting Name="MaxPuttyWaitTime" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">2</Value>
     </Setting>
-    <Setting Name="SingleInstance" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SingleInstance" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="OpenConsFromLastSession" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="OpenConsFromLastSession" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="NoReconnect" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="NoReconnect" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="AutoSaveEveryMinutes" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+    <Setting Name="AutoSaveEveryMinutes" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
-    <Setting Name="ExtAppsTBVisible" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ExtAppsTBVisible" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ExtAppsTBShowText" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ExtAppsTBShowText" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ExtAppsTBLocation" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
+    <Setting Name="ExtAppsTBLocation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
       <Value Profile="(Default)">0, 0</Value>
     </Setting>
-    <Setting Name="ExtAppsTBParentDock" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ExtAppsTBParentDock" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">Bottom</Value>
     </Setting>
-    <Setting Name="QuickyTBVisible" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="QuickyTBVisible" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="QuickyTBLocation" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
+    <Setting Name="QuickyTBLocation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
       <Value Profile="(Default)">3, 24</Value>
     </Setting>
-    <Setting Name="QuickyTBParentDock" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="QuickyTBParentDock" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">Top</Value>
     </Setting>
     <Setting Name="ResetToolbars" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="UseSQLServer" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="UseSQLServer" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="SQLHost" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="SQLHost" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="SQLUser" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="SQLUser" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="SQLPass" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="SQLPass" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="InhDefaultCacheBitmaps" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultCacheBitmaps" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultColors" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultColors" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultDescription" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultDescription" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultDisplayThemes" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultDisplayThemes" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultDisplayWallpaper" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultDisplayWallpaper" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultDomain" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultDomain" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultIcon" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultIcon" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultPassword" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultPassword" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultPort" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultPort" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultProtocol" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultProtocol" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultPuttySession" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultPuttySession" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultRedirectDiskDrives" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRedirectDiskDrives" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultRedirectKeys" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRedirectKeys" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultRedirectPorts" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRedirectPorts" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultRedirectPrinters" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRedirectPrinters" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultRedirectSmartCards" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRedirectSmartCards" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultRedirectSound" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRedirectSound" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultResolution" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultResolution" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultUseConsoleSession" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultUseConsoleSession" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultUsername" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultUsername" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultPanel" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultPanel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultICAEncryptionStrength" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultICAEncryptionStrength" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">EncrBasic</Value>
     </Setting>
-    <Setting Name="InhDefaultICAEncryptionStrength" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultICAEncryptionStrength" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultPreExtApp" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultPreExtApp" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultPostExtApp" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultPostExtApp" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="InhDefaultPreExtApp" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultPreExtApp" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultPostExtApp" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultPostExtApp" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="SetHostnameLikeDisplayName" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SetHostnameLikeDisplayName" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="DoubleClickOnTabClosesIt" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="DoubleClickOnTabClosesIt" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ReconnectOnDisconnect" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ReconnectOnDisconnect" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="AlwaysShowPanelSelectionDlg" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="AlwaysShowPanelSelectionDlg" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCAuthMode" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCAuthMode" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">AuthVNC</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCColors" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCColors" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">ColNormal</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCSmartSizeMode" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCSmartSizeMode" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">SmartSAspect</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCViewOnly" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="ConDefaultVNCViewOnly" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCCompression" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCCompression" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">CompNone</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCEncoding" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCEncoding" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">EncHextile</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCProxyIP" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCProxyIP" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultVNCProxyPassword" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCProxyPassword" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultVNCProxyPort" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+    <Setting Name="ConDefaultVNCProxyPort" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">0</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCProxyType" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCProxyType" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">ProxyNone</Value>
     </Setting>
-    <Setting Name="ConDefaultVNCProxyUsername" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultVNCProxyUsername" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="InhDefaultVNCAuthMode" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCAuthMode" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCColors" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCColors" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCSmartSizeMode" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCSmartSizeMode" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCViewOnly" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCViewOnly" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCCompression" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCCompression" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCEncoding" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCEncoding" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCProxyIP" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCProxyIP" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCProxyPassword" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCProxyPassword" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCProxyPort" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCProxyPort" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCProxyType" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCProxyType" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="InhDefaultVNCProxyUsername" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultVNCProxyUsername" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="MinimizeToTray" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="MinimizeToTray" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="SingleClickSwitchesToOpenConnection" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="SingleClickSwitchesToOpenConnection" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRDPAuthenticationLevel" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultRDPAuthenticationLevel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">NoAuth</Value>
     </Setting>
-    <Setting Name="InhDefaultRDPAuthenticationLevel" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRDPAuthenticationLevel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="UVNCSCPort" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+    <Setting Name="UVNCSCPort" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">5500</Value>
     </Setting>
-    <Setting Name="StartupComponentsCheck" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="StartupComponentsCheck" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="XULRunnerPath" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="XULRunnerPath" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ConDefaultRenderingEngine" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultRenderingEngine" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">IE</Value>
     </Setting>
-    <Setting Name="InhDefaultRenderingEngine" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultRenderingEngine" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultMacAddress" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultMacAddress" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="InhDefaultMacAddress" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultMacAddress" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="EncryptCompleteConnectionsFile" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="EncryptCompleteConnectionsFile" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultUserField" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultUserField" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="InhDefaultUserField" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultUserField" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultExtApp" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="ConDefaultExtApp" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="InhDefaultExtApp" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="InhDefaultExtApp" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="LastAnnouncement" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+    <Setting Name="LastAnnouncement" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="CheckForUpdatesAsked" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="CheckForUpdatesAsked" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="CheckForUpdatesFrequencyDays" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+    <Setting Name="CheckForUpdatesFrequencyDays" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">7</Value>
     </Setting>
-    <Setting Name="CheckForUpdatesLastCheck" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.DateTime" Scope="User">
+    <Setting Name="CheckForUpdatesLastCheck" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.DateTime" Scope="User">
       <Value Profile="(Default)">1980-01-01</Value>
     </Setting>
-    <Setting Name="UpdatePending" Provider="mRemote.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+    <Setting Name="UpdatePending" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
-    <Setting Name="ConDefaultRDGatewayUsageMethod" Type="System.String" Scope="Application">
+    <Setting Name="ConDefaultRDGatewayUsageMethod" Type="System.String" Scope="User">
       <Value Profile="(Default)">Never</Value>
     </Setting>
-    <Setting Name="ConDefaultRDGatewayUseConnectionCredentials" Type="System.String" Scope="Application">
+    <Setting Name="ConDefaultRDGatewayUseConnectionCredentials" Type="System.String" Scope="User">
       <Value Profile="(Default)">Yes</Value>
     </Setting>
+    <Setting Name="ConDefaultIcon" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)">mRemoteNG</Value>
+    </Setting>
+    <Setting Name="InhDefaultRDGatewayUsageMethod" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultRDGatewayHostname" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultRDGatewayUsername" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultRDGatewayPassword" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultRDGatewayDomain" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultRDGatewayUseConnectionCredentials" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="RdpReconnectionCount" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">5</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

mRemoteV1/Notes/Help.txt

@@ -33,7 +33,7 @@ Binary and source code packages are available for download.
 [[Getting Started]]
 [Prerequisites]
 WinXP; Vista -> x86
-not tested on x64!
+Win7 -> x86,x64
 Terminal Services Client 6.0
 Citrix Client for ICA (Registered wfica.ocx)
 

mRemoteV1/Notes/Misc.txt

@@ -4,26 +4,17 @@ How to build the portable package:
 	  to Inherits PortableSettingsProvider
 	In App.Info.Settings:
 	  change SettingsPath
-	  from GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.CompanyName.Replace(" ", "_") & "\" & My.Application.Info.ProductName
+	  from GetFolderPath(SpecialFolder.ApplicationData) & "\" & My.Application.Info.CompanyName.Replace(" ", "_") & "\" & My.Application.Info.ProductName
 	  to My.Application.Info.DirectoryPath
 
-How to build the different language packages:
-	In Language.Base:
-		change Inherits Language.XX to the language of your choice
-		change the CurrentLanguage var to the same language
-
-
 How to add a new language:
-	In Language.Base:
-		Add the language code to the Languages Enum
-	Create a new Language.XX class in the Language namespace
-		Copy all Constants from one of the existing language classes and replace the strings
+	Create a new Language.XX.resx file in the My Project folder
 
 Localize PropertyGrid:
 	http://www.morganskinner.com/Articles/LocalizedPropertyGrid/
 
 ToDo:
-	Attribute for roamin settings: "Global.System.Configuration.SettingsManageabilityAttribute(Configuration.SettingsManageability.Roaming), _"
+	Attribute for roaming settings: "Global.System.Configuration.SettingsManageabilityAttribute(Configuration.SettingsManageability.Roaming), _"
 
 PuTTY Problem:
 	http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=96485

mRemoteV1/Notes/MultiLang.txt

@@ -1 +1 @@
-alle UI.Window.* -> ApplyLanguage
+all UI.Window.* -> ApplyLanguage

mRemoteV1/Root/Root.Info.vb

@@ -1,6 +1,6 @@
 Imports System.Windows.Forms
 Imports System.ComponentModel
-Imports mRemote.Tools.Misc.PropertyGridCategory
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Root
     <DefaultProperty("Name")> _
@@ -10,16 +10,16 @@ Namespace Root
         End Sub
 
 #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()> _
+        Private _Name As String = My.Resources.strConnections
+        <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,15 +30,15 @@ Namespace Root
         End Property
 
         Private _Password As Boolean
-        <Category(Category1 & "Display"), _
+        <LocalizedCategory("strCategoryDisplay", 1), _
            Browsable(True), _
            [ReadOnly](False), _
            Bindable(False), _
            DefaultValue(""), _
            DesignOnly(False), _
-           DisplayName(Language.Base.PasswordProtect), _
+           LocalizedDisplayName("strPasswordProtect"), _
            Attributes.Root(), _
-           TypeConverter(GetType(mRemote.Tools.Misc.YesNoTypeConverter))> _
+           TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
         Public Property Password() As Boolean
             Get
                 Return _Password

mRemoteV1/Security/Security.Crypt.vb

@@ -1,7 +1,7 @@
 Imports System.IO
 Imports System.Security.Cryptography
 Imports System.Text
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Security
     Public Class Crypt

mRemoteV1/Security/Security.Impersonator.vb

@@ -1,7 +1,7 @@
 Imports System.Runtime.InteropServices
 Imports System.Security.Principal
 Imports System.Security.Permissions
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 <Assembly: SecurityPermissionAttribute(SecurityAction.RequestMinimum, UnmanagedCode:=True), _
 Assembly: PermissionSetAttribute(SecurityAction.RequestMinimum, Name:="FullTrust")> 

mRemoteV1/Tools/ReconnectGroup.Designer.vb

@@ -89,7 +89,7 @@ Partial Class ReconnectGroup
         '
         'pbServerStatus
         '
-        Me.pbServerStatus.Image = Global.mRemote.My.Resources.Resources.HostStatus_Check
+        Me.pbServerStatus.Image = Global.mRemoteNG.My.Resources.Resources.HostStatus_Check
         Me.pbServerStatus.Location = New System.Drawing.Point(99, 23)
         Me.pbServerStatus.Name = "pbServerStatus"
         Me.pbServerStatus.Size = New System.Drawing.Size(16, 16)

mRemoteV1/Tools/ReconnectGroup.vb

@@ -84,9 +84,9 @@
     End Sub
 
     Private Sub ApplyLanguage()
-        grpAutomaticReconnect.Text = Language.Base.AutomaticReconnect
-        btnClose.Text = Language.Base.Button_Close
-        lblServerStatus.Text = Language.Base.ServerStatus
-        chkReconnectWhenReady.Text = Language.Base.ReconnectWhenReady
+        grpAutomaticReconnect.Text = My.Resources.strGroupboxAutomaticReconnect
+        btnClose.Text = My.Resources.strButtonClose
+        lblServerStatus.Text = My.Resources.strLabelServerStatus
+        chkReconnectWhenReady.Text = My.Resources.strCheckboxReconnectWhenReady
     End Sub
 End Class

mRemoteV1/Tools/Tools.Controls.vb

@@ -1,5 +1,5 @@
 Imports System.Windows.Forms
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace Tools
     Public Class Controls
@@ -63,13 +63,13 @@ 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
 
                     Me._cMenExit = New ToolStripMenuItem
-                    Me._cMenExit.Text = Language.Base.Menu_Exit
+                    Me._cMenExit.Text = My.Resources.strMenuExit
                     AddHandler Me._cMenExit.Click, AddressOf cMenExit_Click
 
                     Me._cMen = New ContextMenuStrip
@@ -164,7 +164,7 @@ Namespace Tools
 
             Private Sub ConMenItem_MouseDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs)
                 If e.Button = MouseButtons.Left Then
-                    If TypeOf sender.Tag Is mRemote.Connection.Info Then
+                    If TypeOf sender.Tag Is mRemoteNG.Connection.Info Then
                         If frmMain.Visible = False Then
                             ShowForm()
                         End If
@@ -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
 

mRemoteV1/Tools/Tools.ExternalApp.vb

@@ -1,4 +1,4 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.IO
 Imports System.ComponentModel
 
@@ -103,16 +103,16 @@ Namespace Tools
             _Arguments = Arguments
         End Sub
 
-
+        ' Start external app
         Public Function Start(Optional ByVal ConnectionInfo As Connection.Info = Nothing) As Process
             Try
-                If _TryIntegrate = True Then
-                    StartIntApp(ConnectionInfo)
+                If _FileName = "" Then
+                    Throw New Exception("No Filename specified!")
                     Return Nothing
                 End If
 
-                If _FileName = "" Then
-                    Throw New Exception("No Filename specified!")
+                If _TryIntegrate = True Then
+                    StartIntApp(ConnectionInfo)
                     Return Nothing
                 End If
 
@@ -139,20 +139,28 @@ Namespace Tools
             End Try
         End Function
 
+        ' Start external app integrated
         Public Sub StartIntApp(Optional ByVal ConnectionInfo As Connection.Info = Nothing)
             Try
-                If _FileName = "" Then
-                    Throw New Exception("No Filename specified!")
-                    Exit Sub
-                End If
-
                 _ConnectionInfo = ConnectionInfo
 
                 Dim nCI As New Connection.Info
+
                 nCI.Protocol = Connection.Protocol.Protocols.IntApp
                 nCI.ExtApp = Me.DisplayName
                 nCI.Name = Me.DisplayName
                 nCI.Panel = "Int. Apps"
+                nCI.Hostname = _ConnectionInfo.Hostname
+                nCI.Port = _ConnectionInfo.Port
+                nCI.Username = _ConnectionInfo.Username
+                nCI.Password = _ConnectionInfo.Password
+                nCI.Domain = _ConnectionInfo.Domain
+                nCI.Description = _ConnectionInfo.Description
+                nCI.MacAddress = _ConnectionInfo.MacAddress
+                nCI.UserField = _ConnectionInfo.UserField
+                nCI.Description = _ConnectionInfo.Description
+                nCI.PreExtApp = _ConnectionInfo.PreExtApp
+                nCI.PostExtApp = _ConnectionInfo.PostExtApp
 
                 OpenConnection(nCI)
             Catch ex As Exception

mRemoteV1/Tools/Tools.LocalizedAttributes.vb

@@ -0,0 +1,130 @@
+Imports System.ComponentModel
+
+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 value As String)
+                MyBase.New(value)
+                Me.Localized = False
+            End Sub
+
+            Public Overrides ReadOnly Property DisplayName() As String
+                Get
+                    If Not Me.Localized Then
+                        Me.Localized = True
+                        Me.DisplayNameValue = My.Resources.ResourceManager.GetString(Me.DisplayNameValue)
+                    End If
+
+                    Return MyBase.DisplayName
+                End Get
+            End Property
+        End Class
+
+        <AttributeUsage(AttributeTargets.All, AllowMultiple:=False, Inherited:=True)> _
+        Public Class LocalizedDescriptionAttribute
+            Inherits DescriptionAttribute
+
+            Private Localized As Boolean
+
+            Public Sub New(ByVal value As String)
+                MyBase.New(value)
+                Me.Localized = False
+            End Sub
+
+            Public Overrides ReadOnly Property Description() As String
+                Get
+                    If Not Me.Localized Then
+                        Me.Localized = True
+                        Me.DescriptionValue = My.Resources.ResourceManager.GetString(Me.DescriptionValue)
+                    End If
+
+                    Return MyBase.Description
+                End Get
+            End Property
+        End Class
+
+#Region "Special localization - with String.Format"
+
+        <AttributeUsage(AttributeTargets.All, AllowMultiple:=False, Inherited:=True)> _
+        Public Class LocalizedDisplayNameInheritAttribute
+            Inherits DisplayNameAttribute
+
+            Private Localized As Boolean
+
+            Public Sub New(ByVal value As String)
+                MyBase.New(value)
+
+                Me.Localized = False
+            End Sub
+
+            Public Overrides ReadOnly Property DisplayName() As String
+                Get
+                    If Not Me.Localized Then
+                        Me.Localized = True
+                        Me.DisplayNameValue = String.Format(My.Resources.strFormatInherit, My.Resources.ResourceManager.GetString(Me.DisplayNameValue))
+                    End If
+
+                    Return MyBase.DisplayName
+                End Get
+            End Property
+        End Class
+
+        <AttributeUsage(AttributeTargets.All, AllowMultiple:=False, Inherited:=True)> _
+        Public Class LocalizedDescriptionInheritAttribute
+            Inherits DescriptionAttribute
+
+            Private Localized As Boolean
+
+            Public Sub New(ByVal value As String)
+                MyBase.New(value)
+
+                Me.Localized = False
+            End Sub
+
+            Public Overrides ReadOnly Property Description() As String
+                Get
+                    If Not Me.Localized Then
+                        Me.Localized = True
+                        Me.DescriptionValue = String.Format(My.Resources.strFormatInheritDescription, My.Resources.ResourceManager.GetString(Me.DescriptionValue))
+                    End If
+
+                    Return MyBase.Description
+                End Get
+            End Property
+        End Class
+#End Region
+
+    End Class
+
+End Namespace

mRemoteV1/Tools/Tools.Misc.vb

@@ -1,10 +1,9 @@
 Imports System.Reflection
 Imports System.ComponentModel
-Imports System.Drawing.Design
 Imports System.Runtime.InteropServices
 Imports System.Collections.Specialized
 Imports System.Text.RegularExpressions
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.IO
 Imports System.Data.SqlClient
 
@@ -200,26 +199,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
@@ -282,11 +261,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 +277,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)

mRemoteV1/Tools/Tools.PortScan.vb

@@ -1,5 +1,5 @@
 Imports System.Threading
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Net.NetworkInformation
 
 Namespace Tools
@@ -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
 

mRemoteV1/Tree/Tree.Node.vb

@@ -1,5 +1,5 @@
 Imports System.Windows.Forms
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.DirectoryServices
 
 Namespace Tree
@@ -46,9 +46,9 @@ Namespace Tree
         Public Shared Function GetConstantID(ByVal node As TreeNode) As String
             Select Case GetNodeType(node)
                 Case Type.Connection
-                    Return TryCast(node.Tag, mRemote.Connection.Info).ConstantID
+                    Return TryCast(node.Tag, mRemoteNG.Connection.Info).ConstantID
                 Case Type.Container
-                    Return TryCast(node.Tag, mRemote.Container.Info).ConnectionInfo.ConstantID
+                    Return TryCast(node.Tag, mRemoteNG.Container.Info).ConnectionInfo.ConstantID
             End Select
 
             Return Nothing
@@ -181,33 +181,28 @@ Namespace Tree
 
         Public Shared Function AddNode(ByVal NodeType As Tree.Node.Type, Optional ByVal Text As String = "") As TreeNode
             Try
-                If SelectedNode IsNot Nothing Then
-                    If Tree.Node.GetNodeType(SelectedNode) = Type.Container Or Tree.Node.GetNodeType(SelectedNode) = Type.Root Then
-                        Dim nNode As New TreeNode
-                        nNode.Text = Language.Base.New_ & " "
+                Dim nNode As New TreeNode
 
-                        Select Case NodeType
-                            Case Type.Connection
-                                nNode.Text &= Language.Base.Connection
-                                nNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
-                                nNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
-                            Case Type.Container
-                                nNode.Text &= Language.Base.Folder
-                                nNode.ImageIndex = Images.Enums.TreeImage.Container
-                                nNode.SelectedImageIndex = Images.Enums.TreeImage.Container
-                            Case Type.Root
-                                nNode.Text &= Language.Base.Root
-                                nNode.ImageIndex = Images.Enums.TreeImage.Root
-                                nNode.SelectedImageIndex = Images.Enums.TreeImage.Root
-                        End Select
+                Select Case NodeType
+                    Case Type.Connection
+                        nNode.Text = My.Resources.strNewConnection
+                        nNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                        nNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                    Case Type.Container
+                        nNode.Text = My.Resources.strNewFolder
+                        nNode.ImageIndex = Images.Enums.TreeImage.Container
+                        nNode.SelectedImageIndex = Images.Enums.TreeImage.Container
+                    Case Type.Root
+                        nNode.Text = My.Resources.strNewRoot
+                        nNode.ImageIndex = Images.Enums.TreeImage.Root
+                        nNode.SelectedImageIndex = Images.Enums.TreeImage.Root
+                End Select
 
-                        If Text <> "" Then
-                            nNode.Text = Text
-                        End If
-
-                        Return nNode
-                    End If
+                If Text <> "" Then
+                    nNode.Text = Text
                 End If
+
+                Return nNode
             Catch ex As Exception
                 mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNode failed" & vbNewLine & ex.Message, True)
             End Try
@@ -219,9 +214,9 @@ Namespace Tree
             Try
                 Dim adCNode As TreeNode = Tree.Node.AddNode(Type.Container)
 
-                Dim nContI As New mRemote.Container.Info()
+                Dim nContI As New mRemoteNG.Container.Info()
                 nContI.TreeNode = adCNode
-                nContI.ConnectionInfo = New mRemote.Connection.Info(nContI)
+                nContI.ConnectionInfo = New mRemoteNG.Connection.Info(nContI)
 
                 If Tree.Node.SelectedNode IsNot Nothing Then
                     If Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.Container Then
@@ -279,10 +274,10 @@ Namespace Tree
 
                     Dim adNode As TreeNode = Tree.Node.AddNode(Type.Connection, strDisplayName)
 
-                    Dim nConI As New mRemote.Connection.Info()
-                    Dim nInh As New mRemote.Connection.Info.Inheritance(nConI, True)
+                    Dim nConI As New mRemoteNG.Connection.Info()
+                    Dim nInh As New mRemoteNG.Connection.Info.Inheritance(nConI, True)
                     nInh.Description = False
-                    If TypeOf rNode.Tag Is mRemote.Container.Info Then
+                    If TypeOf rNode.Tag Is mRemoteNG.Container.Info Then
                         nConI.Parent = rNode.Tag
                     End If
                     nConI.Inherit = nInh
@@ -348,7 +343,7 @@ Namespace Tree
                 End If
             Catch ex As Exception
                 mC.AddMessage(Messages.MessageClass.WarningMsg, "CloneNode failed (Tree.Node)" & vbNewLine & ex.Message)
-            End Try         
+            End Try
         End Sub
 
         Public Shared Sub SetNodeImage(ByVal treeNode As TreeNode, ByVal Img As Images.Enums.TreeImage)
@@ -381,7 +376,7 @@ Namespace Tree
                     Else
                         'Get this node's object data.
                         If GetNodeType(old_node) = Type.Connection Then
-                            tTip.SetToolTip(_TreeView, TryCast(old_node.Tag, mRemote.Connection.Info).Description)
+                            tTip.SetToolTip(_TreeView, TryCast(old_node.Tag, mRemoteNG.Connection.Info).Description)
                         End If
                     End If
                 End If
@@ -393,23 +388,31 @@ Namespace Tree
 
         Public Shared Sub DeleteSelectedNode()
             Try
-                If SelectedNode IsNot Nothing Then
-                    If MsgBox(Language.Base.SureToDeleteItem, MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.Yes Then
-                        If Tree.Node.GetNodeType(SelectedNode) <> Type.Root Then 'root cannot be removed
-                            If Tree.Node.IsEmpty(SelectedNode) = False Then 'remove single node
-                                SelectedNode.Remove()
-                            Else 'remove parent and sub nodes
-                                For Each tNode As TreeNode In SelectedNode.Nodes
-                                    tNode.Remove()
-                                Next
+                If SelectedNode Is Nothing Then Return
 
+                Select Case Tree.Node.GetNodeType(SelectedNode)
+                    Case Type.Root
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, "The root item cannot be deleted!")
+                    Case Type.Container
+                        If Tree.Node.IsEmpty(SelectedNode) = False Then
+                            If MsgBox(String.Format(My.Resources.strConfirmDeleteNodeFolder, SelectedNode.Text), MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.Yes Then
                                 SelectedNode.Remove()
                             End If
                         Else
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "The Root Item cannot be deleted!")
+                            If MsgBox(String.Format(My.Resources.strConfirmDeleteNodeFolderNotEmpty, SelectedNode.Text), MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.Yes Then
+                                For Each tNode As TreeNode In SelectedNode.Nodes
+                                    tNode.Remove()
+                                Next
+                                SelectedNode.Remove()
+                            End If
                         End If
-                    End If
-                End If
+                    Case Type.Connection
+                        If MsgBox(String.Format(My.Resources.strConfirmDeleteNodeConnection, SelectedNode.Text), MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.Yes Then
+                            SelectedNode.Remove()
+                        End If
+                    Case Else
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, "Tree item type is unknown so it cannot be deleted!")
+                End Select
             Catch ex As Exception
                 mC.AddMessage(Messages.MessageClass.ErrorMsg, "Deleting selected node failed" & vbNewLine & ex.Message, True)
             End Try
@@ -496,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
 

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 = Language.Base.Button_OK
+                Me.btnOK.Text = Global.mRemoteNG.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 = Language.Base.Button_Cancel
+                Me.btnCancel.Text = Global.mRemoteNG.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.mRemoteNG.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,13 +94,13 @@ 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.Icon = Global.mRemote.My.Resources.Resources.ActiveDirectory_Icon
+                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.mRemoteNG.My.Resources.Resources.ActiveDirectory_Icon
                 Me.Name = "ADImport"
                 Me.TabText = "Active Directory Import"
                 Me.Text = "Active Directory Import"
@@ -133,11 +124,10 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                btnOK.Text = Language.Base.Button_OK
-                btnCancel.Text = Language.Base.Button_Cancel
-                lblDomain.Text = Language.Base.Props_Domain & ":"
-                btnChangeDomain.Text = Language.Base.Change
-                Label2.Text = Language.Base.Change
+                btnOK.Text = My.Resources.strButtonOK
+                btnCancel.Text = My.Resources.strButtonCancel
+                lblDomain.Text = My.Resources.strLabelDomain
+                btnChangeDomain.Text = My.Resources.strButtonChange
             End Sub
 #End Region
 
@@ -155,7 +145,7 @@ Namespace UI
 
             Private Sub btnOK_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOK.Click
                 Me._ADPath = Me.AD.ADPath
-                mRemote.Tree.Node.AddADNodes(Me._ADPath)
+                mRemoteNG.Tree.Node.AddADNodes(Me._ADPath)
                 Me.DialogResult = Windows.Forms.DialogResult.OK
                 Me.Close()
             End Sub

mRemoteV1/UI/UI.Window.About.vb

@@ -1,6 +1,6 @@
 Imports WeifenLuo.WinFormsUI.Docking
 Imports System.IO
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -19,6 +19,7 @@ Namespace UI
             Friend WithEvents lblEdition As System.Windows.Forms.Label
             Friend WithEvents llblFAMFAMFAM As System.Windows.Forms.LinkLabel
             Friend WithEvents llblMagicLibrary As System.Windows.Forms.LinkLabel
+            Friend WithEvents llblWeifenLuo As System.Windows.Forms.LinkLabel
             Friend WithEvents pnlTop As System.Windows.Forms.Panel
 
             Private Sub InitializeComponent()
@@ -26,6 +27,7 @@ Namespace UI
                 Me.lblEdition = New System.Windows.Forms.Label
                 Me.pbLogo = New System.Windows.Forms.PictureBox
                 Me.pnlBottom = New System.Windows.Forms.Panel
+                Me.llblWeifenLuo = New System.Windows.Forms.LinkLabel
                 Me.llblMagicLibrary = New System.Windows.Forms.LinkLabel
                 Me.llblFAMFAMFAM = New System.Windows.Forms.LinkLabel
                 Me.txtChangeLog = New System.Windows.Forms.TextBox
@@ -68,7 +70,7 @@ Namespace UI
                 '
                 'pbLogo
                 '
-                Me.pbLogo.Image = Global.mRemote.My.Resources.Resources.Logo
+                Me.pbLogo.Image = Global.mRemoteNG.My.Resources.Resources.Logo
                 Me.pbLogo.Location = New System.Drawing.Point(8, 8)
                 Me.pbLogo.Name = "pbLogo"
                 Me.pbLogo.Size = New System.Drawing.Size(492, 128)
@@ -82,6 +84,7 @@ Namespace UI
                             Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.pnlBottom.BackColor = System.Drawing.SystemColors.Control
+                Me.pnlBottom.Controls.Add(Me.llblWeifenLuo)
                 Me.pnlBottom.Controls.Add(Me.llblMagicLibrary)
                 Me.pnlBottom.Controls.Add(Me.llblFAMFAMFAM)
                 Me.pnlBottom.Controls.Add(Me.txtChangeLog)
@@ -96,6 +99,20 @@ Namespace UI
                 Me.pnlBottom.Size = New System.Drawing.Size(788, 418)
                 Me.pnlBottom.TabIndex = 1
                 '
+                'llblWeifenLuo
+                '
+                Me.llblWeifenLuo.AutoSize = True
+                Me.llblWeifenLuo.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+                Me.llblWeifenLuo.ForeColor = System.Drawing.SystemColors.ControlText
+                Me.llblWeifenLuo.LinkColor = System.Drawing.Color.Blue
+                Me.llblWeifenLuo.Location = New System.Drawing.Point(16, 158)
+                Me.llblWeifenLuo.Name = "llblWeifenLuo"
+                Me.llblWeifenLuo.Size = New System.Drawing.Size(78, 22)
+                Me.llblWeifenLuo.TabIndex = 9
+                Me.llblWeifenLuo.TabStop = True
+                Me.llblWeifenLuo.Text = "WeifenLuo"
+                Me.llblWeifenLuo.UseCompatibleTextRendering = True
+                '
                 'llblMagicLibrary
                 '
                 Me.llblMagicLibrary.AutoSize = True
@@ -134,12 +151,12 @@ Namespace UI
                 Me.txtChangeLog.Cursor = System.Windows.Forms.Cursors.Default
                 Me.txtChangeLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.txtChangeLog.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.txtChangeLog.Location = New System.Drawing.Point(24, 200)
+                Me.txtChangeLog.Location = New System.Drawing.Point(24, 224)
                 Me.txtChangeLog.Multiline = True
                 Me.txtChangeLog.Name = "txtChangeLog"
                 Me.txtChangeLog.ReadOnly = True
                 Me.txtChangeLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
-                Me.txtChangeLog.Size = New System.Drawing.Size(760, 216)
+                Me.txtChangeLog.Size = New System.Drawing.Size(760, 192)
                 Me.txtChangeLog.TabIndex = 7
                 Me.txtChangeLog.TabStop = False
                 '
@@ -172,7 +189,7 @@ Namespace UI
                 Me.lblChangeLog.AutoSize = True
                 Me.lblChangeLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.lblChangeLog.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.lblChangeLog.Location = New System.Drawing.Point(16, 176)
+                Me.lblChangeLog.Location = New System.Drawing.Point(16, 199)
                 Me.lblChangeLog.Name = "lblChangeLog"
                 Me.lblChangeLog.Size = New System.Drawing.Size(92, 22)
                 Me.lblChangeLog.TabIndex = 6
@@ -211,7 +228,7 @@ Namespace UI
                 Me.Controls.Add(Me.pnlBottom)
                 Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.ForeColor = System.Drawing.SystemColors.ControlText
-                Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon
                 Me.MaximumSize = New System.Drawing.Size(20000, 10000)
                 Me.Name = "About"
                 Me.TabText = "About"
@@ -237,15 +254,15 @@ Namespace UI
 
 #Region "Private Methods"
             Private Sub ApplyLanguage()
-                lblLicense.Text = My.Resources.strReleasedUnderGPL
-                lblChangeLog.Text = My.Resources.strChangeLogLabel
+                lblLicense.Text = My.Resources.strLabelReleasedUnderGPL
+                lblChangeLog.Text = My.Resources.strLabelChangeLog
                 TabText = My.Resources.strAbout
                 Text = My.Resources.strAbout
             End Sub
 
             Private Sub ApplyEditions()
 #If PORTABLE Then
-                lblEdition.Text = My.Resources.strPortableEdition
+                lblEdition.Text = My.Resources.strLabelPortableEdition
                 lblEdition.Visible = True
 #Else
                 If App.Editions.Spanlink.Enabled Then
@@ -285,6 +302,7 @@ Namespace UI
 
                     FillLinkLabel(llblFAMFAMFAM, My.Resources.strFAMFAMFAMAttribution, My.Resources.strFAMFAMFAMAttributionURL)
                     FillLinkLabel(llblMagicLibrary, My.Resources.strMagicLibraryAttribution, My.Resources.strMagicLibraryAttributionURL)
+                    FillLinkLabel(llblWeifenLuo, My.Resources.strWeifenLuoAttribution, My.Resources.strWeifenLuoAttributionURL)
 
                     If File.Exists(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT") Then
                         Dim sR As New StreamReader(My.Application.Info.DirectoryPath & "\CHANGELOG.TXT")
@@ -303,6 +321,10 @@ Namespace UI
             Private Sub llblMagicLibrary_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblMagicLibrary.LinkClicked
                 App.Runtime.GoToURL(My.Resources.strMagicLibraryAttributionURL)
             End Sub
+
+            Private Sub llblWeifenLuo_LinkClicked(ByVal sender As System.Object, ByVal e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles llblWeifenLuo.LinkClicked
+                App.Runtime.GoToURL(My.Resources.strWeifenLuoAttributionURL)
+            End Sub
 #End Region
         End Class
     End Namespace

mRemoteV1/UI/UI.Window.Announcment.vb

@@ -1,5 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Threading
 
 Namespace UI

mRemoteV1/UI/UI.Window.Base.vb

@@ -1,4 +1,3 @@
-Imports System.Windows.Forms
 Imports WeifenLuo.WinFormsUI.Docking
 
 Namespace UI

mRemoteV1/UI/UI.Window.ComponentsCheck.vb

@@ -1,6 +1,6 @@
 Imports WeifenLuo.WinFormsUI.Docking
 Imports System.IO
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Threading
 
 Namespace UI
@@ -415,7 +415,7 @@ Namespace UI
                 Me.Controls.Add(Me.pnlChecks)
                 Me.Controls.Add(Me.chkAlwaysShow)
                 Me.Controls.Add(Me.btnCheckAgain)
-                Me.Icon = Global.mRemote.My.Resources.Resources.ComponentsCheck_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.ComponentsCheck_Icon
                 Me.Name = "ComponentsCheck"
                 Me.TabText = "Components Check"
                 Me.Text = "Components Check"
@@ -461,10 +461,10 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                TabText = Language.Base.ComponentsCheck
-                Text = Language.Base.ComponentsCheck
-                chkAlwaysShow.Text = Language.Base.CcAlwaysShowScreen
-                btnCheckAgain.Text = Language.Base.CcCheckAgain
+                TabText = My.Resources.strComponentsCheck
+                Text = My.Resources.strComponentsCheck
+                chkAlwaysShow.Text = My.Resources.strCcAlwaysShowScreen
+                btnCheckAgain.Text = My.Resources.strCcCheckAgain
             End Sub
 
             Private Sub btnCheckAgain_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnCheckAgain.Click
@@ -479,7 +479,7 @@ Namespace UI
 
 #Region "Private Methods"
             Private Sub CheckComponents()
-                Dim errorMsg As String = Language.Base.CcNotInstalledProperly
+                Dim errorMsg As String = My.Resources.strCcNotInstalledProperly
 
                 pnlCheck1.Visible = True
                 pnlCheck2.Visible = True
@@ -502,13 +502,13 @@ Namespace UI
 
                     pbCheck1.Image = My.Resources.Good_Symbol
                     lblCheck1.ForeColor = Color.DarkOliveGreen
-                    lblCheck1.Text = "RDP (Remote Desktop) " & Language.Base.CcCheckSucceeded
-                    txtCheck1.Text = String.Format(Language.Base.CcRDPOK, RDP.Version)
+                    lblCheck1.Text = "RDP (Remote Desktop) " & My.Resources.strCcCheckSucceeded
+                    txtCheck1.Text = String.Format(My.Resources.strCcRDPOK, RDP.Version)
                 Catch ex As Exception
                     pbCheck1.Image = My.Resources.Bad_Symbol
                     lblCheck1.ForeColor = Color.Firebrick
-                    lblCheck1.Text = "RDP (Remote Desktop) " & Language.Base.CcCheckFailed
-                    txtCheck1.Text = Language.Base.CcRDPFailed
+                    lblCheck1.Text = "RDP (Remote Desktop) " & My.Resources.strCcCheckFailed
+                    txtCheck1.Text = My.Resources.strCcRDPFailed
 
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP " & errorMsg, True)
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
@@ -530,13 +530,13 @@ Namespace UI
 
                     pbCheck2.Image = My.Resources.Good_Symbol
                     lblCheck2.ForeColor = Color.DarkOliveGreen
-                    lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckSucceeded
-                    txtCheck2.Text = String.Format(Language.Base.CcVNCOK, VNC.ProductVersion)
+                    lblCheck2.Text = "VNC (Virtual Network Computing) " & My.Resources.strCcCheckSucceeded
+                    txtCheck2.Text = String.Format(My.Resources.strCcVNCOK, VNC.ProductVersion)
                 Catch ex As Exception
                     pbCheck2.Image = My.Resources.Bad_Symbol
                     lblCheck2.ForeColor = Color.Firebrick
-                    lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckFailed
-                    txtCheck2.Text = Language.Base.CcVNCFailed
+                    lblCheck2.Text = "VNC (Virtual Network Computing) " & My.Resources.strCcCheckFailed
+                    txtCheck2.Text = My.Resources.strCcVNCFailed
 
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True)
                     'mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
@@ -555,13 +555,13 @@ Namespace UI
                 If File.Exists(pPath) Then
                     pbCheck3.Image = My.Resources.Good_Symbol
                     lblCheck3.ForeColor = Color.DarkOliveGreen
-                    lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " & Language.Base.CcCheckSucceeded
-                    txtCheck3.Text = Language.Base.CcPuttyOK
+                    lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " & My.Resources.strCcCheckSucceeded
+                    txtCheck3.Text = My.Resources.strCcPuttyOK
                 Else
                     pbCheck3.Image = My.Resources.Bad_Symbol
                     lblCheck3.ForeColor = Color.Firebrick
-                    lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " & Language.Base.CcCheckFailed
-                    txtCheck3.Text = Language.Base.CcPuttyFailed
+                    lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " & My.Resources.strCcCheckFailed
+                    txtCheck3.Text = My.Resources.strCcPuttyFailed
 
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "PuTTY " & errorMsg, True)
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "File " & pPath & " does not exist.", True)
@@ -582,13 +582,13 @@ Namespace UI
 
                     pbCheck4.Image = My.Resources.Good_Symbol
                     lblCheck4.ForeColor = Color.DarkOliveGreen
-                    lblCheck4.Text = "ICA (Citrix ICA) " & Language.Base.CcCheckSucceeded
-                    txtCheck4.Text = String.Format(Language.Base.CcICAOK, ICA.Version)
+                    lblCheck4.Text = "ICA (Citrix ICA) " & My.Resources.strCcCheckSucceeded
+                    txtCheck4.Text = String.Format(My.Resources.strCcICAOK, ICA.Version)
                 Catch ex As Exception
                     pbCheck4.Image = My.Resources.Bad_Symbol
                     lblCheck4.ForeColor = Color.Firebrick
-                    lblCheck4.Text = "ICA (Citrix ICA) " & Language.Base.CcCheckFailed
-                    txtCheck4.Text = Language.Base.CcICAFailed
+                    lblCheck4.Text = "ICA (Citrix ICA) " & My.Resources.strCcCheckFailed
+                    txtCheck4.Text = My.Resources.strCcICAFailed
 
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "ICA " & errorMsg, True)
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
@@ -614,13 +614,13 @@ Namespace UI
                 If GeckoBad = False Then
                     pbCheck5.Image = My.Resources.Good_Symbol
                     lblCheck5.ForeColor = Color.DarkOliveGreen
-                    lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " & Language.Base.CcCheckSucceeded
-                    txtCheck5.Text = Language.Base.CcGeckoOK
+                    lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " & My.Resources.strCcCheckSucceeded
+                    txtCheck5.Text = My.Resources.strCcGeckoOK
                 Else
                     pbCheck5.Image = My.Resources.Bad_Symbol
                     lblCheck5.ForeColor = Color.Firebrick
-                    lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " & Language.Base.CcCheckFailed
-                    txtCheck5.Text = Language.Base.CcGeckoFailed
+                    lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " & My.Resources.strCcCheckFailed
+                    txtCheck5.Text = My.Resources.strCcGeckoFailed
 
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "Gecko " & errorMsg, True)
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "XULrunner was not found in " & My.Settings.XULRunnerPath, True)
@@ -634,20 +634,20 @@ Namespace UI
 
                     pbCheck6.Image = My.Resources.Good_Symbol
                     lblCheck6.ForeColor = Color.DarkOliveGreen
-                    lblCheck6.Text = "(RDP) Sessions " & Language.Base.CcCheckSucceeded
-                    txtCheck6.Text = Language.Base.CcEOLOK
+                    lblCheck6.Text = "(RDP) Sessions " & My.Resources.strCcCheckSucceeded
+                    txtCheck6.Text = My.Resources.strCcEOLOK
                 Catch ex As Exception
                     pbCheck6.Image = My.Resources.Bad_Symbol
                     lblCheck6.ForeColor = Color.Firebrick
-                    lblCheck6.Text = "(RDP) Sessions " & Language.Base.CcCheckFailed
-                    txtCheck6.Text = Language.Base.CcEOLFailed
+                    lblCheck6.Text = "(RDP) Sessions " & My.Resources.strCcCheckFailed
+                    txtCheck6.Text = My.Resources.strCcEOLFailed
 
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "EOLWTSCOM " & errorMsg, True)
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True)
                 End Try
             End Sub
 #End Region
-            
+
         End Class
     End Namespace
 End Namespace

mRemoteV1/UI/UI.Window.Connection.vb

@@ -3,7 +3,7 @@ Imports System.Windows
 Imports System.Windows.Forms
 Imports Crownwood
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -82,14 +82,14 @@ Namespace UI
                 '
                 'cmenTabFullscreen
                 '
-                Me.cmenTabFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
+                Me.cmenTabFullscreen.Image = Global.mRemoteNG.My.Resources.Resources.Fullscreen
                 Me.cmenTabFullscreen.Name = "cmenTabFullscreen"
                 Me.cmenTabFullscreen.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabFullscreen.Text = "Fullscreen (RDP)"
                 '
                 'cmenTabSmartSize
                 '
-                Me.cmenTabSmartSize.Image = Global.mRemote.My.Resources.Resources.SmartSize
+                Me.cmenTabSmartSize.Image = Global.mRemoteNG.My.Resources.Resources.SmartSize
                 Me.cmenTabSmartSize.Name = "cmenTabSmartSize"
                 Me.cmenTabSmartSize.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)"
@@ -107,14 +107,14 @@ Namespace UI
                 '
                 'cmenTabScreenshot
                 '
-                Me.cmenTabScreenshot.Image = Global.mRemote.My.Resources.Resources.Screenshot_Add
+                Me.cmenTabScreenshot.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Add
                 Me.cmenTabScreenshot.Name = "cmenTabScreenshot"
                 Me.cmenTabScreenshot.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabScreenshot.Text = "Screenshot"
                 '
                 'cmenTabStartChat
                 '
-                Me.cmenTabStartChat.Image = Global.mRemote.My.Resources.Resources.Chat
+                Me.cmenTabStartChat.Image = Global.mRemoteNG.My.Resources.Resources.Chat
                 Me.cmenTabStartChat.Name = "cmenTabStartChat"
                 Me.cmenTabStartChat.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabStartChat.Text = "Start Chat (VNC)"
@@ -122,14 +122,14 @@ Namespace UI
                 '
                 'cmenTabTransferFile
                 '
-                Me.cmenTabTransferFile.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
+                Me.cmenTabTransferFile.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer
                 Me.cmenTabTransferFile.Name = "cmenTabTransferFile"
                 Me.cmenTabTransferFile.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabTransferFile.Text = "Transfer File (SSH)"
                 '
                 'cmenTabRefreshScreen
                 '
-                Me.cmenTabRefreshScreen.Image = Global.mRemote.My.Resources.Resources.Refresh
+                Me.cmenTabRefreshScreen.Image = Global.mRemoteNG.My.Resources.Resources.Refresh
                 Me.cmenTabRefreshScreen.Name = "cmenTabRefreshScreen"
                 Me.cmenTabRefreshScreen.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabRefreshScreen.Text = "Refresh Screen (VNC)"
@@ -137,7 +137,7 @@ Namespace UI
                 'cmenTabSendSpecialKeys
                 '
                 Me.cmenTabSendSpecialKeys.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cmenTabSendSpecialKeysCtrlAltDel, Me.cmenTabSendSpecialKeysCtrlEsc})
-                Me.cmenTabSendSpecialKeys.Image = Global.mRemote.My.Resources.Resources.Keyboard
+                Me.cmenTabSendSpecialKeys.Image = Global.mRemoteNG.My.Resources.Resources.Keyboard
                 Me.cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys"
                 Me.cmenTabSendSpecialKeys.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabSendSpecialKeys.Text = "Send special Keys (VNC)"
@@ -168,7 +168,7 @@ Namespace UI
                 '
                 'cmenTabRenameTab
                 '
-                Me.cmenTabRenameTab.Image = Global.mRemote.My.Resources.Resources.Rename
+                Me.cmenTabRenameTab.Image = Global.mRemoteNG.My.Resources.Resources.Rename
                 Me.cmenTabRenameTab.Name = "cmenTabRenameTab"
                 Me.cmenTabRenameTab.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabRenameTab.Text = "Rename Tab"
@@ -188,7 +188,7 @@ Namespace UI
                 '
                 'cmenTabDisconnect
                 '
-                Me.cmenTabDisconnect.Image = Global.mRemote.My.Resources.Resources.Pause
+                Me.cmenTabDisconnect.Image = Global.mRemoteNG.My.Resources.Resources.Pause
                 Me.cmenTabDisconnect.Name = "cmenTabDisconnect"
                 Me.cmenTabDisconnect.Size = New System.Drawing.Size(201, 22)
                 Me.cmenTabDisconnect.Text = "Disconnect"
@@ -204,7 +204,7 @@ Namespace UI
                 Me.ClientSize = New System.Drawing.Size(632, 453)
                 Me.Controls.Add(Me.TabController)
                 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.mRemote_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon
                 Me.Name = "Connection"
                 Me.TabText = "UI.Window.Connection"
                 Me.Text = "UI.Window.Connection"
@@ -215,15 +215,49 @@ Namespace UI
 #End Region
 
 #Region "Public Methods"
-            Public Sub New(ByVal Panel As DockContent, Optional ByVal FormText As String = Language.Base.NewPanel)
+            Public Sub New(ByVal Panel As DockContent, Optional ByVal FormText As String = "")
+
+                If FormText = "" Then
+                    FormText = My.Resources.strNewPanel
+                End If
+
                 Me.WindowType = Type.Connection
                 Me.DockPnl = Panel
                 Me.InitializeComponent()
                 Me.Text = FormText
                 Me.TabText = FormText
+
+                'AddHandler mRemoteNG.App.Runtime.HotKey_CtrlTab.Pressed, AddressOf CtrlTabHK_Press
+                'AddHandler mRemoteNG.App.Runtime.HotKey_ShiftTab.Pressed, AddressOf ShiftTabHK_Press
             End Sub
 
-            Public Function AddConnectionTab(ByVal conI As mRemote.Connection.Info) As Magic.Controls.TabPage
+            Protected Sub CtrlTabHK_Press(ByVal sender As Integer)
+                With Me.TabController
+                    If .TabPages.Count > 1 And Me.Visible Then
+                        If .TabPages.Count = .SelectedIndex + 1 Then
+                            .SelectedIndex = 0
+                        Else
+                            .SelectedIndex = .SelectedIndex + 1
+                        End If
+                        FocusIC()
+                        RefreshIC()
+                    End If
+                End With
+            End Sub
+            Protected Sub ShiftTabHK_Press(ByVal sender As Integer)
+                With Me.TabController
+                    If .TabPages.Count > 1 And Me.Visible Then
+                        If .SelectedIndex = 0 Then
+                            .SelectedIndex = .TabPages.Count - 1
+                        Else
+                            .SelectedIndex = .SelectedIndex - 1
+                        End If
+                        FocusIC()
+                        RefreshIC()
+                    End If
+                End With
+            End Sub
+            Public Function AddConnectionTab(ByVal conI As mRemoteNG.Connection.Info) As Magic.Controls.TabPage
                 Try
                     Dim nTab As New Magic.Controls.TabPage
                     nTab.Anchor = AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right Or AnchorStyles.Top
@@ -254,7 +288,7 @@ Namespace UI
                         nTab.Title &= ")"
                     End If
 
-                    Dim conIcon As Icon = mRemote.Connection.Icon.FromString(conI.Icon)
+                    Dim conIcon As Icon = mRemoteNG.Connection.Icon.FromString(conI.Icon)
                     If conIcon IsNot Nothing Then
                         nTab.Icon = conIcon
                     End If
@@ -282,28 +316,29 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                cmenTabFullscreen.Text = Language.Base.Fullscreen & " (RDP)"
-                cmenTabSmartSize.Text = Language.Base.SmartSize & " (RDP/VNC)"
-                cmenTabViewOnly.Text = Language.Base.Props_ViewOnly & " (VNC)"
-                cmenTabScreenshot.Text = Language.Base.Screenshot
-                cmenTabStartChat.Text = Language.Base.StartChat & " (VNC)"
-                cmenTabTransferFile.Text = Language.Base.TransferFile & " (SSH)"
-                cmenTabRefreshScreen.Text = Language.Base.RefreshScreen & " (VNC)"
-                cmenTabSendSpecialKeys.Text = Language.Base.SendSpecialKeys & " (VNC)"
-                cmenTabSendSpecialKeysCtrlAltDel.Text = Language.Base.Key_Control & "+" & Language.Base.Key_Alt & "+" & Language.Base.Key_Del
-                cmenTabSendSpecialKeysCtrlEsc.Text = Language.Base.Key_Control & "+" & Language.Base.Key_Esc
-                cmenTabExternalApps.Text = Language.Base.Menu_ExternalApplications
-                cmenTabRenameTab.Text = Language.Base.RenameTab
-                cmenTabDuplicateTab.Text = Language.Base.DuplicateTab
-                cmenTabReconnect.Text = Language.Base.Reconnect
-                cmenTabDisconnect.Text = Language.Base.Disconnect
+                cmenTabFullscreen.Text = My.Resources.strMenuFullScreenRDP
+                cmenTabSmartSize.Text = My.Resources.strMenuSmartSize
+                cmenTabViewOnly.Text = My.Resources.strMenuViewOnly
+                cmenTabScreenshot.Text = My.Resources.strMenuScreenshot
+                cmenTabStartChat.Text = My.Resources.strMenuStartChat
+                cmenTabTransferFile.Text = My.Resources.strMenuTransferFile
+                cmenTabRefreshScreen.Text = My.Resources.strMenuRefreshScreen
+                cmenTabSendSpecialKeys.Text = My.Resources.strMenuSendSpecialKeys
+                cmenTabSendSpecialKeysCtrlAltDel.Text = My.Resources.strMenuCtrlAltDel
+                cmenTabSendSpecialKeysCtrlEsc.Text = My.Resources.strMenuCtrlEsc
+                cmenTabExternalApps.Text = My.Resources.strMenuExternalTools
+                cmenTabRenameTab.Text = My.Resources.strMenuRenameTab
+                cmenTabDuplicateTab.Text = My.Resources.strMenuDuplicateTab
+                cmenTabReconnect.Text = My.Resources.strMenuReconnect
+                cmenTabDisconnect.Text = My.Resources.strMenuDisconnect
+                cmenTabPuttySettings.Text = My.Resources.strPuttySettings
             End Sub
 
             Private Sub Connection_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
                 Try
                     For Each tabP As Magic.Controls.TabPage In Me.TabController.TabPages
                         If tabP.Tag IsNot Nothing Then
-                            Dim IC As mRemote.Connection.InterfaceControl = tabP.Tag
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = tabP.Tag
                             IC.Protocol.Close()
                         End If
                     Next
@@ -316,8 +351,8 @@ Namespace UI
                 Try
                     For Each tabP As Magic.Controls.TabPage In Me.TabController.TabPages
                         If tabP.Tag IsNot Nothing Then
-                            If TypeOf tabP.Tag Is mRemote.Connection.InterfaceControl Then
-                                Dim IC As mRemote.Connection.InterfaceControl = tabP.Tag
+                            If TypeOf tabP.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                                Dim IC As mRemoteNG.Connection.InterfaceControl = tabP.Tag
                                 IC.Protocol.Resize()
                             End If
                         End If
@@ -340,7 +375,7 @@ Namespace UI
             Private Sub CloseConnectionTab()
                 Try
                     If Me.TabController.SelectedTab.Tag IsNot Nothing Then
-                        Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
                         IC.Protocol.Close()
                     Else
                         Me.CloseTab(Me.TabController.SelectedTab)
@@ -359,7 +394,7 @@ Namespace UI
 #Region "Drag and Drop"
             Private Sub TabController_DragDrop(ByVal sender As Object, ByVal e As System.Windows.Forms.DragEventArgs) Handles TabController.DragDrop
                 If e.Data.GetDataPresent("System.Windows.Forms.TreeNode", True) Then
-                    App.Runtime.OpenConnection(e.Data.GetData("System.Windows.Forms.TreeNode", True).Tag, Me, mRemote.Connection.Info.Force.DoNotJump)
+                    App.Runtime.OpenConnection(e.Data.GetData("System.Windows.Forms.TreeNode", True).Tag, Me, mRemoteNG.Connection.Info.Force.DoNotJump)
                 End If
             End Sub
 
@@ -382,17 +417,17 @@ Namespace UI
                         Exit Sub
                     End If
 
-                    Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                    Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
                     If IC Is Nothing Then
                         Exit Sub
                     End If
 
-                    If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then
+                    If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then
                         Me.cmenTabFullscreen.Enabled = True
                         Me.cmenTabSmartSize.Enabled = True
 
-                        Dim rdp As mRemote.Connection.Protocol.RDP = IC.Protocol
+                        Dim rdp As mRemoteNG.Connection.Protocol.RDP = IC.Protocol
                         Me.cmenTabSmartSize.Checked = rdp.SmartSize
                         Me.cmenTabFullscreen.Checked = rdp.Fullscreen
                     Else
@@ -400,7 +435,7 @@ Namespace UI
                         Me.cmenTabSmartSize.Enabled = False
                     End If
 
-                    If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.VNC Then
+                    If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.VNC Then
                         Me.cmenTabSendSpecialKeys.Enabled = True
                         Me.cmenTabViewOnly.Enabled = True
 
@@ -409,7 +444,7 @@ Namespace UI
                         Me.cmenTabRefreshScreen.Enabled = True
                         Me.cmenTabTransferFile.Enabled = False
 
-                        Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
+                        Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol
                         Me.cmenTabSmartSize.Checked = vnc.SmartSize
                         Me.cmenTabViewOnly.Checked = vnc.ViewOnly
                     Else
@@ -420,11 +455,11 @@ Namespace UI
                         Me.cmenTabTransferFile.Enabled = False
                     End If
 
-                    If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH2 Then
+                    If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH2 Then
                         Me.cmenTabTransferFile.Enabled = True
                     End If
 
-                    If TypeOf IC.Protocol Is mRemote.Connection.Protocol.PuttyBase Then
+                    If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.PuttyBase Then
                         Me.cmenTabPuttySettings.Enabled = True
                     Else
                         Me.cmenTabPuttySettings.Enabled = False
@@ -467,11 +502,11 @@ Namespace UI
             End Sub
 
             Private Sub cmenTabSendSpecialKeysCtrlAltDel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmenTabSendSpecialKeysCtrlAltDel.Click
-                Me.SendSpecialKeys(mRemote.Connection.Protocol.VNC.SpecialKeys.CtrlAltDel)
+                Me.SendSpecialKeys(mRemoteNG.Connection.Protocol.VNC.SpecialKeys.CtrlAltDel)
             End Sub
 
             Private Sub cmenTabSendSpecialKeysCtrlEsc_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmenTabSendSpecialKeysCtrlEsc.Click
-                Me.SendSpecialKeys(mRemote.Connection.Protocol.VNC.SpecialKeys.CtrlEsc)
+                Me.SendSpecialKeys(mRemoteNG.Connection.Protocol.VNC.SpecialKeys.CtrlEsc)
             End Sub
 
             Private Sub cmenTabFullscreen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cmenTabFullscreen.Click
@@ -503,14 +538,14 @@ Namespace UI
             Private Sub ToggleSmartSize()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If TypeOf IC.Protocol Is mRemote.Connection.Protocol.RDP Then
-                                Dim rdp As mRemote.Connection.Protocol.RDP = IC.Protocol
+                            If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.RDP Then
+                                Dim rdp As mRemoteNG.Connection.Protocol.RDP = IC.Protocol
                                 rdp.ToggleSmartSize()
-                            ElseIf TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then
-                                Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
+                            ElseIf TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then
+                                Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol
                                 vnc.ToggleSmartSize()
                             End If
                         End If
@@ -523,12 +558,12 @@ Namespace UI
             Private Sub TransferFile()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.SSH2 Then
+                            If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH1 Or IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH2 Then
                                 SSHTransferFile()
-                            ElseIf IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.VNC Then
+                            ElseIf IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.VNC Then
                                 VNCTransferFile()
                             End If
                         End If
@@ -541,11 +576,11 @@ Namespace UI
             Private Sub SSHTransferFile()
                 Try
 
-                    Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                    Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
                     Windows.Show(Type.SSHTransfer)
 
-                    Dim conI As mRemote.Connection.Info = IC.Info
+                    Dim conI As mRemoteNG.Connection.Info = IC.Info
 
                     Windows.sshtransferForm.Hostname = conI.Hostname
                     Windows.sshtransferForm.Username = conI.Username
@@ -558,8 +593,8 @@ Namespace UI
 
             Private Sub VNCTransferFile()
                 Try
-                    Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
-                    Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
+                    Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                    Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol
                     vnc.StartFileTransfer()
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNCTransferFile (UI.Window.Connections) failed" & vbNewLine & ex.Message, True)
@@ -569,13 +604,13 @@ Namespace UI
             Private Sub ToggleViewOnly()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then
+                            If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then
                                 cmenTabViewOnly.Checked = Not cmenTabViewOnly.Checked
 
-                                Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
+                                Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol
                                 vnc.ToggleViewOnly()
                             End If
                         End If
@@ -588,11 +623,11 @@ Namespace UI
             Private Sub StartChat()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then
-                                Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
+                            If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then
+                                Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol
                                 vnc.StartChat()
                             End If
                         End If
@@ -605,11 +640,11 @@ Namespace UI
             Private Sub RefreshScreen()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then
-                                Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
+                            If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then
+                                Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol
                                 vnc.RefreshScreen()
                             End If
                         End If
@@ -619,14 +654,14 @@ Namespace UI
                 End Try
             End Sub
 
-            Private Sub SendSpecialKeys(ByVal Keys As mRemote.Connection.Protocol.VNC.SpecialKeys)
+            Private Sub SendSpecialKeys(ByVal Keys As mRemoteNG.Connection.Protocol.VNC.SpecialKeys)
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If TypeOf IC.Protocol Is mRemote.Connection.Protocol.VNC Then
-                                Dim vnc As mRemote.Connection.Protocol.VNC = IC.Protocol
+                            If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.VNC Then
+                                Dim vnc As mRemoteNG.Connection.Protocol.VNC = IC.Protocol
                                 vnc.SendSpecialKeys(Keys)
                             End If
                         End If
@@ -639,11 +674,11 @@ Namespace UI
             Private Sub ToggleFullscreen()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If TypeOf IC.Protocol Is mRemote.Connection.Protocol.RDP Then
-                                Dim rdp As mRemote.Connection.Protocol.RDP = IC.Protocol
+                            If TypeOf IC.Protocol Is mRemoteNG.Connection.Protocol.RDP Then
+                                Dim rdp As mRemoteNG.Connection.Protocol.RDP = IC.Protocol
                                 rdp.ToggleFullscreen()
                             End If
                         End If
@@ -656,11 +691,11 @@ Namespace UI
             Private Sub ShowPuttySettingsDialog()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim objInterfaceControl As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim objInterfaceControl As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If TypeOf objInterfaceControl.Protocol Is mRemote.Connection.Protocol.PuttyBase Then
-                                Dim objPuttyBase As mRemote.Connection.Protocol.PuttyBase = objInterfaceControl.Protocol
+                            If TypeOf objInterfaceControl.Protocol Is mRemoteNG.Connection.Protocol.PuttyBase Then
+                                Dim objPuttyBase As mRemoteNG.Connection.Protocol.PuttyBase = objInterfaceControl.Protocol
 
                                 objPuttyBase.ShowSettingsDialog()
                             End If
@@ -696,8 +731,8 @@ Namespace UI
             Private Sub StartExternalApp(ByVal ExtA As Tools.ExternalApp)
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
                             ExtA.Start(IC.Info)
                         End If
@@ -711,8 +746,8 @@ Namespace UI
             Private Sub CloseTabMenu()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
                             IC.Protocol.Close()
                         End If
@@ -725,10 +760,10 @@ Namespace UI
             Private Sub DuplicateTab()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            App.Runtime.OpenConnection(IC.Info, mRemote.Connection.Info.Force.DoNotJump)
+                            App.Runtime.OpenConnection(IC.Info, mRemoteNG.Connection.Info.Force.DoNotJump)
                         End If
                     End If
                 Catch ex As Exception
@@ -739,13 +774,13 @@ Namespace UI
             Private Sub Reconnect()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
-                            Dim conI As mRemote.Connection.Info = IC.Info
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                            Dim conI As mRemoteNG.Connection.Info = IC.Info
 
                             IC.Protocol.Close()
 
-                            App.Runtime.OpenConnection(conI, mRemote.Connection.Info.Force.DoNotJump)
+                            App.Runtime.OpenConnection(conI, mRemoteNG.Connection.Info.Force.DoNotJump)
                         End If
                     End If
                 Catch ex As Exception
@@ -755,7 +790,7 @@ Namespace UI
 
             Private Sub RenameTab()
                 Try
-                    Dim nTitle As String = InputBox(Language.Base.NewTitle & ":", , Me.TabController.SelectedTab.Title.Replace("&&", "&"))
+                    Dim nTitle As String = InputBox(My.Resources.strNewTitle & ":", , Me.TabController.SelectedTab.Title.Replace("&&", "&"))
 
                     If nTitle <> "" Then
                         Me.TabController.SelectedTab.Title = nTitle.Replace("&", "&&")
@@ -768,7 +803,7 @@ Namespace UI
 
 #Region "Protocols"
             Public Sub Prot_Event_Closed(ByVal sender As Object)
-                Dim Prot As mRemote.Connection.Protocol.Base = sender
+                Dim Prot As mRemoteNG.Connection.Protocol.Base = sender
                 CloseTab(Prot.InterfaceControl.Parent)
             End Sub
 #End Region
@@ -809,8 +844,8 @@ Namespace UI
             Private Sub FocusIC()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
                             IC.Protocol.Focus()
                         End If
                     End If
@@ -822,11 +857,11 @@ Namespace UI
             Public Sub RefreshIC()
                 Try
                     If Me.TabController.SelectedTab IsNot Nothing Then
-                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemote.Connection.InterfaceControl Then
-                            Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                        If TypeOf Me.TabController.SelectedTab.Tag Is mRemoteNG.Connection.InterfaceControl Then
+                            Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                            If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.VNC Then
-                                TryCast(IC.Protocol, mRemote.Connection.Protocol.VNC).RefreshScreen()
+                            If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.VNC Then
+                                TryCast(IC.Protocol, mRemoteNG.Connection.Protocol.VNC).RefreshScreen()
                             End If
                         End If
                     End If
@@ -845,9 +880,9 @@ Namespace UI
 
                         If curRect.Contains(Form.MousePosition) Then
                             If curTab IsNot Nothing Then
-                                Dim IC As mRemote.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                                Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
 
-                                If IC.Info.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then
+                                If IC.Info.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then
                                     IC.Protocol.Focus()
                                 End If
                             End If

mRemoteV1/UI/UI.Window.ErrorsAndInfos.vb

@@ -1,5 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -103,7 +103,7 @@ Namespace UI
                 '
                 'clmMessage
                 '
-                Me.clmMessage.Text = Language.Base.Message
+                Me.clmMessage.Text = My.Resources.strColumnMessage
                 Me.clmMessage.Width = 184
                 '
                 'cMenMC
@@ -116,19 +116,19 @@ Namespace UI
                 '
                 'cMenMCCopy
                 '
-                Me.cMenMCCopy.Image = Global.mRemote.My.Resources.Resources.Copy
+                Me.cMenMCCopy.Image = Global.mRemoteNG.My.Resources.Resources.Copy
                 Me.cMenMCCopy.Name = "cMenMCCopy"
                 Me.cMenMCCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys)
                 Me.cMenMCCopy.Size = New System.Drawing.Size(136, 22)
-                Me.cMenMCCopy.Text = Language.Base.Copy
+                Me.cMenMCCopy.Text = My.Resources.strMenuCopy
                 '
                 'cMenMCDelete
                 '
-                Me.cMenMCDelete.Image = Global.mRemote.My.Resources.Resources.Delete
+                Me.cMenMCDelete.Image = Global.mRemoteNG.My.Resources.Resources.Delete
                 Me.cMenMCDelete.Name = "cMenMCDelete"
                 Me.cMenMCDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete
                 Me.cMenMCDelete.Size = New System.Drawing.Size(136, 22)
-                Me.cMenMCDelete.Text = Language.Base.Delete
+                Me.cMenMCDelete.Text = My.Resources.strMenuDelete
                 '
                 'imgListMC
                 '
@@ -142,10 +142,10 @@ Namespace UI
                 Me.Controls.Add(Me.lvErrorCollector)
                 Me.Controls.Add(Me.pnlErrorMsg)
                 Me.HideOnClose = True
-                Me.Icon = Global.mRemote.My.Resources.Resources.Info_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.Info_Icon
                 Me.Name = "ErrorsAndInfos"
-                Me.TabText = Language.Base.Menu_ErrorsAndInfos
-                Me.Text = Language.Base.Menu_ErrorsAndInfos
+                Me.TabText = My.Resources.strMenuNotifications
+                Me.Text = My.Resources.strMenuNotifications
                 Me.pnlErrorMsg.ResumeLayout(False)
                 Me.pnlErrorMsg.PerformLayout()
                 CType(Me.pbError, System.ComponentModel.ISupportInitialize).EndInit()
@@ -173,11 +173,11 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                clmMessage.Text = Language.Base.Message
-                cMenMCCopy.Text = Language.Base.Copy
-                cMenMCDelete.Text = Language.Base.Delete
-                TabText = Language.Base.Menu_ErrorsAndInfos
-                Text = Language.Base.Menu_ErrorsAndInfos
+                clmMessage.Text = My.Resources.strColumnMessage
+                cMenMCCopy.Text = My.Resources.strMenuCopy
+                cMenMCDelete.Text = My.Resources.strMenuDelete
+                TabText = My.Resources.strMenuNotifications
+                Text = My.Resources.strMenuNotifications
             End Sub
 #End Region
 
@@ -351,7 +351,7 @@ Namespace UI
                 End Try
             End Sub
 #End Region
-            
+
             Public Enum ControlLayout
                 Vertical = 0
                 Horizontal = 1

mRemoteV1/UI/UI.Window.ExternalApps.vb

@@ -1,5 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -115,7 +115,7 @@ Namespace UI
                 '
                 'cMenAppsAdd
                 '
-                Me.cMenAppsAdd.Image = Global.mRemote.My.Resources.Resources.ExtApp_Add
+                Me.cMenAppsAdd.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp_Add
                 Me.cMenAppsAdd.Name = "cMenAppsAdd"
                 Me.cMenAppsAdd.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys)
                 Me.cMenAppsAdd.Size = New System.Drawing.Size(147, 22)
@@ -123,7 +123,7 @@ Namespace UI
                 '
                 'cMenAppsRemove
                 '
-                Me.cMenAppsRemove.Image = Global.mRemote.My.Resources.Resources.ExtApp_Delete
+                Me.cMenAppsRemove.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp_Delete
                 Me.cMenAppsRemove.Name = "cMenAppsRemove"
                 Me.cMenAppsRemove.ShortcutKeys = System.Windows.Forms.Keys.Delete
                 Me.cMenAppsRemove.Size = New System.Drawing.Size(147, 22)
@@ -136,7 +136,7 @@ Namespace UI
                 '
                 'cMenAppsStart
                 '
-                Me.cMenAppsStart.Image = Global.mRemote.My.Resources.Resources.ExtApp_Start
+                Me.cMenAppsStart.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp_Start
                 Me.cMenAppsStart.Name = "cMenAppsStart"
                 Me.cMenAppsStart.Size = New System.Drawing.Size(147, 22)
                 Me.cMenAppsStart.Text = "Start"
@@ -199,9 +199,9 @@ Namespace UI
                 '
                 Me.btnBrowse.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.btnBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-                Me.btnBrowse.Location = New System.Drawing.Point(602, 40)
+                Me.btnBrowse.Location = New System.Drawing.Point(576, 40)
                 Me.btnBrowse.Name = "btnBrowse"
-                Me.btnBrowse.Size = New System.Drawing.Size(69, 23)
+                Me.btnBrowse.Size = New System.Drawing.Size(95, 23)
                 Me.btnBrowse.TabIndex = 40
                 Me.btnBrowse.Text = "Browse..."
                 Me.btnBrowse.UseVisualStyleBackColor = True
@@ -223,7 +223,7 @@ Namespace UI
                 Me.txtFilename.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
                 Me.txtFilename.Location = New System.Drawing.Point(104, 42)
                 Me.txtFilename.Name = "txtFilename"
-                Me.txtFilename.Size = New System.Drawing.Size(492, 20)
+                Me.txtFilename.Size = New System.Drawing.Size(464, 20)
                 Me.txtFilename.TabIndex = 30
                 '
                 'txtDisplayName
@@ -272,6 +272,7 @@ Namespace UI
                 Me.ClientSize = New System.Drawing.Size(684, 323)
                 Me.Controls.Add(Me.grpEditor)
                 Me.Controls.Add(Me.lvApps)
+                Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
                 Me.Name = "ExternalApps"
                 Me.TabText = "External Applications"
@@ -377,7 +378,17 @@ Namespace UI
 
             Private Sub RemoveApps()
                 Try
-                    If MsgBox(Language.Base.ReallyDeleteSelectedApplications, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+                    Dim Prompt As String = ""
+                    Select Case lvApps.SelectedItems.Count
+                        Case Is < 1
+                            Exit Sub
+                        Case Is = 1
+                            Prompt = String.Format(My.Resources.strConfirmDeleteExternalTool, lvApps.SelectedItems(0).Text)
+                        Case Is > 1
+                            Prompt = String.Format(My.Resources.strConfirmDeleteExternalToolMultiple, lvApps.SelectedItems.Count)
+                    End Select
+
+                    If MsgBox(Prompt, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
                         For Each lvItem As ListViewItem In lvApps.SelectedItems
                             ExtApps.Remove(lvItem.Tag)
                             lvItem.Tag = Nothing
@@ -394,7 +405,7 @@ Namespace UI
             Private Sub StartApp()
                 Try
                     For Each lvItem As ListViewItem In lvApps.SelectedItems
-                        TryCast(lvItem.Tag, mRemote.Tools.ExternalApp).Start()
+                        TryCast(lvItem.Tag, mRemoteNG.Tools.ExternalApp).Start()
                     Next
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.WarningMsg, "StartApp failed (UI.Window.ExternalApps" & vbNewLine & ex.Message, True)
@@ -414,23 +425,24 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                clmDisplayName.Text = Language.Base.Props_Display & " " & Language.Base.Props_Name
-                clmFilename.Text = Language.Base.Filename
-                clmArguments.Text = Language.Base.Arguments
-                clmWaitForExit.Text = Language.Base.WaitForExit
-                cMenAppsAdd.Text = Language.Base.Add
-                cMenAppsRemove.Text = Language.Base.Remove
-                cMenAppsStart.Text = Language.Base.Start
-                grpEditor.Text = Language.Base.Application & " " & Language.Base.Editor
-                Label4.Text = Language.Base.Menu_Options & ":"
-                chkWaitForExit.Text = Language.Base.WaitForExit
-                btnBrowse.Text = Language.Base.Browse
-                Label3.Text = Language.Base.Arguments & ":"
-                Label2.Text = Language.Base.Filename & ":"
-                Label1.Text = Language.Base.DisplayName & ":"
-                dlgOpenFile.Filter = Language.Base.All & " " & Language.Base.Files & " (*.*)|*.*"
-                TabText = Language.Base.Menu_ExternalApplications
-                Text = Language.Base.Menu_ExternalApplications
+                clmDisplayName.Text = My.Resources.strColumnDisplayName
+                clmFilename.Text = My.Resources.strColumnFilename
+                clmArguments.Text = My.Resources.strColumnArguments
+                clmWaitForExit.Text = My.Resources.strColumnWaitForExit
+                cMenAppsAdd.Text = My.Resources.strMenuNewExternalTool
+                cMenAppsRemove.Text = My.Resources.strMenuDeleteExternalTool
+                cMenAppsStart.Text = My.Resources.strMenuLaunchExternalTool
+                grpEditor.Text = My.Resources.strGroupboxExternalToolProperties
+                Label4.Text = My.Resources.strLabelOptions
+                chkWaitForExit.Text = My.Resources.strCheckboxWaitForExit
+                chkTryIntegrate.Text = My.Resources.strTryIntegrate
+                btnBrowse.Text = My.Resources.strButtonBrowse
+                Label3.Text = My.Resources.strLabelArguments
+                Label2.Text = My.Resources.strLabelFilename
+                Label1.Text = My.Resources.strLabelDisplayName
+                dlgOpenFile.Filter = My.Resources.strFilterApplication & "|*.exe|" & My.Resources.strFilterAll & "|*.*"
+                TabText = My.Resources.strMenuExternalTools
+                Text = My.Resources.strMenuExternalTools
             End Sub
 
             Private Sub lvApps_DoubleClick(ByVal sender As Object, ByVal e As System.EventArgs) Handles lvApps.DoubleClick

mRemoteV1/UI/UI.Window.Help.vb

@@ -1,5 +1,4 @@
-Imports mRemote.App.Runtime
-Imports WeifenLuo.WinFormsUI.Docking
+Imports WeifenLuo.WinFormsUI.Docking
 
 Namespace UI
     Namespace Window
@@ -195,7 +194,7 @@ Namespace UI
                 '
                 Me.ClientSize = New System.Drawing.Size(542, 323)
                 Me.Controls.Add(Me.pnlSplitter)
-                Me.Icon = Global.mRemote.My.Resources.Resources.Help_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.Help_Icon
                 Me.Name = "Help"
                 Me.TabText = "Help"
                 Me.Text = "Help"

mRemoteV1/UI/UI.Window.Options.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="TabController.DrawGrid" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
 </root>

mRemoteV1/UI/UI.Window.PortScan.vb

@@ -1,5 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -112,7 +112,7 @@ Namespace UI
                 '
                 Me.btnScan.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.btnScan.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-                Me.btnScan.Image = Global.mRemote.My.Resources.Resources.Search
+                Me.btnScan.Image = Global.mRemoteNG.My.Resources.Resources.Search
                 Me.btnScan.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
                 Me.btnScan.Location = New System.Drawing.Point(448, 8)
                 Me.btnScan.Name = "btnScan"
@@ -385,24 +385,24 @@ Namespace UI
                         cbProtocol.SelectedIndex = 0
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't load PortScan panel" & vbNewLine & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPortScanCouldNotLoadPanel & vbNewLine & vbNewLine & ex.Message)
                 End Try
             End Sub
 
             Private Sub ApplyLanguage()
-                lblStartIP.Text = Language.Base.StartIP & ":"
-                lblEndIP.Text = Language.Base.EndIP & ":"
-                btnScan.Text = Language.Base.Button_Scan
-                btnCancel.Text = Language.Base.Button_Cancel
-                btnImport.Text = Language.Base.Button_Import
-                lblOnlyImport.Text = Language.Base.ProtocolToImport & ":"
-                clmHost.Text = Language.Base.Props_HostnameIP
-                clmOpenPorts.Text = Language.Base.OpenPorts
-                clmClosedPorts.Text = Language.Base.ClosedPorts
-                Label2.Text = Language.Base.EndPort & ":"
-                Label1.Text = Language.Base.StartPort & ":"
-                TabText = Language.Base.Menu_PortScan
-                Text = Language.Base.Menu_PortScan
+                lblStartIP.Text = My.Resources.strStartIP & ":"
+                lblEndIP.Text = My.Resources.strEndIP & ":"
+                btnScan.Text = My.Resources.strButtonScan
+                btnCancel.Text = My.Resources.strButtonCancel
+                btnImport.Text = My.Resources.strButtonImport
+                lblOnlyImport.Text = My.Resources.strProtocolToImport & ":"
+                clmHost.Text = My.Resources.strColumnHostnameIP
+                clmOpenPorts.Text = My.Resources.strOpenPorts
+                clmClosedPorts.Text = My.Resources.strClosedPorts
+                Label2.Text = My.Resources.strEndPort & ":"
+                Label1.Text = My.Resources.strStartPort & ":"
+                TabText = My.Resources.strMenuPortScan
+                Text = My.Resources.strMenuPortScan
             End Sub
 
             Private Sub btnScan_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnScan.Click
@@ -412,13 +412,13 @@ Namespace UI
                     If ipOK() Then
                         StartScan()
                     Else
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "Cannot start Port Scan, incorrect IP format!")
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strCannotStartPortScan)
                     End If
                 End If
             End Sub
 
             Private Sub btnImport_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnImport.Click
-                Dim prot As mRemote.Connection.Protocol.Protocols = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.Protocols), cbProtocol.SelectedItem)
+                Dim prot As mRemoteNG.Connection.Protocol.Protocols = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.Protocols), cbProtocol.SelectedItem)
 
                 Dim arrHosts As New ArrayList
                 For Each lvItem As ListViewItem In lvHosts.SelectedItems
@@ -456,9 +456,9 @@ Namespace UI
                     Me.Invoke(d)
                 Else
                     If scanning = True Then
-                        btnScan.Text = Language.Base.Button_Stop
+                        btnScan.Text = My.Resources.strButtonStop
                     Else
-                        btnScan.Text = Language.Base.Button_Scan
+                        btnScan.Text = My.Resources.strButtonScan
                     End If
                 End If
             End Sub

mRemoteV1/UI/UI.Window.QuickConnect.vb

@@ -1,6 +1,6 @@
 Imports WeifenLuo.WinFormsUI.Docking
 Imports System.Reflection
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -33,7 +33,7 @@ Namespace UI
                 Me.btnCancel.Size = New System.Drawing.Size(75, 23)
                 Me.btnCancel.TabIndex = 20
                 Me.btnCancel.TabStop = False
-                Me.btnCancel.Text = Language.Base.Button_Cancel
+                Me.btnCancel.Text = My.Resources.strButtonCancel
                 Me.btnCancel.UseVisualStyleBackColor = True
                 '
                 'QuickConnect
@@ -43,10 +43,10 @@ Namespace UI
                 Me.Controls.Add(Me.btnCancel)
                 Me.Controls.Add(Me.flpProtocols)
                 Me.HideOnClose = True
-                Me.Icon = Global.mRemote.My.Resources.Resources.Play_Quick_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.Play_Quick_Icon
                 Me.Name = "QuickConnect"
-                Me.TabText = Language.Base.QuickConnect
-                Me.Text = Language.Base.QuickConnect
+                Me.TabText = My.Resources.strQuickConnect
+                Me.Text = My.Resources.strQuickConnect
                 Me.ResumeLayout(False)
 
             End Sub
@@ -61,12 +61,12 @@ Namespace UI
 #End Region
 
 #Region "Public Properties"
-            Private _ConnectionInfo As mRemote.Connection.Info
-            Public Property ConnectionInfo() As mRemote.Connection.Info
+            Private _ConnectionInfo As mRemoteNG.Connection.Info
+            Public Property ConnectionInfo() As mRemoteNG.Connection.Info
                 Get
                     Return Me._ConnectionInfo
                 End Get
-                Set(ByVal value As mRemote.Connection.Info)
+                Set(ByVal value As mRemoteNG.Connection.Info)
                     Me._ConnectionInfo = value
                 End Set
             End Property
@@ -85,14 +85,14 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                btnCancel.Text = Language.Base.Button_Cancel
-                TabText = Language.Base.QuickConnect
-                Text = Language.Base.QuickConnect
+                btnCancel.Text = My.Resources.strButtonCancel
+                TabText = My.Resources.strQuickConnect
+                Text = My.Resources.strQuickConnect
             End Sub
 
             Private Sub CreateButtons()
                 Try
-                    For Each fI As FieldInfo In GetType(mRemote.Connection.Protocol.Protocols).GetFields
+                    For Each fI As FieldInfo In GetType(mRemoteNG.Connection.Protocol.Protocols).GetFields
                         If fI.Name <> "value__" And fI.Name <> "NONE" And fI.Name <> "IntApp" Then
                             Dim nBtn As New Button
                             nBtn.Text = fI.Name
@@ -110,21 +110,21 @@ Namespace UI
 
             Private Sub ProtocolButton_Click(ByVal sender As Object, ByVal e As System.EventArgs)
                 Try
-                    Me._ConnectionInfo.Protocol = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.Protocols), sender.Text)
+                    Me._ConnectionInfo.Protocol = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.Protocols), sender.Text)
 
                     If Me._ConnectionInfo.Port = 0 Then
                         Me._ConnectionInfo.SetDefaultPort()
 
-                        If mRemote.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then
-                            mRemote.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname)
+                        If mRemoteNG.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then
+                            mRemoteNG.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname)
                         End If
                     Else
-                        If mRemote.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then
-                            mRemote.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname & ":" & Me._ConnectionInfo.Port)
+                        If mRemoteNG.Connection.QuickConnect.History.Exists(Me._ConnectionInfo.Hostname) = False Then
+                            mRemoteNG.Connection.QuickConnect.History.Add(Me._ConnectionInfo.Hostname & ":" & Me._ConnectionInfo.Port)
                         End If
                     End If
 
-                    App.Runtime.OpenConnection(Me._ConnectionInfo, mRemote.Connection.Info.Force.DoNotJump)
+                    App.Runtime.OpenConnection(Me._ConnectionInfo, mRemoteNG.Connection.Info.Force.DoNotJump)
 
                     Me.Hide()
                 Catch ex As Exception

mRemoteV1/UI/UI.Window.SSHTransfer.vb

@@ -1,9 +1,8 @@
 Imports WeifenLuo.WinFormsUI.Docking
 Imports Tamir.SharpSsh
-Imports Tamir.SharpSsh.jsch
 Imports System.IO
 Imports System.Threading
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -74,25 +73,25 @@ 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 = "Files"
                 '
                 'lblLocalFile
                 '
                 Me.lblLocalFile.AutoSize = True
                 Me.lblLocalFile.Location = New System.Drawing.Point(20, 25)
                 Me.lblLocalFile.Name = "lblLocalFile"
-                Me.lblLocalFile.Size = New System.Drawing.Size(55, 13)
+                Me.lblLocalFile.Size = New System.Drawing.Size(52, 13)
                 Me.lblLocalFile.TabIndex = 10
-                Me.lblLocalFile.Text = Language.Base.LocalFile & ":"
+                Me.lblLocalFile.Text = "Local file:"
                 '
                 'txtLocalFile
                 '
                 Me.txtLocalFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.txtLocalFile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-                Me.txtLocalFile.Location = New System.Drawing.Point(92, 23)
+                Me.txtLocalFile.Location = New System.Drawing.Point(105, 23)
                 Me.txtLocalFile.Name = "txtLocalFile"
-                Me.txtLocalFile.Size = New System.Drawing.Size(468, 20)
+                Me.txtLocalFile.Size = New System.Drawing.Size(455, 20)
                 Me.txtLocalFile.TabIndex = 20
                 '
                 'txtRemoteFile
@@ -100,9 +99,9 @@ Namespace UI
                 Me.txtRemoteFile.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.txtRemoteFile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-                Me.txtRemoteFile.Location = New System.Drawing.Point(92, 49)
+                Me.txtRemoteFile.Location = New System.Drawing.Point(105, 49)
                 Me.txtRemoteFile.Name = "txtRemoteFile"
-                Me.txtRemoteFile.Size = New System.Drawing.Size(555, 20)
+                Me.txtRemoteFile.Size = New System.Drawing.Size(542, 20)
                 Me.txtRemoteFile.TabIndex = 50
                 '
                 'lblRemoteFile
@@ -110,9 +109,9 @@ Namespace UI
                 Me.lblRemoteFile.AutoSize = True
                 Me.lblRemoteFile.Location = New System.Drawing.Point(20, 51)
                 Me.lblRemoteFile.Name = "lblRemoteFile"
-                Me.lblRemoteFile.Size = New System.Drawing.Size(66, 13)
+                Me.lblRemoteFile.Size = New System.Drawing.Size(63, 13)
                 Me.lblRemoteFile.TabIndex = 40
-                Me.lblRemoteFile.Text = Language.Base.RemoteFile & ":"
+                Me.lblRemoteFile.Text = "Remote file:"
                 '
                 'btnBrowse
                 '
@@ -122,7 +121,7 @@ Namespace UI
                 Me.btnBrowse.Name = "btnBrowse"
                 Me.btnBrowse.Size = New System.Drawing.Size(81, 23)
                 Me.btnBrowse.TabIndex = 30
-                Me.btnBrowse.Text = Language.Base.Browse
+                Me.btnBrowse.Text = Global.mRemoteNG.My.Resources.Resources.strButtonBrowse
                 Me.btnBrowse.UseVisualStyleBackColor = True
                 '
                 'grpConnection
@@ -146,7 +145,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 = "Connection"
                 '
                 'radProtSFTP
                 '
@@ -179,7 +178,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 = "Protocol:"
                 '
                 'lblPassword
                 '
@@ -188,7 +187,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 = "Password:"
                 '
                 'lblUser
                 '
@@ -197,7 +196,7 @@ Namespace UI
                 Me.lblUser.Name = "lblUser"
                 Me.lblUser.Size = New System.Drawing.Size(32, 13)
                 Me.lblUser.TabIndex = 50
-                Me.lblUser.Text = Language.Base.User & ":"
+                Me.lblUser.Text = "User:"
                 '
                 'lblPort
                 '
@@ -207,7 +206,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 = "Port:"
                 '
                 'lblHost
                 '
@@ -216,7 +215,7 @@ Namespace UI
                 Me.lblHost.Name = "lblHost"
                 Me.lblHost.Size = New System.Drawing.Size(32, 13)
                 Me.lblHost.TabIndex = 10
-                Me.lblHost.Text = Language.Base.Host & ":"
+                Me.lblHost.Text = "Host:"
                 '
                 'txtPort
                 '
@@ -232,9 +231,9 @@ Namespace UI
                 Me.txtHost.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.txtHost.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-                Me.txtHost.Location = New System.Drawing.Point(92, 25)
+                Me.txtHost.Location = New System.Drawing.Point(105, 25)
                 Me.txtHost.Name = "txtHost"
-                Me.txtHost.Size = New System.Drawing.Size(484, 20)
+                Me.txtHost.Size = New System.Drawing.Size(471, 20)
                 Me.txtHost.TabIndex = 20
                 '
                 'txtPassword
@@ -242,10 +241,10 @@ Namespace UI
                 Me.txtPassword.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.txtPassword.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-                Me.txtPassword.Location = New System.Drawing.Point(92, 77)
+                Me.txtPassword.Location = New System.Drawing.Point(105, 77)
                 Me.txtPassword.Name = "txtPassword"
                 Me.txtPassword.PasswordChar = Global.Microsoft.VisualBasic.ChrW(42)
-                Me.txtPassword.Size = New System.Drawing.Size(484, 20)
+                Me.txtPassword.Size = New System.Drawing.Size(471, 20)
                 Me.txtPassword.TabIndex = 80
                 '
                 'txtUser
@@ -253,22 +252,22 @@ Namespace UI
                 Me.txtUser.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
                             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.txtUser.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-                Me.txtUser.Location = New System.Drawing.Point(92, 51)
+                Me.txtUser.Location = New System.Drawing.Point(105, 51)
                 Me.txtUser.Name = "txtUser"
-                Me.txtUser.Size = New System.Drawing.Size(484, 20)
+                Me.txtUser.Size = New System.Drawing.Size(471, 20)
                 Me.txtUser.TabIndex = 60
                 '
                 'btnTransfer
                 '
                 Me.btnTransfer.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
                 Me.btnTransfer.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-                Me.btnTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
+                Me.btnTransfer.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer
                 Me.btnTransfer.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
                 Me.btnTransfer.Location = New System.Drawing.Point(597, 382)
                 Me.btnTransfer.Name = "btnTransfer"
                 Me.btnTransfer.Size = New System.Drawing.Size(83, 29)
                 Me.btnTransfer.TabIndex = 10000
-                Me.btnTransfer.Text = Language.Base.Transfer
+                Me.btnTransfer.Text = "Transfer"
                 Me.btnTransfer.TextAlign = System.Drawing.ContentAlignment.MiddleRight
                 Me.btnTransfer.UseVisualStyleBackColor = True
                 '
@@ -288,10 +287,11 @@ Namespace UI
                 Me.Controls.Add(Me.grpConnection)
                 Me.Controls.Add(Me.btnTransfer)
                 Me.Controls.Add(Me.pbStatus)
+                Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
                 Me.Name = "SSHTransfer"
-                Me.TabText = Language.Base.Menu_SSHFileTransfer
-                Me.Text = Language.Base.Menu_SSHFileTransfer
+                Me.TabText = Global.mRemoteNG.My.Resources.Resources.strMenuSSHFileTransfer
+                Me.Text = "SSH File Transfer"
                 Me.grpFiles.ResumeLayout(False)
                 Me.grpFiles.PerformLayout()
                 Me.grpConnection.ResumeLayout(False)
@@ -350,31 +350,31 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                grpFiles.Text = Language.Base.Files
-                lblLocalFile.Text = Language.Base.LocalFile & ":"
-                lblRemoteFile.Text = Language.Base.RemoteFile & ":"
-                btnBrowse.Text = Language.Base.Browse
-                grpConnection.Text = Language.Base.Connection
-                lblProtocol.Text = Language.Base.Props_Protocol & ":"
-                lblPassword.Text = Language.Base.Props_Password & ":"
-                lblUser.Text = Language.Base.User & ":"
-                lblPort.Text = Language.Base.Props_Port & ":"
-                lblHost.Text = Language.Base.Host & ":"
-                btnTransfer.Text = Language.Base.Transfer
-                TabText = Language.Base.Menu_SSHFileTransfer
-                Text = Language.Base.Menu_SSHFileTransfer
+                grpFiles.Text = My.Resources.strGroupboxFiles
+                lblLocalFile.Text = My.Resources.strLocalFile & ":"
+                lblRemoteFile.Text = My.Resources.strRemoteFile & ":"
+                btnBrowse.Text = My.Resources.strButtonBrowse
+                grpConnection.Text = My.Resources.strGroupboxConnection
+                lblProtocol.Text = My.Resources.strLabelProtocol
+                lblPassword.Text = My.Resources.strLabelPassword
+                lblUser.Text = My.Resources.strUser & ":"
+                lblPort.Text = My.Resources.strLabelPort
+                lblHost.Text = My.Resources.strHost & ":"
+                btnTransfer.Text = My.Resources.strTransfer
+                TabText = My.Resources.strMenuSSHFileTransfer
+                Text = My.Resources.strMenuSSHFileTransfer
             End Sub
 #End Region
 
 #Region "Private Methods"
             Private Sub StartTransfer(ByVal Protocol As SSHTransferProtocol)
                 If AllFieldsSet() = False Then
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Please fill all fields!")
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPleaseFillAllFields)
                     Exit Sub
                 End If
 
                 If File.Exists(Me.txtLocalFile.Text) = False Then
-                    mC.AddMessage(Messages.MessageClass.WarningMsg, "Local file does not exist!")
+                    mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strLocalFileDoesNotExist)
                     Exit Sub
                 End If
 
@@ -400,7 +400,7 @@ Namespace UI
                     t.SetApartmentState(ApartmentState.STA)
                     t.Start()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Transfer failed!" & vbNewLine & ex.Message)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHTransferFailed & vbNewLine & ex.Message)
                     Me.sshT.Close()
                 End Try
             End Sub
@@ -413,14 +413,14 @@ Namespace UI
                     DisableButtons()
                     Me.sshT.Put(LocalFile, RemoteFile)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartTransferBG (UI.Window.SSHTransfer) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHStartTransferBG & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
             Private Function AllFieldsSet() As Boolean
                 If Me.txtHost.Text <> "" And Me.txtPort.Text <> "" And Me.txtUser.Text <> "" And Me.txtLocalFile.Text <> "" And Me.txtRemoteFile.Text <> "" Then
                     If Me.txtPassword.Text = "" Then
-                        If MsgBox(Language.Base.EmptyPasswordContinue, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.No Then
+                        If MsgBox(My.Resources.strEmptyPasswordContinue, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.No Then
                             Return False
                         End If
                     End If
@@ -492,7 +492,7 @@ Namespace UI
                     EnableButtons()
                     SetStatus()
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "Transfer successful!")
+                    mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strSSHTransferFailed)
 
                     If Me.sshT IsNot Nothing Then
                         Me.sshT.Close()
@@ -500,7 +500,7 @@ Namespace UI
                         Me.sshT.Close()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "SshTransfer_End (UI.Window.SSHTransfer) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSSHTransferEndFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region

mRemoteV1/UI/UI.Window.SaveAs.vb

@@ -1,5 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -105,7 +105,7 @@ Namespace UI
                 '
                 'PictureBox1
                 '
-                Me.PictureBox1.Image = Global.mRemote.My.Resources.Resources.WarningSmall
+                Me.PictureBox1.Image = Global.mRemoteNG.My.Resources.Resources.WarningSmall
                 Me.PictureBox1.Location = New System.Drawing.Point(15, 31)
                 Me.PictureBox1.Name = "PictureBox1"
                 Me.PictureBox1.Size = New System.Drawing.Size(16, 16)
@@ -123,7 +123,7 @@ Namespace UI
                 Me.Controls.Add(Me.lvSecurity)
                 Me.Controls.Add(Me.btnCancel)
                 Me.Controls.Add(Me.btnOK)
-                Me.Icon = Global.mRemote.My.Resources.Resources.Connections_SaveAs_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.Connections_SaveAs_Icon
                 Me.Name = "SaveAs"
                 Me.TabText = "Save Connections As"
                 Me.Text = "Save Connections As"
@@ -167,9 +167,9 @@ Namespace UI
                 Me.InitializeComponent()
 
                 If Export Then
-                    Me.SetFormText(Language.Base.Export)
+                    Me.SetFormText(My.Resources.strExport)
                 Else
-                    Me.SetFormText(Language.Base.Menu_SaveConnectionsAs)
+                    Me.SetFormText(My.Resources.strMenuSaveConnectionFileAs)
                 End If
 
                 Me._Export = Export
@@ -183,16 +183,16 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                lvSecurity.Items(0).Text = Language.Base.Props_Username
-                lvSecurity.Items(1).Text = Language.Base.Props_Password
-                lvSecurity.Items(2).Text = Language.Base.Props_Domain
-                lvSecurity.Items(3).Text = Language.Base.Inheritance
-                btnCancel.Text = Language.Base.Button_Cancel
-                btnOK.Text = Language.Base.Button_OK
-                Label1.Text = Language.Base.UncheckProperties
-                lblMremoteXMLOnly.Text = Language.Base.PropertiesWillOnlyBeSavedMRemoteXML
-                TabText = Language.Base.Menu_SaveConnectionsAs
-                Text = Language.Base.Menu_SaveConnectionsAs
+                lvSecurity.Items(0).Text = My.Resources.strCheckboxUsername
+                lvSecurity.Items(1).Text = My.Resources.strCheckboxPassword
+                lvSecurity.Items(2).Text = My.Resources.strCheckboxDomain
+                lvSecurity.Items(3).Text = My.Resources.strCheckboxInheritance
+                btnCancel.Text = My.Resources.strButtonCancel
+                btnOK.Text = My.Resources.strButtonOK
+                Label1.Text = My.Resources.strUncheckProperties
+                lblMremoteXMLOnly.Text = My.Resources.strPropertiesWillOnlyBeSavedMRemoteXML
+                TabText = My.Resources.strMenuSaveConnectionFileAs
+                Text = My.Resources.strMenuSaveConnectionFileAs
             End Sub
 
             Private Sub btnCancel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnCancel.Click

mRemoteV1/UI/UI.Window.ScreenshotManager.vb

@@ -1,5 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.IO
 
 Namespace UI
@@ -61,21 +61,21 @@ Namespace UI
                 'mMenFile
                 '
                 Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileSaveAll, Me.mMenFileRemoveAll})
-                Me.mMenFile.Image = Global.mRemote.My.Resources.Resources.File
+                Me.mMenFile.Image = Global.mRemoteNG.My.Resources.Resources.File
                 Me.mMenFile.Name = "mMenFile"
                 Me.mMenFile.Size = New System.Drawing.Size(51, 20)
                 Me.mMenFile.Text = "&File"
                 '
                 'mMenFileSaveAll
                 '
-                Me.mMenFileSaveAll.Image = Global.mRemote.My.Resources.Resources.Screenshot_Save
+                Me.mMenFileSaveAll.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Save
                 Me.mMenFileSaveAll.Name = "mMenFileSaveAll"
                 Me.mMenFileSaveAll.Size = New System.Drawing.Size(128, 22)
                 Me.mMenFileSaveAll.Text = "Save All"
                 '
                 'mMenFileRemoveAll
                 '
-                Me.mMenFileRemoveAll.Image = Global.mRemote.My.Resources.Resources.Screenshot_Delete
+                Me.mMenFileRemoveAll.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Delete
                 Me.mMenFileRemoveAll.Name = "mMenFileRemoveAll"
                 Me.mMenFileRemoveAll.Size = New System.Drawing.Size(128, 22)
                 Me.mMenFileRemoveAll.Text = "Remove All"
@@ -88,14 +88,14 @@ Namespace UI
                 '
                 'cMenScreenshotCopy
                 '
-                Me.cMenScreenshotCopy.Image = Global.mRemote.My.Resources.Resources.Screenshot_Copy
+                Me.cMenScreenshotCopy.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Copy
                 Me.cMenScreenshotCopy.Name = "cMenScreenshotCopy"
                 Me.cMenScreenshotCopy.Size = New System.Drawing.Size(99, 22)
                 Me.cMenScreenshotCopy.Text = "Copy"
                 '
                 'cMenScreenshotSave
                 '
-                Me.cMenScreenshotSave.Image = Global.mRemote.My.Resources.Resources.Screenshot_Save
+                Me.cMenScreenshotSave.Image = Global.mRemoteNG.My.Resources.Resources.Screenshot_Save
                 Me.cMenScreenshotSave.Name = "cMenScreenshotSave"
                 Me.cMenScreenshotSave.Size = New System.Drawing.Size(99, 22)
                 Me.cMenScreenshotSave.Text = "Save"
@@ -113,7 +113,7 @@ Namespace UI
                 Me.Controls.Add(Me.flpScreenshots)
                 Me.Controls.Add(Me.msMain)
                 Me.HideOnClose = True
-                Me.Icon = Global.mRemote.My.Resources.Resources.Screenshot_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.Screenshot_Icon
                 Me.MainMenuStrip = Me.msMain
                 Me.Name = "ScreenshotManager"
                 Me.TabText = "Screenshots"
@@ -133,14 +133,14 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                mMenFile.Text = Language.Base.Menu_File
-                mMenFileSaveAll.Text = Language.Base.SaveAll
-                mMenFileRemoveAll.Text = Language.Base.RemoveAll
-                cMenScreenshotCopy.Text = Language.Base.Copy
-                cMenScreenshotSave.Text = Language.Base.Save
-                dlgSaveSingleImage.Filter = Language.Base.SaveImageFilter
-                TabText = Language.Base.Screenshots
-                Text = Language.Base.Screenshots
+                mMenFile.Text = My.Resources.strMenuFile
+                mMenFileSaveAll.Text = My.Resources.strSaveAll
+                mMenFileRemoveAll.Text = My.Resources.strRemoveAll
+                cMenScreenshotCopy.Text = My.Resources.strMenuCopy
+                cMenScreenshotSave.Text = My.Resources.strSave
+                dlgSaveSingleImage.Filter = My.Resources.strSaveImageFilter
+                TabText = My.Resources.strScreenshots
+                Text = My.Resources.strScreenshots
             End Sub
 #End Region
 

mRemoteV1/UI/UI.Window.Sessions.vb

@@ -1,5 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -51,16 +51,16 @@ Namespace UI
                 '
                 'clmSesUsername
                 '
-                Me.clmSesUsername.Text = Language.Base.Props_Username
+                Me.clmSesUsername.Text = My.Resources.strColumnUsername
                 Me.clmSesUsername.Width = 80
                 '
                 'clmSesActivity
                 '
-                Me.clmSesActivity.Text = Language.Base.Activity
+                Me.clmSesActivity.Text = My.Resources.strActivity
                 '
                 'clmSesType
                 '
-                Me.clmSesType.Text = Language.Base.Type
+                Me.clmSesType.Text = My.Resources.strType
                 Me.clmSesType.Width = 80
                 '
                 'cMenSession
@@ -71,17 +71,17 @@ Namespace UI
                 '
                 'cMenSessionRefresh
                 '
-                Me.cMenSessionRefresh.Image = Global.mRemote.My.Resources.Resources.Refresh
+                Me.cMenSessionRefresh.Image = Global.mRemoteNG.My.Resources.Resources.Refresh
                 Me.cMenSessionRefresh.Name = "cMenSessionRefresh"
                 Me.cMenSessionRefresh.Size = New System.Drawing.Size(123, 22)
-                Me.cMenSessionRefresh.Text = Language.Base.Refresh
+                Me.cMenSessionRefresh.Text = My.Resources.strRefresh
                 '
                 'cMenSessionLogOff
                 '
-                Me.cMenSessionLogOff.Image = Global.mRemote.My.Resources.Resources.Session_LogOff
+                Me.cMenSessionLogOff.Image = Global.mRemoteNG.My.Resources.Resources.Session_LogOff
                 Me.cMenSessionLogOff.Name = "cMenSessionLogOff"
                 Me.cMenSessionLogOff.Size = New System.Drawing.Size(123, 22)
-                Me.cMenSessionLogOff.Text = Language.Base.LogOff
+                Me.cMenSessionLogOff.Text = My.Resources.strLogOff
                 '
                 'Sessions
                 '
@@ -90,8 +90,8 @@ Namespace UI
                 Me.HideOnClose = True
                 Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
                 Me.Name = "Sessions"
-                Me.TabText = Language.Base.Menu_Sessions
-                Me.Text = Language.Base.Menu_Sessions
+                Me.TabText = My.Resources.strMenuSessions
+                Me.Text = My.Resources.strMenuSessions
                 Me.cMenSession.ResumeLayout(False)
                 Me.ResumeLayout(False)
 
@@ -127,22 +127,22 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                clmSesUsername.Text = Language.Base.Props_Username
-                clmSesActivity.Text = Language.Base.Activity
-                clmSesType.Text = Language.Base.Type
-                cMenSessionRefresh.Text = Language.Base.Refresh
-                cMenSessionLogOff.Text = Language.Base.LogOff
-                TabText = Language.Base.Menu_Sessions
-                Text = Language.Base.Menu_Sessions
+                clmSesUsername.Text = My.Resources.strColumnUsername
+                clmSesActivity.Text = My.Resources.strActivity
+                clmSesType.Text = My.Resources.strType
+                cMenSessionRefresh.Text = My.Resources.strRefresh
+                cMenSessionLogOff.Text = My.Resources.strLogOff
+                TabText = My.Resources.strMenuSessions
+                Text = My.Resources.strMenuSessions
             End Sub
 #End Region
 
 #Region "Private Methods"
             Private Sub GetSessionsBG()
                 Try
-                    Dim tS As New mRemote.Connection.Protocol.RDP.TerminalSessions
+                    Dim tS As New mRemoteNG.Connection.Protocol.RDP.TerminalSessions
                     Dim sU As New Security.Impersonator
-                    Dim tsSessions As New mRemote.Connection.Protocol.RDP.Sessions
+                    Dim tsSessions As New mRemoteNG.Connection.Protocol.RDP.Sessions
 
                     sU.StartImpersonation(tDomain, tUserName, tPassword)
 
@@ -178,7 +178,7 @@ Namespace UI
                     sU = Nothing
                     tS.CloseConnection(tServerHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessionsBG (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionGetFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -189,7 +189,7 @@ Namespace UI
                         Exit Sub
                     End If
 
-                    Dim ts As New mRemote.Connection.Protocol.RDP.TerminalSessions
+                    Dim ts As New mRemoteNG.Connection.Protocol.RDP.TerminalSessions
                     Dim sU As New Security.Impersonator
 
                     sU.StartImpersonation(tDomain, tUserName, tPassword)
@@ -214,7 +214,7 @@ Namespace UI
 
                     GetSessionsBG()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "KillSessionBG (UI.Window.Sessions) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strSessionKillFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -259,17 +259,17 @@ Namespace UI
                 Try
                     Dim nowHost As String = ""
 
-                    If TypeOf mRemote.Tree.Node.SelectedNode.Tag Is mRemote.Connection.Info Then
-                        nowHost = TryCast(mRemote.Tree.Node.SelectedNode.Tag, mRemote.Connection.Info).Hostname
+                    If TypeOf mRemoteNG.Tree.Node.SelectedNode.Tag Is mRemoteNG.Connection.Info Then
+                        nowHost = TryCast(mRemoteNG.Tree.Node.SelectedNode.Tag, mRemoteNG.Connection.Info).Hostname
                     Else
                         Me.ClearList()
                         Exit Sub
                     End If
 
                     If My.Settings.AutomaticallyGetSessionInfo And Me._CurrentHost = nowHost Then
-                        Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag
+                        Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag
 
-                        If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemote.Connection.Protocol.Protocols.ICA Then
+                        If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.ICA Then
                             'continue
                         Else
                             Me.ClearList()
@@ -302,20 +302,20 @@ Namespace UI
             End Sub
 
             Public Sub GetSessions()
-                If mRemote.Tree.Node.SelectedNode Is Nothing Then
+                If mRemoteNG.Tree.Node.SelectedNode Is Nothing Then
                     Exit Sub
                 End If
 
-                If TypeOf mRemote.Tree.Node.SelectedNode.Tag Is mRemote.Connection.Info Then
+                If TypeOf mRemoteNG.Tree.Node.SelectedNode.Tag Is mRemoteNG.Connection.Info Then
                     'continue
                 Else
                     Me.ClearList()
                     Exit Sub
                 End If
 
-                Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag
+                Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag
 
-                If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemote.Connection.Protocol.Protocols.ICA Then
+                If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Or conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.ICA Then
                     'continue
                 Else
                     Me.ClearList()
@@ -364,15 +364,15 @@ Namespace UI
             End Sub
 
             Public Sub KillSession()
-                If TypeOf mRemote.Tree.Node.SelectedNode.Tag Is mRemote.Connection.Info Then
+                If TypeOf mRemoteNG.Tree.Node.SelectedNode.Tag Is mRemoteNG.Connection.Info Then
                     'continue
                 Else
                     Exit Sub
                 End If
 
-                Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag
+                Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag
 
-                If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then
+                If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then
                     'continue
                 Else
                     Exit Sub

mRemoteV1/UI/UI.Window.Tree.vb

@@ -1,6 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
-Imports System.IO
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -127,43 +126,41 @@ Namespace UI
                 Me.cMenTree.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenTreeAddConnection, Me.cMenTreeAddFolder, Me.cMenTreeSep1, Me.cMenTreeConnect, Me.cMenTreeConnectWithOptions, Me.cMenTreeDisconnect, Me.cMenTreeSep2, Me.cMenTreeTools, Me.cMenTreeSep3, Me.cMenTreeDuplicate, Me.cMenTreeRename, Me.cMenTreeDelete, Me.cMenTreeSep4, Me.cMenTreeMoveUp, Me.cMenTreeMoveDown})
                 Me.cMenTree.Name = "cMenTree"
                 Me.cMenTree.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
-                Me.cMenTree.Size = New System.Drawing.Size(197, 292)
+                Me.cMenTree.Size = New System.Drawing.Size(187, 292)
                 '
                 'cMenTreeAddConnection
                 '
-                Me.cMenTreeAddConnection.Image = Global.mRemote.My.Resources.Resources.Connection_Add
+                Me.cMenTreeAddConnection.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Add
                 Me.cMenTreeAddConnection.Name = "cMenTreeAddConnection"
-                Me.cMenTreeAddConnection.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys)
-                Me.cMenTreeAddConnection.Size = New System.Drawing.Size(196, 22)
-                Me.cMenTreeAddConnection.Text = "Add Connection"
+                Me.cMenTreeAddConnection.Size = New System.Drawing.Size(186, 22)
+                Me.cMenTreeAddConnection.Text = "New Connection"
                 '
                 'cMenTreeAddFolder
                 '
-                Me.cMenTreeAddFolder.Image = Global.mRemote.My.Resources.Resources.Folder_Add
+                Me.cMenTreeAddFolder.Image = Global.mRemoteNG.My.Resources.Resources.Folder_Add
                 Me.cMenTreeAddFolder.Name = "cMenTreeAddFolder"
-                Me.cMenTreeAddFolder.ShortcutKeys = System.Windows.Forms.Keys.F7
-                Me.cMenTreeAddFolder.Size = New System.Drawing.Size(196, 22)
-                Me.cMenTreeAddFolder.Text = "Add Folder"
+                Me.cMenTreeAddFolder.Size = New System.Drawing.Size(186, 22)
+                Me.cMenTreeAddFolder.Text = "New Folder"
                 '
                 'cMenTreeSep1
                 '
                 Me.cMenTreeSep1.Name = "cMenTreeSep1"
-                Me.cMenTreeSep1.Size = New System.Drawing.Size(193, 6)
+                Me.cMenTreeSep1.Size = New System.Drawing.Size(183, 6)
                 '
                 'cMenTreeConnect
                 '
-                Me.cMenTreeConnect.Image = Global.mRemote.My.Resources.Resources.Play
+                Me.cMenTreeConnect.Image = Global.mRemoteNG.My.Resources.Resources.Play
                 Me.cMenTreeConnect.Name = "cMenTreeConnect"
                 Me.cMenTreeConnect.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _
                             Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys)
-                Me.cMenTreeConnect.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeConnect.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeConnect.Text = "Connect"
                 '
                 'cMenTreeConnectWithOptions
                 '
                 Me.cMenTreeConnectWithOptions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenTreeConnectWithOptionsConnectToConsoleSession, Me.cMenTreeConnectWithOptionsDontConnectToConsoleSession, Me.cMenTreeConnectWithOptionsConnectInFullscreen, Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting})
                 Me.cMenTreeConnectWithOptions.Name = "cMenTreeConnectWithOptions"
-                Me.cMenTreeConnectWithOptions.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeConnectWithOptions.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeConnectWithOptions.Text = "Connect (with options)"
                 '
                 'cMenTreeConnectWithOptionsConnectToConsoleSession
@@ -181,41 +178,41 @@ Namespace UI
                 '
                 'cMenTreeConnectWithOptionsConnectInFullscreen
                 '
-                Me.cMenTreeConnectWithOptionsConnectInFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
+                Me.cMenTreeConnectWithOptionsConnectInFullscreen.Image = Global.mRemoteNG.My.Resources.Resources.Fullscreen
                 Me.cMenTreeConnectWithOptionsConnectInFullscreen.Name = "cMenTreeConnectWithOptionsConnectInFullscreen"
                 Me.cMenTreeConnectWithOptionsConnectInFullscreen.Size = New System.Drawing.Size(231, 22)
                 Me.cMenTreeConnectWithOptionsConnectInFullscreen.Text = "Connect in fullscreen"
                 '
                 'cMenTreeConnectWithOptionsChoosePanelBeforeConnecting
                 '
-                Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Global.mRemote.My.Resources.Resources.Panels
+                Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Global.mRemoteNG.My.Resources.Resources.Panels
                 Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Name = "cMenTreeConnectWithOptionsChoosePanelBeforeConnecting"
                 Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Size = New System.Drawing.Size(231, 22)
                 Me.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = "Choose panel before connecting"
                 '
                 'cMenTreeDisconnect
                 '
-                Me.cMenTreeDisconnect.Image = Global.mRemote.My.Resources.Resources.Pause
+                Me.cMenTreeDisconnect.Image = Global.mRemoteNG.My.Resources.Resources.Pause
                 Me.cMenTreeDisconnect.Name = "cMenTreeDisconnect"
-                Me.cMenTreeDisconnect.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeDisconnect.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeDisconnect.Text = "Disconnect"
                 '
                 'cMenTreeSep2
                 '
                 Me.cMenTreeSep2.Name = "cMenTreeSep2"
-                Me.cMenTreeSep2.Size = New System.Drawing.Size(193, 6)
+                Me.cMenTreeSep2.Size = New System.Drawing.Size(183, 6)
                 '
                 'cMenTreeTools
                 '
                 Me.cMenTreeTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenTreeToolsTransferFile, Me.cMenTreeToolsImportExport, Me.cMenTreeToolsSort, Me.cMenTreeToolsExternalApps})
-                Me.cMenTreeTools.Image = Global.mRemote.My.Resources.Resources.Tools
+                Me.cMenTreeTools.Image = Global.mRemoteNG.My.Resources.Resources.Tools
                 Me.cMenTreeTools.Name = "cMenTreeTools"
-                Me.cMenTreeTools.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeTools.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeTools.Text = "Tools"
                 '
                 'cMenTreeToolsTransferFile
                 '
-                Me.cMenTreeToolsTransferFile.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
+                Me.cMenTreeToolsTransferFile.Image = Global.mRemoteNG.My.Resources.Resources.SSHTransfer
                 Me.cMenTreeToolsTransferFile.Name = "cMenTreeToolsTransferFile"
                 Me.cMenTreeToolsTransferFile.Size = New System.Drawing.Size(172, 22)
                 Me.cMenTreeToolsTransferFile.Text = "Transfer File (SSH)"
@@ -229,14 +226,14 @@ Namespace UI
                 '
                 'cMenTreeToolsImportExportExportmRemoteXML
                 '
-                Me.cMenTreeToolsImportExportExportmRemoteXML.Image = Global.mRemote.My.Resources.Resources.Connections_SaveAs
+                Me.cMenTreeToolsImportExportExportmRemoteXML.Image = Global.mRemoteNG.My.Resources.Resources.Connections_SaveAs
                 Me.cMenTreeToolsImportExportExportmRemoteXML.Name = "cMenTreeToolsImportExportExportmRemoteXML"
                 Me.cMenTreeToolsImportExportExportmRemoteXML.Size = New System.Drawing.Size(204, 22)
                 Me.cMenTreeToolsImportExportExportmRemoteXML.Text = "Export mRemote XML"
                 '
                 'cMenTreeToolsImportExportImportmRemoteXML
                 '
-                Me.cMenTreeToolsImportExportImportmRemoteXML.Image = Global.mRemote.My.Resources.Resources.Connections_Load
+                Me.cMenTreeToolsImportExportImportmRemoteXML.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Load
                 Me.cMenTreeToolsImportExportImportmRemoteXML.Name = "cMenTreeToolsImportExportImportmRemoteXML"
                 Me.cMenTreeToolsImportExportImportmRemoteXML.Size = New System.Drawing.Size(204, 22)
                 Me.cMenTreeToolsImportExportImportmRemoteXML.Text = "Import mRemote XML"
@@ -248,21 +245,21 @@ Namespace UI
                 '
                 'cMenTreeToolsImportExportImportFromAD
                 '
-                Me.cMenTreeToolsImportExportImportFromAD.Image = Global.mRemote.My.Resources.Resources.ActiveDirectory
+                Me.cMenTreeToolsImportExportImportFromAD.Image = Global.mRemoteNG.My.Resources.Resources.ActiveDirectory
                 Me.cMenTreeToolsImportExportImportFromAD.Name = "cMenTreeToolsImportExportImportFromAD"
                 Me.cMenTreeToolsImportExportImportFromAD.Size = New System.Drawing.Size(204, 22)
                 Me.cMenTreeToolsImportExportImportFromAD.Text = "Import from Active Directory"
                 '
                 'cMenTreeToolsImportExportImportFromRDPFiles
                 '
-                Me.cMenTreeToolsImportExportImportFromRDPFiles.Image = Global.mRemote.My.Resources.Resources.RDP
+                Me.cMenTreeToolsImportExportImportFromRDPFiles.Image = Global.mRemoteNG.My.Resources.Resources.RDP
                 Me.cMenTreeToolsImportExportImportFromRDPFiles.Name = "cMenTreeToolsImportExportImportFromRDPFiles"
                 Me.cMenTreeToolsImportExportImportFromRDPFiles.Size = New System.Drawing.Size(204, 22)
                 Me.cMenTreeToolsImportExportImportFromRDPFiles.Text = "Import from .RDP file(s)"
                 '
                 'cMenTreeToolsImportExportImportFromPortScan
                 '
-                Me.cMenTreeToolsImportExportImportFromPortScan.Image = Global.mRemote.My.Resources.Resources.PortScan
+                Me.cMenTreeToolsImportExportImportFromPortScan.Image = Global.mRemoteNG.My.Resources.Resources.PortScan
                 Me.cMenTreeToolsImportExportImportFromPortScan.Name = "cMenTreeToolsImportExportImportFromPortScan"
                 Me.cMenTreeToolsImportExportImportFromPortScan.Size = New System.Drawing.Size(204, 22)
                 Me.cMenTreeToolsImportExportImportFromPortScan.Text = "Import from Port Scan"
@@ -276,21 +273,21 @@ Namespace UI
                 '
                 'cMenTreeToolsSortAscending
                 '
-                Me.cMenTreeToolsSortAscending.Image = Global.mRemote.My.Resources.Resources.Sort_AZ
+                Me.cMenTreeToolsSortAscending.Image = Global.mRemoteNG.My.Resources.Resources.Sort_AZ
                 Me.cMenTreeToolsSortAscending.Name = "cMenTreeToolsSortAscending"
                 Me.cMenTreeToolsSortAscending.Size = New System.Drawing.Size(157, 22)
                 Me.cMenTreeToolsSortAscending.Text = "Ascending (A-Z)"
                 '
                 'cMenTreeToolsSortDescending
                 '
-                Me.cMenTreeToolsSortDescending.Image = Global.mRemote.My.Resources.Resources.Sort_ZA
+                Me.cMenTreeToolsSortDescending.Image = Global.mRemoteNG.My.Resources.Resources.Sort_ZA
                 Me.cMenTreeToolsSortDescending.Name = "cMenTreeToolsSortDescending"
                 Me.cMenTreeToolsSortDescending.Size = New System.Drawing.Size(157, 22)
                 Me.cMenTreeToolsSortDescending.Text = "Descending (Z-A)"
                 '
                 'cMenTreeToolsExternalApps
                 '
-                Me.cMenTreeToolsExternalApps.Image = Global.mRemote.My.Resources.Resources.ExtApp
+                Me.cMenTreeToolsExternalApps.Image = Global.mRemoteNG.My.Resources.Resources.ExtApp
                 Me.cMenTreeToolsExternalApps.Name = "cMenTreeToolsExternalApps"
                 Me.cMenTreeToolsExternalApps.Size = New System.Drawing.Size(172, 22)
                 Me.cMenTreeToolsExternalApps.Text = "External Applications"
@@ -298,51 +295,51 @@ Namespace UI
                 'cMenTreeSep3
                 '
                 Me.cMenTreeSep3.Name = "cMenTreeSep3"
-                Me.cMenTreeSep3.Size = New System.Drawing.Size(193, 6)
+                Me.cMenTreeSep3.Size = New System.Drawing.Size(183, 6)
                 '
                 'cMenTreeDuplicate
                 '
-                Me.cMenTreeDuplicate.Image = Global.mRemote.My.Resources.Resources.Connection_Duplicate
+                Me.cMenTreeDuplicate.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Duplicate
                 Me.cMenTreeDuplicate.Name = "cMenTreeDuplicate"
                 Me.cMenTreeDuplicate.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.D), System.Windows.Forms.Keys)
-                Me.cMenTreeDuplicate.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeDuplicate.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeDuplicate.Text = "Duplicate"
                 '
                 'cMenTreeRename
                 '
-                Me.cMenTreeRename.Image = Global.mRemote.My.Resources.Resources.Rename
+                Me.cMenTreeRename.Image = Global.mRemoteNG.My.Resources.Resources.Rename
                 Me.cMenTreeRename.Name = "cMenTreeRename"
                 Me.cMenTreeRename.ShortcutKeys = System.Windows.Forms.Keys.F2
-                Me.cMenTreeRename.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeRename.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeRename.Text = "Rename"
                 '
                 'cMenTreeDelete
                 '
-                Me.cMenTreeDelete.Image = Global.mRemote.My.Resources.Resources.Delete
+                Me.cMenTreeDelete.Image = Global.mRemoteNG.My.Resources.Resources.Delete
                 Me.cMenTreeDelete.Name = "cMenTreeDelete"
                 Me.cMenTreeDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete
-                Me.cMenTreeDelete.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeDelete.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeDelete.Text = "Delete"
                 '
                 'cMenTreeSep4
                 '
                 Me.cMenTreeSep4.Name = "cMenTreeSep4"
-                Me.cMenTreeSep4.Size = New System.Drawing.Size(193, 6)
+                Me.cMenTreeSep4.Size = New System.Drawing.Size(183, 6)
                 '
                 'cMenTreeMoveUp
                 '
-                Me.cMenTreeMoveUp.Image = Global.mRemote.My.Resources.Resources.Arrow_Up
+                Me.cMenTreeMoveUp.Image = Global.mRemoteNG.My.Resources.Resources.Arrow_Up
                 Me.cMenTreeMoveUp.Name = "cMenTreeMoveUp"
                 Me.cMenTreeMoveUp.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Up), System.Windows.Forms.Keys)
-                Me.cMenTreeMoveUp.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeMoveUp.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeMoveUp.Text = "Move up"
                 '
                 'cMenTreeMoveDown
                 '
-                Me.cMenTreeMoveDown.Image = Global.mRemote.My.Resources.Resources.Arrow_Down
+                Me.cMenTreeMoveDown.Image = Global.mRemoteNG.My.Resources.Resources.Arrow_Down
                 Me.cMenTreeMoveDown.Name = "cMenTreeMoveDown"
                 Me.cMenTreeMoveDown.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Down), System.Windows.Forms.Keys)
-                Me.cMenTreeMoveDown.Size = New System.Drawing.Size(196, 22)
+                Me.cMenTreeMoveDown.Size = New System.Drawing.Size(186, 22)
                 Me.cMenTreeMoveDown.Text = "Move down"
                 '
                 'imgListTree
@@ -367,7 +364,7 @@ Namespace UI
                 'PictureBox1
                 '
                 Me.PictureBox1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-                Me.PictureBox1.Image = Global.mRemote.My.Resources.Resources.Search
+                Me.PictureBox1.Image = Global.mRemoteNG.My.Resources.Resources.Search
                 Me.PictureBox1.Location = New System.Drawing.Point(0, 411)
                 Me.PictureBox1.Name = "PictureBox1"
                 Me.PictureBox1.Size = New System.Drawing.Size(16, 16)
@@ -401,21 +398,21 @@ Namespace UI
                 '
                 Me.mMenView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
                 Me.mMenView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewExpandAllFolders, Me.mMenViewCollapseAllFolders})
-                Me.mMenView.Image = Global.mRemote.My.Resources.Resources.View
+                Me.mMenView.Image = Global.mRemoteNG.My.Resources.Resources.View
                 Me.mMenView.Name = "mMenView"
                 Me.mMenView.Size = New System.Drawing.Size(28, 20)
                 Me.mMenView.Text = "&View"
                 '
                 'mMenViewExpandAllFolders
                 '
-                Me.mMenViewExpandAllFolders.Image = Global.mRemote.My.Resources.Resources.Expand
+                Me.mMenViewExpandAllFolders.Image = Global.mRemoteNG.My.Resources.Resources.Expand
                 Me.mMenViewExpandAllFolders.Name = "mMenViewExpandAllFolders"
                 Me.mMenViewExpandAllFolders.Size = New System.Drawing.Size(161, 22)
                 Me.mMenViewExpandAllFolders.Text = "Expand all folders"
                 '
                 'mMenViewCollapseAllFolders
                 '
-                Me.mMenViewCollapseAllFolders.Image = Global.mRemote.My.Resources.Resources.Collapse
+                Me.mMenViewCollapseAllFolders.Image = Global.mRemoteNG.My.Resources.Resources.Collapse
                 Me.mMenViewCollapseAllFolders.Name = "mMenViewCollapseAllFolders"
                 Me.mMenViewCollapseAllFolders.Size = New System.Drawing.Size(161, 22)
                 Me.mMenViewCollapseAllFolders.Text = "Collapse all folders"
@@ -425,8 +422,9 @@ Namespace UI
                 Me.ClientSize = New System.Drawing.Size(192, 453)
                 Me.Controls.Add(Me.msMain)
                 Me.Controls.Add(Me.pnlConnections)
+                Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
                 Me.HideOnClose = True
-                Me.Icon = Global.mRemote.My.Resources.Resources.Root_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.Root_Icon
                 Me.Name = "Tree"
                 Me.TabText = "Connections"
                 Me.Text = "Connections"
@@ -480,36 +478,36 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                cMenTreeAddConnection.Text = Language.Base.AddConnection
-                cMenTreeAddFolder.Text = Language.Base.AddFolder
-                cMenTreeConnect.Text = Language.Base.Connect
-                cMenTreeConnectWithOptions.Text = Language.Base.ConnectWithOptions
-                cMenTreeConnectWithOptionsConnectToConsoleSession.Text = Language.Base.ConnectToConsoleSession
-                cMenTreeConnectWithOptionsConnectInFullscreen.Text = Language.Base.ConnectInFullscreen
-                cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = Language.Base.ChoosePanelBeforeConnecting
-                cMenTreeDisconnect.Text = Language.Base.Disconnect
-                cMenTreeTools.Text = Language.Base.Tools
-                cMenTreeToolsTransferFile.Text = Language.Base.TransferFile & " (SSH)"
-                cMenTreeToolsImportExport.Text = Language.Base.ImportExport
-                cMenTreeToolsImportExportExportmRemoteXML.Text = Language.Base.ExportmRemoteXML
-                cMenTreeToolsImportExportImportmRemoteXML.Text = Language.Base.ImportmRemoteXML
-                cMenTreeToolsImportExportImportFromAD.Text = Language.Base.ImportAD
-                cMenTreeToolsImportExportImportFromRDPFiles.Text = Language.Base.ImportRDPFiles
-                cMenTreeToolsImportExportImportFromPortScan.Text = Language.Base.ImportPortScan
-                cMenTreeToolsSort.Text = Language.Base.Sort
-                cMenTreeToolsSortAscending.Text = Language.Base.SortAsc
-                cMenTreeToolsSortDescending.Text = Language.Base.SortDesc
-                cMenTreeToolsExternalApps.Text = Language.Base.Menu_ExternalApplications
-                cMenTreeDuplicate.Text = Language.Base.Duplicate
-                cMenTreeRename.Text = Language.Base.Rename
-                cMenTreeDelete.Text = Language.Base.Delete
-                cMenTreeMoveUp.Text = Language.Base.MoveUp
-                cMenTreeMoveDown.Text = Language.Base.MoveDown
-                mMenView.Text = Language.Base.Menu_View
-                mMenViewExpandAllFolders.Text = Language.Base.ExpandAllFolders
-                mMenViewCollapseAllFolders.Text = Language.Base.CollapseAllFolders
-                TabText = Language.Base.Connections
-                Text = Language.Base.Connections
+                cMenTreeAddConnection.Text = My.Resources.strAddConnection
+                cMenTreeAddFolder.Text = My.Resources.strAddFolder
+                cMenTreeConnect.Text = My.Resources.strConnect
+                cMenTreeConnectWithOptions.Text = My.Resources.strConnectWithOptions
+                cMenTreeConnectWithOptionsConnectToConsoleSession.Text = My.Resources.strConnectToConsoleSession
+                cMenTreeConnectWithOptionsConnectInFullscreen.Text = My.Resources.strConnectInFullscreen
+                cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = My.Resources.strChoosePanelBeforeConnecting
+                cMenTreeDisconnect.Text = My.Resources.strMenuDisconnect
+                cMenTreeTools.Text = My.Resources.strTools
+                cMenTreeToolsTransferFile.Text = My.Resources.strMenuTransferFile
+                cMenTreeToolsImportExport.Text = My.Resources.strImportExport
+                cMenTreeToolsImportExportExportmRemoteXML.Text = My.Resources.strExportmRemoteXML
+                cMenTreeToolsImportExportImportmRemoteXML.Text = My.Resources.strImportmRemoteXML
+                cMenTreeToolsImportExportImportFromAD.Text = My.Resources.strImportAD
+                cMenTreeToolsImportExportImportFromRDPFiles.Text = My.Resources.strImportRDPFiles
+                cMenTreeToolsImportExportImportFromPortScan.Text = My.Resources.strImportPortScan
+                cMenTreeToolsSort.Text = My.Resources.strSort
+                cMenTreeToolsSortAscending.Text = My.Resources.strSortAsc
+                cMenTreeToolsSortDescending.Text = My.Resources.strSortDesc
+                cMenTreeToolsExternalApps.Text = My.Resources.strMenuExternalTools
+                cMenTreeDuplicate.Text = My.Resources.strDuplicate
+                cMenTreeRename.Text = My.Resources.strRename
+                cMenTreeDelete.Text = My.Resources.strMenuDelete
+                cMenTreeMoveUp.Text = My.Resources.strMoveUp
+                cMenTreeMoveDown.Text = My.Resources.strMoveDown
+                mMenView.Text = My.Resources.strMenuView
+                mMenViewExpandAllFolders.Text = My.Resources.strExpandAllFolders
+                mMenViewCollapseAllFolders.Text = My.Resources.strCollapseAllFolders
+                TabText = My.Resources.strConnections
+                Text = My.Resources.strConnections
             End Sub
 #End Region
 
@@ -557,12 +555,12 @@ Namespace UI
             Private Sub tvConnections_AfterLabelEdit(ByVal sender As Object, ByVal e As System.Windows.Forms.NodeLabelEditEventArgs) Handles tvConnections.AfterLabelEdit
                 Try
                     If My.Settings.SetHostnameLikeDisplayName Then
-                        If e.Node.Text = Language.Base.NewConnection Then
-                            TryCast(e.Node.Tag, mRemote.Connection.Info).Hostname = e.Label
+                        If e.Node.Text = My.Resources.strNewConnection Then
+                            TryCast(e.Node.Tag, mRemoteNG.Connection.Info).Hostname = e.Label
                         End If
                     End If
 
-                    mRemote.Tree.Node.FinishRenameSelectedNode(e.Label)
+                    mRemoteNG.Tree.Node.FinishRenameSelectedNode(e.Label)
                     Windows.configForm.pGrid_SelectedObjectChanged()
                     Me.ShowHideTreeContextMenuItems(e.Node)
                     SaveConnectionsBG()
@@ -573,13 +571,13 @@ Namespace UI
 
             Private Sub tvConnections_AfterSelect(ByVal sender As Object, ByVal e As System.Windows.Forms.TreeViewEventArgs) Handles tvConnections.AfterSelect
                 Try
-                    Select Case mRemote.Tree.Node.GetNodeType(e.Node)
-                        Case mRemote.Tree.Node.Type.Connection
+                    Select Case mRemoteNG.Tree.Node.GetNodeType(e.Node)
+                        Case mRemoteNG.Tree.Node.Type.Connection
                             Windows.configForm.SetPropertyGridObject(e.Node.Tag)
-                            Windows.sessionsForm.CurrentHost = TryCast(e.Node.Tag, mRemote.Connection.Info).Hostname
-                        Case mRemote.Tree.Node.Type.Container
-                            Windows.configForm.SetPropertyGridObject(TryCast(e.Node.Tag, mRemote.Container.Info).ConnectionInfo)
-                        Case mRemote.Tree.Node.Type.Root
+                            Windows.sessionsForm.CurrentHost = TryCast(e.Node.Tag, mRemoteNG.Connection.Info).Hostname
+                        Case mRemoteNG.Tree.Node.Type.Container
+                            Windows.configForm.SetPropertyGridObject(TryCast(e.Node.Tag, mRemoteNG.Container.Info).ConnectionInfo)
+                        Case mRemoteNG.Tree.Node.Type.Root
                             Windows.configForm.SetPropertyGridObject(e.Node.Tag)
                         Case Else
                             Exit Sub
@@ -589,7 +587,7 @@ Namespace UI
                     Me.ShowHideTreeContextMenuItems(e.Node)
                     Windows.sessionsForm.GetSessionsAuto()
 
-                    App.Runtime.LastSelected = mRemote.Tree.Node.GetConstantID(e.Node)
+                    App.Runtime.LastSelected = mRemoteNG.Tree.Node.GetConstantID(e.Node)
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_AfterSelect (UI.Window.Tree) failed" & vbNewLine & ex.Message, True)
                 End Try
@@ -601,11 +599,11 @@ Namespace UI
                     Me.tvConnections.SelectedNode = e.Node
 
                     If e.Button = System.Windows.Forms.MouseButtons.Left Then
-                        If My.Settings.SingleClickOnConnectionOpensIt And mRemote.Tree.Node.GetNodeType(e.Node) = mRemote.Tree.Node.Type.Connection Then
+                        If My.Settings.SingleClickOnConnectionOpensIt And mRemoteNG.Tree.Node.GetNodeType(e.Node) = mRemoteNG.Tree.Node.Type.Connection Then
                             App.Runtime.OpenConnection()
                         End If
 
-                        If My.Settings.SingleClickSwitchesToOpenConnection And mRemote.Tree.Node.GetNodeType(e.Node) = mRemote.Tree.Node.Type.Connection Then
+                        If My.Settings.SingleClickSwitchesToOpenConnection And mRemoteNG.Tree.Node.GetNodeType(e.Node) = mRemoteNG.Tree.Node.Type.Connection Then
                             App.Runtime.SwitchToOpenConnection(e.Node.Tag)
                         End If
                     End If
@@ -615,23 +613,23 @@ Namespace UI
             End Sub
 
             Private Sub tvConnections_NodeMouseDoubleClick(ByVal sender As Object, ByVal e As System.Windows.Forms.TreeNodeMouseClickEventArgs) Handles tvConnections.NodeMouseDoubleClick
-                If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) = mRemote.Tree.Node.Type.Connection Then
+                If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then
                     App.Runtime.OpenConnection()
                 End If
             End Sub
 
             Private Sub tvConnections_MouseMove(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles tvConnections.MouseMove
                 Try
-                    mRemote.Tree.Node.SetNodeToolTip(e, Me.DescriptionTooltip)
+                    mRemoteNG.Tree.Node.SetNodeToolTip(e, Me.DescriptionTooltip)
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "tvConnections_MouseMove (UI.Window.Tree) failed" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
-            Private Function IsConnectionOpen(ByVal ConnectionInfos() As mRemote.Connection.Info) As Boolean
+            Private Function IsConnectionOpen(ByVal ConnectionInfos() As mRemoteNG.Connection.Info) As Boolean
                 Try
                     If ConnectionInfos IsNot Nothing Then
-                        For Each conI As mRemote.Connection.Info In ConnectionInfos
+                        For Each conI As mRemoteNG.Connection.Info In ConnectionInfos
                             If conI.OpenConnections.Count > 0 Then
                                 Return True
                             End If
@@ -652,32 +650,29 @@ Namespace UI
                         Exit Sub
                     End If
 
-                    Select Case mRemote.Tree.Node.GetNodeType(tNode)
-                        Case mRemote.Tree.Node.Type.Connection
-                            Dim conI As mRemote.Connection.Info = tNode.Tag
-
-                            Me.cMenTreeAddConnection.Enabled = False
-                            Me.cMenTreeAddFolder.Enabled = False
+                    Select Case mRemoteNG.Tree.Node.GetNodeType(tNode)
+                        Case mRemoteNG.Tree.Node.Type.Connection
+                            Dim conI As mRemoteNG.Connection.Info = tNode.Tag
 
                             Me.cMenTreeConnect.Enabled = True
                             Me.cMenTreeConnectWithOptions.Enabled = True
 
-                            If TryCast(tNode.Tag, mRemote.Connection.Info).OpenConnections.Count > 0 Then
+                            If TryCast(tNode.Tag, mRemoteNG.Connection.Info).OpenConnections.Count > 0 Then
                                 Me.cMenTreeDisconnect.Enabled = True
                             Else
                                 Me.cMenTreeDisconnect.Enabled = False
                             End If
 
-                            If conI.Protocol = mRemote.Connection.Protocol.Protocols.SSH1 Or conI.Protocol = mRemote.Connection.Protocol.Protocols.SSH2 Then
+                            If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH1 Or conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.SSH2 Then
                                 Me.cMenTreeToolsTransferFile.Enabled = True
                             Else
                                 Me.cMenTreeToolsTransferFile.Enabled = False
                             End If
 
-                            If conI.Protocol = mRemote.Connection.Protocol.Protocols.RDP Then
+                            If conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.RDP Then
                                 Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = True
                                 Me.cMenTreeConnectWithOptionsConnectToConsoleSession.Enabled = True
-                            ElseIf conI.Protocol = mRemote.Connection.Protocol.Protocols.ICA Then
+                            ElseIf conI.Protocol = mRemoteNG.Connection.Protocol.Protocols.ICA Then
                                 Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = True
                                 Me.cMenTreeConnectWithOptionsConnectToConsoleSession.Enabled = False
                             Else
@@ -695,13 +690,11 @@ Namespace UI
                             Me.cMenTreeToolsExternalApps.Enabled = True
 
                             Me.cMenTreeDuplicate.Enabled = True
+                            Me.cMenTreeDelete.Enabled = True
 
                             Me.cMenTreeMoveUp.Enabled = True
                             Me.cMenTreeMoveDown.Enabled = True
-                        Case mRemote.Tree.Node.Type.Container
-                            Me.cMenTreeAddConnection.Enabled = True
-                            Me.cMenTreeAddFolder.Enabled = True
-
+                        Case mRemoteNG.Tree.Node.Type.Container
                             Me.cMenTreeConnect.Enabled = True
                             Me.cMenTreeConnectWithOptions.Enabled = True
                             Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = False
@@ -710,8 +703,8 @@ Namespace UI
                             Me.cMenTreeDisconnect.Enabled = False
 
                             For Each n As TreeNode In tNode.Nodes
-                                If TypeOf n.Tag Is mRemote.Connection.Info Then
-                                    Dim cI As mRemote.Connection.Info = n.Tag
+                                If TypeOf n.Tag Is mRemoteNG.Connection.Info Then
+                                    Dim cI As mRemoteNG.Connection.Info = n.Tag
                                     If cI.OpenConnections.Count > 0 Then
                                         Me.cMenTreeDisconnect.Enabled = True
                                         Exit For
@@ -731,13 +724,11 @@ Namespace UI
                             Me.cMenTreeToolsExternalApps.Enabled = False
 
                             Me.cMenTreeDuplicate.Enabled = True
+                            Me.cMenTreeDelete.Enabled = True
 
                             Me.cMenTreeMoveUp.Enabled = True
                             Me.cMenTreeMoveDown.Enabled = True
-                        Case mRemote.Tree.Node.Type.Root
-                            Me.cMenTreeAddConnection.Enabled = True
-                            Me.cMenTreeAddFolder.Enabled = True
-
+                        Case mRemoteNG.Tree.Node.Type.Root
                             Me.cMenTreeConnect.Enabled = False
                             Me.cMenTreeConnectWithOptions.Enabled = False
                             Me.cMenTreeConnectWithOptionsConnectInFullscreen.Enabled = False
@@ -757,6 +748,7 @@ Namespace UI
                             Me.cMenTreeToolsExternalApps.Enabled = False
 
                             Me.cMenTreeDuplicate.Enabled = False
+                            Me.cMenTreeDelete.Enabled = False
 
                             Me.cMenTreeMoveUp.Enabled = False
                             Me.cMenTreeMoveDown.Enabled = False
@@ -792,7 +784,7 @@ Namespace UI
                         Exit Sub
                     End If
 
-                    If mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Root Then
+                    If mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Root Then
                         Exit Sub
                     End If
 
@@ -808,21 +800,21 @@ Namespace UI
                     'the TreeView root nodes, otherwise add it to the end of
                     'the dropNode child nodes
 
-                    If mRemote.Tree.Node.GetNodeType(targetNode) = mRemote.Tree.Node.Type.Root Or mRemote.Tree.Node.GetNodeType(targetNode) = mRemote.Tree.Node.Type.Container Then
+                    If mRemoteNG.Tree.Node.GetNodeType(targetNode) = mRemoteNG.Tree.Node.Type.Root Or mRemoteNG.Tree.Node.GetNodeType(targetNode) = mRemoteNG.Tree.Node.Type.Container Then
                         targetNode.Nodes.Insert(0, dropNode)
                     Else
                         targetNode.Parent.Nodes.Insert(targetNode.Index + 1, dropNode)
                     End If
 
-                    If mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Connection Or mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Container Then
-                        If mRemote.Tree.Node.GetNodeType(dropNode.Parent) = mRemote.Tree.Node.Type.Container Then
+                    If mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Connection Or mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Container Then
+                        If mRemoteNG.Tree.Node.GetNodeType(dropNode.Parent) = mRemoteNG.Tree.Node.Type.Container Then
                             dropNode.Tag.Parent = dropNode.Parent.Tag
-                        ElseIf mRemote.Tree.Node.GetNodeType(dropNode.Parent) = mRemote.Tree.Node.Type.Root Then
+                        ElseIf mRemoteNG.Tree.Node.GetNodeType(dropNode.Parent) = mRemoteNG.Tree.Node.Type.Root Then
                             dropNode.Tag.Parent = Nothing
-                            If mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Connection Then
-                                dropNode.Tag.Inherit = New mRemote.Connection.Info.Inheritance(dropNode.Tag, False)
-                            ElseIf mRemote.Tree.Node.GetNodeType(dropNode) = mRemote.Tree.Node.Type.Container Then
-                                dropNode.Tag.ConnectionInfo.Inherit = New mRemote.Connection.Info.Inheritance(dropNode.Tag.ConnectionInfo, False)
+                            If mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Connection Then
+                                dropNode.Tag.Inherit = New mRemoteNG.Connection.Info.Inheritance(dropNode.Tag, False)
+                            ElseIf mRemoteNG.Tree.Node.GetNodeType(dropNode) = mRemoteNG.Tree.Node.Type.Container Then
+                                dropNode.Tag.ConnectionInfo.Inherit = New mRemoteNG.Connection.Info.Inheritance(dropNode.Tag.ConnectionInfo, False)
                             End If
                         End If
                     End If
@@ -929,23 +921,23 @@ Namespace UI
             End Sub
 
             Private Sub cMenTreeConnect_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnect.Click
-                App.Runtime.OpenConnection(mRemote.Connection.Info.Force.DoNotJump)
+                App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.DoNotJump)
             End Sub
 
             Private Sub cMenTreeConnectWithOptionsConnectToConsoleSession_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsConnectToConsoleSession.Click
-                App.Runtime.OpenConnection(mRemote.Connection.Info.Force.UseConsoleSession Or mRemote.Connection.Info.Force.DoNotJump)
+                App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.UseConsoleSession Or mRemoteNG.Connection.Info.Force.DoNotJump)
             End Sub
 
             Private Sub cMenTreeConnectWithOptionsDontConnectToConsoleSession_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsDontConnectToConsoleSession.Click
-                App.Runtime.OpenConnection(mRemote.Connection.Info.Force.DontUseConsoleSession Or mRemote.Connection.Info.Force.DoNotJump)
+                App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.DontUseConsoleSession Or mRemoteNG.Connection.Info.Force.DoNotJump)
             End Sub
 
             Private Sub cMenTreeConnectWithOptionsConnectInFullscreen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsConnectInFullscreen.Click
-                App.Runtime.OpenConnection(mRemote.Connection.Info.Force.Fullscreen Or mRemote.Connection.Info.Force.DoNotJump)
+                App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.Fullscreen Or mRemoteNG.Connection.Info.Force.DoNotJump)
             End Sub
 
             Private Sub cMenTreeConnectWithOptionsChoosePanelBeforeConnecting_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Click
-                App.Runtime.OpenConnection(mRemote.Connection.Info.Force.OverridePanel Or mRemote.Connection.Info.Force.DoNotJump)
+                App.Runtime.OpenConnection(mRemoteNG.Connection.Info.Force.OverridePanel Or mRemoteNG.Connection.Info.Force.DoNotJump)
             End Sub
 
             Private Sub cMenTreeDisconnect_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeDisconnect.Click
@@ -977,12 +969,12 @@ Namespace UI
             End Sub
 
             Private Sub cMenTreeToolsSortAscending_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeToolsSortAscending.Click
-                mRemote.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Ascending)
+                mRemoteNG.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Ascending)
                 SaveConnectionsBG()
             End Sub
 
             Private Sub cMenTreeToolsSortDescending_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeToolsSortDescending.Click
-                mRemote.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Descending)
+                mRemoteNG.Tree.Node.Sort(Me.tvConnections.SelectedNode, Tools.Controls.TreeNodeSorter.SortType.Descending)
                 SaveConnectionsBG()
             End Sub
 
@@ -995,27 +987,27 @@ Namespace UI
             End Sub
 
             Private Sub cMenTreeDuplicate_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeDuplicate.Click
-                mRemote.Tree.Node.CloneNode(tvConnections.SelectedNode)
+                mRemoteNG.Tree.Node.CloneNode(tvConnections.SelectedNode)
                 SaveConnectionsBG()
             End Sub
 
             Private Sub cMenTreeRename_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeRename.Click
-                mRemote.Tree.Node.StartRenameSelectedNode()
+                mRemoteNG.Tree.Node.StartRenameSelectedNode()
                 SaveConnectionsBG()
             End Sub
 
             Private Sub cMenTreeDelete_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeDelete.Click
-                mRemote.Tree.Node.DeleteSelectedNode()
+                mRemoteNG.Tree.Node.DeleteSelectedNode()
                 SaveConnectionsBG()
             End Sub
 
             Private Sub cMenTreeMoveUp_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeMoveUp.Click
-                mRemote.Tree.Node.MoveNodeUp()
+                mRemoteNG.Tree.Node.MoveNodeUp()
                 SaveConnectionsBG()
             End Sub
 
             Private Sub cMenTreeMoveDown_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenTreeMoveDown.Click
-                mRemote.Tree.Node.MoveNodeDown()
+                mRemoteNG.Tree.Node.MoveNodeDown()
                 SaveConnectionsBG()
             End Sub
 #End Region
@@ -1023,11 +1015,11 @@ Namespace UI
 #Region "Context Menu Actions"
             Public Sub AddConnection()
                 Try
-                    Dim nNode As TreeNode = mRemote.Tree.Node.AddNode(mRemote.Tree.Node.Type.Connection)
+                    Dim nNode As TreeNode = mRemoteNG.Tree.Node.AddNode(mRemoteNG.Tree.Node.Type.Connection)
 
                     If nNode IsNot Nothing Then
-                        Dim nConI As New mRemote.Connection.Info()
-                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Container.Info Then
+                        Dim nConI As New mRemoteNG.Connection.Info()
+                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Container.Info Then
                             nConI.Parent = Me.tvConnections.SelectedNode.Tag
                         Else
                             nConI.Inherit.TurnOffInheritanceCompletely()
@@ -1038,7 +1030,12 @@ Namespace UI
                         nNode.Tag = nConI
                         cL.Add(nConI)
 
-                        Me.tvConnections.SelectedNode.Nodes.Add(nNode)
+                        If mRemoteNG.Tree.Node.GetNodeType(Me.tvConnections.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then
+                            Me.tvConnections.SelectedNode.Parent.Nodes.Add(nNode)
+                        Else
+                            Me.tvConnections.SelectedNode.Nodes.Add(nNode)
+                        End If
+
                         Me.tvConnections.SelectedNode = nNode
                         Me.tvConnections.SelectedNode.BeginEdit()
                     End If
@@ -1049,27 +1046,32 @@ Namespace UI
 
             Public Sub AddFolder()
                 Try
-                    Dim nNode As TreeNode = mRemote.Tree.Node.AddNode(mRemote.Tree.Node.Type.Container)
+                    Dim nNode As TreeNode = mRemoteNG.Tree.Node.AddNode(mRemoteNG.Tree.Node.Type.Container)
 
                     If nNode IsNot Nothing Then
-                        Dim nContI As New mRemote.Container.Info()
-                        If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) = mRemote.Tree.Node.Type.Container Then
-                            nContI.Parent = mRemote.Tree.Node.SelectedNode.Tag
+                        Dim nContI As New mRemoteNG.Container.Info()
+                        If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) = mRemoteNG.Tree.Node.Type.Container Then
+                            nContI.Parent = mRemoteNG.Tree.Node.SelectedNode.Tag
                         Else
                             nContI.ConnectionInfo.Inherit.TurnOffInheritanceCompletely()
                         End If
 
                         nContI.TreeNode = nNode
-                        nContI.ConnectionInfo = New mRemote.Connection.Info(nContI)
+                        nContI.ConnectionInfo = New mRemoteNG.Connection.Info(nContI)
 
-                        If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) <> mRemote.Tree.Node.Type.Container Then
+                        If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) <> mRemoteNG.Tree.Node.Type.Container Then
                             nContI.ConnectionInfo.Inherit.TurnOffInheritanceCompletely()
                         End If
 
                         nNode.Tag = nContI
                         ctL.Add(nContI)
 
-                        Me.tvConnections.SelectedNode.Nodes.Add(nNode)
+                        If mRemoteNG.Tree.Node.GetNodeType(Me.tvConnections.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then
+                            Me.tvConnections.SelectedNode.Parent.Nodes.Add(nNode)
+                        Else
+                            Me.tvConnections.SelectedNode.Nodes.Add(nNode)
+                        End If
+
                         Me.tvConnections.SelectedNode = nNode
                         Me.tvConnections.SelectedNode.BeginEdit()
                     End If
@@ -1081,17 +1083,17 @@ Namespace UI
             Private Sub DisconnectConnection()
                 Try
                     If Me.tvConnections.SelectedNode IsNot Nothing Then
-                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Connection.Info Then
-                            Dim conI As mRemote.Connection.Info = Me.tvConnections.SelectedNode.Tag
+                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Connection.Info Then
+                            Dim conI As mRemoteNG.Connection.Info = Me.tvConnections.SelectedNode.Tag
                             For i As Integer = 0 To conI.OpenConnections.Count - 1
                                 conI.OpenConnections(i).Disconnect()
                             Next
                         End If
 
-                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Container.Info Then
+                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Container.Info Then
                             For Each n As TreeNode In Me.tvConnections.SelectedNode.Nodes
-                                If TypeOf n.Tag Is mRemote.Connection.Info Then
-                                    Dim conI As mRemote.Connection.Info = n.Tag
+                                If TypeOf n.Tag Is mRemoteNG.Connection.Info Then
+                                    Dim conI As mRemoteNG.Connection.Info = n.Tag
                                     For i As Integer = 0 To conI.OpenConnections.Count - 1
                                         conI.OpenConnections(i).Disconnect()
                                     Next
@@ -1108,7 +1110,7 @@ Namespace UI
                 Try
                     Windows.Show(Type.SSHTransfer)
 
-                    Dim conI As mRemote.Connection.Info = mRemote.Tree.Node.SelectedNode.Tag
+                    Dim conI As mRemoteNG.Connection.Info = mRemoteNG.Tree.Node.SelectedNode.Tag
 
                     Windows.sshtransferForm.Hostname = conI.Hostname
                     Windows.sshtransferForm.Username = conI.Username
@@ -1194,8 +1196,8 @@ Namespace UI
 
             Private Sub StartExternalApp(ByVal ExtA As Tools.ExternalApp)
                 Try
-                    If mRemote.Tree.Node.GetNodeType(mRemote.Tree.Node.SelectedNode) = mRemote.Tree.Node.Type.Connection Then
-                        ExtA.Start(mRemote.Tree.Node.SelectedNode.Tag)
+                    If mRemoteNG.Tree.Node.GetNodeType(mRemoteNG.Tree.Node.SelectedNode) = mRemoteNG.Tree.Node.Type.Connection Then
+                        ExtA.Start(mRemoteNG.Tree.Node.SelectedNode.Tag)
                     End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "cMenTreeToolsExternalAppsEntry_Click failed (UI.Window.Tree)" & vbNewLine & ex.Message, True)
@@ -1205,11 +1207,11 @@ Namespace UI
 
 #Region "Menu"
             Private Sub mMenViewExpandAllFolders_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewExpandAllFolders.Click
-                mRemote.Tree.Node.ExpandAllNodes()
+                mRemoteNG.Tree.Node.ExpandAllNodes()
             End Sub
 
             Private Sub mMenViewCollapseAllFolders_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewCollapseAllFolders.Click
-                mRemote.Tree.Node.CollapseAllNodes()
+                mRemoteNG.Tree.Node.CollapseAllNodes()
             End Sub
 #End Region
 
@@ -1232,7 +1234,7 @@ Namespace UI
             End Sub
 
             Private Sub txtSearch_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtSearch.TextChanged
-                Me.tvConnections.SelectedNode = mRemote.Tree.Node.Find(Me.tvConnections.Nodes(0), Me.txtSearch.Text)
+                Me.tvConnections.SelectedNode = mRemoteNG.Tree.Node.Find(Me.tvConnections.Nodes(0), Me.txtSearch.Text)
             End Sub
 
             Private Sub tvConnections_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles tvConnections.KeyPress
@@ -1251,7 +1253,7 @@ Namespace UI
             Private Sub tvConnections_KeyDown(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyEventArgs) Handles tvConnections.KeyDown
                 Try
                     If e.KeyCode = Keys.Enter Then
-                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemote.Connection.Info Then
+                        If TypeOf Me.tvConnections.SelectedNode.Tag Is mRemoteNG.Connection.Info Then
                             e.Handled = True
                             App.Runtime.OpenConnection()
                         Else

mRemoteV1/UI/UI.Window.UltraVNCSC.vb

@@ -1,6 +1,5 @@
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
-'Imports AxViewerX
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -54,7 +53,7 @@ Namespace UI
                 Me.ClientSize = New System.Drawing.Size(446, 362)
                 Me.Controls.Add(Me.pnlContainer)
                 Me.Controls.Add(Me.tsMain)
-                Me.Icon = Global.mRemote.My.Resources.UVNC_SC_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.UVNC_SC_Icon
                 Me.Name = "UltraVNCSC"
                 Me.TabText = "UltraVNC SC"
                 Me.Text = "UltraVNC SC"
@@ -86,7 +85,7 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                btnDisconnect.Text = Language.Base.Disconnect
+                btnDisconnect.Text = My.Resources.strButtonDisconnect
             End Sub
 
             Private Sub StartListening()
@@ -104,13 +103,13 @@ Namespace UI
                     'vnc.Show()
 
                     'vnc.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
-                    'vnc.ListeningText = Language.Base.ListeningForIncomingVNCConnections & " " & My.Settings.UVNCSCPort
+                    'vnc.ListeningText = My.Resources.strInheritListeningForIncomingVNCConnections & " " & My.Settings.UVNCSCPort
 
                     'vnc.ListenEx(My.Settings.UVNCSCPort)
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" & vbNewLine & ex.Message, False)
                     Close()
-                End Try   
+                End Try
             End Sub
 
             Private Sub SetupLicense()

mRemoteV1/UI/UI.Window.Update.vb

@@ -1,7 +1,7 @@
 Imports WeifenLuo.WinFormsUI.Docking
 Imports System.Threading
 Imports System.IO
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 
 Namespace UI
     Namespace Window
@@ -182,7 +182,7 @@ Namespace UI
                 Me.Controls.Add(Me.lblCurrentVersion)
                 Me.Controls.Add(Me.pnlUp)
                 Me.Controls.Add(Me.lblStatus)
-                Me.Icon = Global.mRemote.My.Resources.Resources.Update_Icon
+                Me.Icon = Global.mRemoteNG.My.Resources.Resources.Update_Icon
                 Me.Name = "Update"
                 Me.TabText = "Update"
                 Me.Text = "Update"
@@ -227,7 +227,7 @@ Namespace UI
 
                     uT.Start()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "CheckForUpdate (UI.Window.Update) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -243,7 +243,7 @@ Namespace UI
                         RaiseEvent UpdateCheckCompleted(False)
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "CheckForUpdateBG (UI.Window.Update) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -254,7 +254,7 @@ Namespace UI
                     If UpdateAvailable = True Then
                         My.Settings.UpdatePending = True
 
-                        SetStatus(Color.OrangeRed, Language.Base.UpdateAvailable)
+                        SetStatus(Color.OrangeRed, My.Resources.strUpdateAvailable)
                         SetVisible(pnlUp, True)
 
                         Dim uI As App.Update.Info = uD.GetUpdateInfo()
@@ -278,7 +278,7 @@ Namespace UI
                     Else
                         My.Settings.UpdatePending = False
 
-                        SetStatus(Color.ForestGreen, Language.Base.NoUpdateAvailable)
+                        SetStatus(Color.ForestGreen, My.Resources.strNoUpdateAvailable)
                         SetVisible(pnlUp, False)
 
                         Dim uI As App.Update.Info = uD.GetUpdateInfo()
@@ -286,7 +286,7 @@ Namespace UI
                         SetAvailableVersionText(uI.Version.ToString)
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "UpdateCheckComplete (UI.Window.Update) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateCheckCompleteFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -373,16 +373,15 @@ Namespace UI
             End Sub
 
             Private Sub ApplyLanguage()
-                btnCheckForUpdate.Text = Language.Base.CheckForUpdate
-                lblChangeLogLabel.Text = My.Resources.strChangeLogLabel
-                btnDownload.Text = Language.Base.DownloadAndInstall
-                lblCurrentVersionLabel.Text = Language.Base.AvailableVersion & ":"
-                lblInstalledVersionLabel.Text = Language.Base.CurrentVersion & ":"
-                lblAvailableVersion.Text = Language.Base.Version
-                lblCurrentVersion.Text = Language.Base.Version
-                lblStatus.Text = Language.Base.Status
-                TabText = Language.Base.Menu_Update
-                Text = Language.Base.Menu_Update
+                btnCheckForUpdate.Text = My.Resources.strCheckForUpdate
+                lblChangeLogLabel.Text = My.Resources.strLabelChangeLog
+                btnDownload.Text = My.Resources.strDownloadAndInstall
+                lblCurrentVersionLabel.Text = My.Resources.strAvailableVersion & ":"
+                lblInstalledVersionLabel.Text = My.Resources.strCurrentVersion & ":"
+                lblAvailableVersion.Text = My.Resources.strVersion
+                lblCurrentVersion.Text = My.Resources.strVersion
+                TabText = My.Resources.strMenuCheckForUpdates
+                Text = My.Resources.strMenuCheckForUpdates
             End Sub
 
             Private Sub btnCheckForUpdate_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnCheckForUpdate.Click
@@ -405,7 +404,7 @@ Namespace UI
                         End If
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "DownloadUpdate (UI.Window.Update) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -420,13 +419,13 @@ Namespace UI
                     Me.btnDownload.Enabled = True
 
                     If Success = True Then
-                        If MessageBox.Show(Language.Base.UpdateDownloadComplete, Language.Base.Menu_Update, MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) = System.Windows.Forms.DialogResult.OK Then
+                        If MessageBox.Show(My.Resources.strUpdateDownloadComplete, My.Resources.strMenuCheckForUpdates, MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) = System.Windows.Forms.DialogResult.OK Then
                             Try
                                 App.Runtime.Shutdown.BeforeQuit()
 
                                 Process.Start(uD.curUI.UpdateLocation)
                             Catch ex As Exception
-                                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Error starting update!" & vbNewLine & ex.Message)
+                                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateStartFailed & vbNewLine & ex.Message)
                             End Try
 
                             End
@@ -434,14 +433,14 @@ Namespace UI
                             Try
                                 File.Delete(uD.curUI.UpdateLocation)
                             Catch ex As Exception
-                                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Error deleting update file!" & vbNewLine & ex.Message)
+                                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDeleteFailed & vbNewLine & ex.Message)
                             End Try
                         End If
                     Else
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "Update download failed!")
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadFailed)
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "DLCompleted (UI.Window.Update) failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strUpdateDownloadCompleteFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region

mRemoteV1/app.config

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="mRemote.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-        </sectionGroup>
-        
         <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net-net-1.0" />
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="mRemote.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="mRemoteNG.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <log4net>
@@ -21,15 +17,15 @@
 			</root>
 			
 			<appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-				<file value="mRemoteNG.log" />
+				<file value="${USERPROFILE)\AppData\Local\mRemoteNG\mRemoteNG.log" />
 				<!-- Example using environment variables in params -->
 				<!-- <file value="${TMP}\log-file.txt" /> -->
 				<appendToFile value="true" />
 				<!-- An alternate output encoding can be specified -->
 				<!-- <encoding value="unicodeFFFE" /> -->
 				<layout type="log4net.Layout.PatternLayout">
-					<header value="[mRemote Start]&#xD;&#xA;" />
-					<footer value="[mRemote Exit]&#xD;&#xA;" />
+					<header value="[mRemoteNG Start]&#xD;&#xA;" />
+					<footer value="[mRemoteNG Exit]&#xD;&#xA;" />
 					<conversionPattern value="%date [%thread] %-5level- %message%newline" />
 				</layout>
 				<!-- Alternate layout using XML			
@@ -59,7 +55,7 @@
         </sharedListeners>
     </system.diagnostics>
     <userSettings>
-        <mRemote.My.MySettings>
+        <mRemoteNG.My.MySettings>
             <setting name="MainFormLocation" serializeAs="String">
                 <value>999, 999</value>
             </setting>
@@ -174,12 +170,6 @@
             <setting name="ConDefaultDescription" serializeAs="String">
                 <value />
             </setting>
-            <setting name="ConDefaultIcon" serializeAs="String">
-                <value>mRemote</value>
-            </setting>
-            <setting name="ConDefaultPanel" serializeAs="String">
-                <value>General</value>
-            </setting>
             <setting name="ConDefaultUsername" serializeAs="String">
                 <value />
             </setting>
@@ -504,16 +494,36 @@
             <setting name="UpdatePending" serializeAs="String">
                 <value>False</value>
             </setting>
-        </mRemote.My.MySettings>
-    </userSettings>
-    <applicationSettings>
-        <mRemote.My.MySettings>
             <setting name="ConDefaultRDGatewayUsageMethod" serializeAs="String">
                 <value>Never</value>
             </setting>
             <setting name="ConDefaultRDGatewayUseConnectionCredentials" serializeAs="String">
                 <value>Yes</value>
             </setting>
-        </mRemote.My.MySettings>
-    </applicationSettings>
+            <setting name="ConDefaultIcon" serializeAs="String">
+                <value>mRemoteNG</value>
+            </setting>
+            <setting name="InhDefaultRDGatewayUsageMethod" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="InhDefaultRDGatewayHostname" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="InhDefaultRDGatewayUsername" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="InhDefaultRDGatewayPassword" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="InhDefaultRDGatewayDomain" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="InhDefaultRDGatewayUseConnectionCredentials" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="RdpReconnectionCount" serializeAs="String">
+                <value>5</value>
+            </setting>
+        </mRemoteNG.My.MySettings>
+    </userSettings>
 </configuration>