Updated BUILD.CMD, CHANGELOG.TXT, and AssemblyInfo.vb for version 1.68.

This reverts commit 3592fbc418.

.gitignore

@@ -1,8 +1,19 @@
-Installer/bin
+Release
 mRemoteV1/bin
 mRemoteV1/obj
 mRemoteV1/publish
 *.pfx
 *.suo
 *.vbproj.user
-Thumbs.db
+Thumbs.db
+[Dd]ebug/
+_Re[Ss]harper.*
+*.resharper
+*.resharper.user
+*.suo
+*.cache
+*~
+*.swp
+*.user*
+*.pidb
+*.gpState

BUILD.CMD

@@ -0,0 +1,51 @@
+@echo off
+
+REM SET VERSIONTAG=RC5
+
+SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
+SET DEVENV="devenv.exe"
+SET MAKENSIS="%ProgramFiles(x86)%\NSIS\Unicode\makensis.exe"
+SET RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+
+call %VCVARSALL% x86 > NUL 2>&1
+
+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 Getting product version...
+%MAKENSIS% "%~dp0\Installer\GetVersion.nsi"
+"%~dp0\Release\GetVersion.exe"
+call "%~dp0\Release\Version.cmd"
+
+echo Creating installer package...
+if defined VERSIONTAG (
+	%MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% "%~dp0\Installer\mRemote.nsi"
+
+	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
+	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.zip"
+) else (
+	%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
+
+	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%.zip"
+	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%.zip"
+)
+
+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"
+
+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

@@ -0,0 +1,106 @@
+Contributors
+============
+
+Lionel Caignec
+Felix Deimel
+Holger Henke
+Tom Hiller
+Riley McArdle
+Apisitt Rattana
+Andreas Rehm
+David Vidmar
+
+
+Included Source Code
+====================
+
+Command Line Arguments Parser 1.0
+Copyright <20> 2002 Richard Lopes
+MIT License
+http://www.codeproject.com/KB/recipes/command_line.aspx
+
+
+Included Components
+===================
+
+ADTree 1.0
+Copyright <20> 2004 Marc Merritt
+Copyright <20> 2008 Felix Deimel
+http://www.codeproject.com/KB/selection/ADPickerCtrl.aspx
+
+DiffieHellman 1.0
+Copyright <20> 2003 The Mentalis.org Team
+Modified New BSD License
+http://www.mentalis.org/
+
+DockPanel Suite 2.3.1
+Copyright <20> 2007 Weifen Luo
+MIT License
+http://sourceforge.net/projects/dockpanelsuite/
+
+Emergent OnLine WTSCOM 2.0.6.0
+Copyright <20> 2001-2003 Emergent OnLine
+http://www.go-eol.com/
+
+FilteredPropertyGrid 1.0.0.0
+Copyright <20> 2006 Azuria
+http://www.codeproject.com/KB/cs/FilteredPropertyGrid.aspx
+
+GeckoFX 1.8.1.4
+Copyright <20> 2008 Skybound Software
+Mozilla Public License 1.1
+http://www.geckofx.org/
+
+IPTextBox 1.1
+Copyright <20> 2006 Matthew Kleinwaks
+Copyright <20> 2008 Felix Deimel
+http://www.vbforums.com/showthread.php?t=430169
+
+log4net 1.2.10.0
+Copyright <20> 2001-2006 The Apache Software Foundation
+Apache License Version 2.0
+http://logging.apache.org/log4net/
+
+Magic Library 1.7.4
+Copyright <20> 2002-2003 Crownwood Consulting, Ltd.
+Freely redistributable with attribution
+http://www.dotnetmagic.com/magic_download.html
+
+Mentalis.org Security Library 1.0.13.715
+Copyright <20> 2002-2005 The Mentalis.org Team
+Modified New BSD License
+http://www.mentalis.org/
+
+MiniGeckoBrowser 1.0
+Copyright <20> 2008 Felix Deimel
+http://www.appjuice.org/
+
+MiniTabControl 1.0
+Copyright <20> 2008 Felix Deimel
+http://www.appjuice.org/
+
+PuTTY 0.60
+Copyright <20> 1997-2007 Simon Tatham
+MIT License
+http://www.chiark.greenend.org.uk/~sgtatham/putty/
+
+SharpSSH 1.1.1.13
+Copyright <20> 2002-2008 Atsuhiko Yamanaka, JCraft, Inc.
+Copyright <20> 2007 Tamir Gal
+BSD Style License
+http://www.tamirgal.com/blog/page/SharpSSH.aspx
+
+Silk Icon Set
+Copyright <20> 2005-2008 FAMFAMFAM
+Creative Commons Attribution 2.5 License
+http://www.famfamfam.com/
+
+Vista TaskDialog Wrapper and Emulator 1.0
+Copyright <20> 2007-2009 Hedley Muscroft
+Code Project Open License (CPOL)
+http://www.codeproject.com/KB/vista/Vista_TaskDialog_Wrapper.aspx
+
+VncSharp 1.0
+Copyright <20> 2004-2009 David Humphrey
+GNU General Public License (GPL) Version 2
+http://cdot.senecac.on.ca/projects/vncsharp/

Installer/GetVersion.nsi

@@ -0,0 +1,30 @@
+!define AppFile "$EXEDIR\..\mRemoteV1\bin\Release\mRemoteNG.exe"
+!define VersionCmdFile "$EXEDIR\Version.cmd"
+!define VersionNshFile "$EXEDIR\Version.nsh"
+
+OutFile "..\Release\GetVersion.exe"
+SilentInstall silent
+RequestExecutionLevel user
+
+Section
+	## Get file version
+	GetDllVersion "${AppFile}" $R0 $R1
+	IntOp $R3 $R0 / 0x00010000
+	IntOp $R4 $R0 & 0x0000FFFF
+	IntOp $R5 $R1 / 0x00010000
+	IntOp $R6 $R1 & 0x0000FFFF
+	StrCpy $R1 "$R3.$R4.$R5.$R6"
+	StrCpy $R2 "$R3.$R4"
+
+	FileOpen $R0 "${VersionCmdFile}" w
+	FileWrite $R0 '@echo off$\r$\n'
+	FileWrite $R0 'SET PRODUCT_VERSION_SHORT=$R2$\r$\n'
+	FileClose $R0
+
+	FileOpen $R0 "${VersionNshFile}" w
+	FileWrite $R0 '!define PRODUCT_VERSION "$R1"$\r$\n'
+	FileWrite $R0 '!define PRODUCT_VERSION_SHORT "$R2"$\r$\n'
+	FileWrite $R0 '!define PRODUCT_VERSION_MAJOR "$R3"$\r$\n'
+	FileWrite $R0 '!define PRODUCT_VERSION_MINOR "$R4"$\r$\n'
+	FileClose $R0
+SectionEnd

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,31 @@
+!define LanguageNameEnglish "English"
+!insertmacro MUI_LANGUAGE "English"
+!include "Language\english.nsi"
+
+!define LanguageNameCzech "Čeština"
+!insertmacro MUI_LANGUAGE "Czech"
+!include "Language\czech.nsi"
+
+!define LanguageNameGerman "Deutsch"
+!insertmacro MUI_LANGUAGE "German"
+!include "Language\german.nsi"
+
+!define LanguageNameSpanish "Español"
+!insertmacro MUI_LANGUAGE "Spanish"
+!include "Language\spanish.nsi"
+
+!define LanguageNameFrench "Français"
+!insertmacro MUI_LANGUAGE "French"
+!include "Language\french.nsi"
+
+!define LanguageNameDutch "Nederlands"
+!insertmacro MUI_LANGUAGE "Dutch"
+!include "Language\dutch.nsi"
+
+!define LanguageNamePolish "Polski"
+!insertmacro MUI_LANGUAGE "Polish"
+!include "Language\polish.nsi"
+
+!define LanguageNameThai "ภาษาไทย"
+!insertmacro MUI_LANGUAGE "Thai"
+!include "Language\thai.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/Language/thai.nsi

@@ -0,0 +1,17 @@
+; Thai installer translation
+; Contributed by Apisitt Rattana
+
+; Start mRemoteNG after installation
+LangString LaunchMremoteNow ${LANG_THAI} "ขณะนี้กำลังติดตั้ง mRemoteNG"
+
+; Installer Language
+LangString InstallerLanguage ${LANG_THAI} "ภาษาสำหรับการติดตั้ง"
+
+; Select installer Language
+LangString SelectInstallerLanguage ${LANG_THAI} "กรุณาเลือกภาษาสำหรับการติดตั้ง"
+
+; Requires .NET Framework
+LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG มีความต้องการ  Microsoft .NET Framework 2.0. เป็นพื้นฐาน"
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_THAI} "คุณต้องเป็นสมาชิกในกลุ่มของ 'Power Users' หรือ 'Administrators' เพื่อการติดตั้ง mRemoteNG"

Installer/mRemote.nsi

@@ -1,34 +1,40 @@
-!include "MUI.nsh"
+!include "MUI.nsh"
 !include "WordFunc.nsh"
 !insertmacro VersionCompare
 
-!DEFINE PRODUCT_VERSION_MAJOR 1
-!DEFINE PRODUCT_VERSION_MINOR 62
+!include "..\Release\Version.nsh"
 
-!DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
-!DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
+; This will be passed in using the /D switch by BUILD.CMD
+!ifdef PRODUCT_VERSION_TAG
+	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
+	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}-${PRODUCT_VERSION_TAG}"
+!else
+	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
+	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}"
+!endif
 
 ; Global Variables
 Var InstallDotNET
 
 ; Basic Config
-Name "mRemoteNG ${PRODUCT_VERSION}"
-OutFile "bin\mRemoteNG-Installer-${PRODUCT_VERSION}.exe"
+Name "mRemoteNG ${PRODUCT_VERSION_FRIENDLY}"
+OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION_TAGGED}.exe"
 SetCompressor /SOLID lzma
 InstallDir "$PROGRAMFILES\mRemoteNG"
 InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath"
 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}
+VIProductVersion ${PRODUCT_VERSION}
+VIAddVersionKey "ProductName" "mRemoteNG"
+VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION}
+VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2011 Riley McArdle"
+VIAddVersionKey "FileDescription" "mRemoteNG ${PRODUCT_VERSION_FRIENDLY} Installer"
+VIAddVersionKey "FileVersion" ${PRODUCT_VERSION}
 
 ; Design
+!define MUI_ICON "Setup_Install.ico"
+!define MUI_UNICON "RecycleBin.ico"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP "header.bmp" ; optional
 !define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
@@ -48,7 +54,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 +61,75 @@ 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 ${LANG_THAI}
+	Push ${LanguageNameThai}
+	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 +147,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\*.*"
@@ -106,7 +177,7 @@ Section "" ; Install
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "mRemoteNG"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "Publisher" "mRemoteNG"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 5816
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 6464
 
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}
@@ -125,6 +196,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.sln

@@ -5,12 +5,18 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mRemoteV1", "mRemoteV1\mRem
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Portable|Any CPU = Debug Portable|Any CPU
 		Debug|Any CPU = Debug|Any CPU
+		Release Portable|Any CPU = Release Portable|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU
+		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

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

@@ -11,15 +11,14 @@ Namespace App
             Public Shared ReadOnly HomePath As String = My.Application.Info.DirectoryPath
             Public Shared EncryptionKey As String = "mR3m"
             Public Shared ReportingFilePath As String = ""
-            Public Shared SmartCodeURL As String = "http://www.s-code.com/products/viewerx/"
-            Public Shared FamFamFamURL As String = "http://www.famfamfam.com/"
         End Class
 
         Public Class Settings
-            'Exchange to make portable/normal
-            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName
-            'Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
-
+#If Not PORTABLE Then
+            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
             Public Shared ReadOnly LayoutFileName As String = "pnlLayout.xml"
             Public Shared ReadOnly ExtAppsFilesName As String = "extApps.xml"
         End Class
@@ -37,7 +36,7 @@ Namespace App
             Public Shared ReadOnly DefaultConnectionsPath As String = App.Info.Settings.SettingsPath
             Public Shared ReadOnly DefaultConnectionsFile As String = "confCons.xml"
             Public Shared ReadOnly DefaultConnectionsFileNew As String = "confConsNew.xml"
-            Public Shared ReadOnly ConnectionFileVersion As Double = 2.1
+            Public Shared ReadOnly ConnectionFileVersion As Double = 2.3
         End Class
 
         Public Class Credentials

mRemoteV1/App/App.Native.vb

@@ -20,7 +20,7 @@ Namespace App
         End Function
 
         <DllImport("user32.dll")> _
-        Public Shared Function SetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer, ByVal dwNewLong As Integer) As Integer
+        Public Shared Function SetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer, ByVal dwNewLong As Long) As Integer
         End Function
 
         <DllImport("user32.dll", SetLastError:=True)> _
@@ -87,6 +87,14 @@ 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
@@ -117,6 +125,10 @@ Namespace App
         Public Const MF_BYPOSITION As Integer = &H400
         Public Const MF_POPUP As Integer = &H10
 
+        Public Const WM_GETTEXT As Integer = &HD
+        Public Const WM_ACTIVATEAPP As Integer = &H1C
+        Public Const WM_WINDOWPOSCHANGED As Integer = &H47
+
         Public Const WM_SYSCOMMAND As Integer = &H112
 
         Public Const WM_LBUTTONDOWN As Integer = &H201
@@ -129,6 +141,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,6 +2,9 @@
 Imports System.IO
 Imports Crownwood
 Imports System.Threading
+Imports System.Xml
+Imports System.Environment
+Imports System.Management
 
 Namespace App
     Public Class Runtime
@@ -33,13 +36,12 @@ 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()
 #End Region
 
-
         Public Class Windows
             Public Shared treeForm As UI.Window.Tree
             Public Shared treePanel As New DockContent
@@ -53,7 +55,7 @@ Namespace App
             Public Shared screenshotPanel As New DockContent
             Public Shared quickyForm As UI.Window.QuickConnect
             Public Shared quickyPanel As New DockContent
-            Public Shared optionsForm As UI.Window.Options
+            Public Shared optionsForm As frmOptions
             Public Shared optionsPanel As New DockContent
             Public Shared saveasForm As UI.Window.SaveAs
             Public Shared saveasPanel As New DockContent
@@ -92,9 +94,7 @@ Namespace App
 
                             Windows.adimportPanel.Show(frmMain.pnlDock)
                         Case UI.Window.Type.Options
-                            Windows.optionsForm = New UI.Window.Options(Windows.optionsPanel)
-                            Windows.optionsPanel = Windows.optionsForm
-
+                            Windows.optionsForm = New frmOptions(Windows.optionsPanel)
                             Windows.optionsForm.Show(frmMain.pnlDock)
                         Case UI.Window.Type.SaveAs
                             Windows.saveasForm = New UI.Window.SaveAs(Windows.saveasPanel)
@@ -146,6 +146,11 @@ Namespace App
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "Show (App.Runtime.Windows) failed" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
+
+            Public Shared Sub ShowUpdatesTab()
+                Windows.optionsForm = New frmOptions(Windows.optionsPanel)
+                Windows.optionsForm.Show(frmMain.pnlDock, 5)
+            End Sub
         End Class
 
         Public Class Screens
@@ -172,55 +177,26 @@ Namespace App
         End Class
 
         Public Class Startup
-            Public Shared Sub CreatePanels(Optional ByVal ShowDefault As Boolean = False)
+            Public Shared Sub CreatePanels()
                 Windows.configForm = New UI.Window.Config(Windows.configPanel)
                 Windows.configPanel = Windows.configForm
 
-                If ShowDefault Then
-                    Windows.configPanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                End If
-
                 Windows.treeForm = New UI.Window.Tree(Windows.treePanel)
                 Windows.treePanel = Windows.treeForm
                 Tree.Node.TreeView = Windows.treeForm.tvConnections
 
-                If ShowDefault Then
-                    Windows.treePanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                    Windows.treePanel.DockTo(frmMain.pnlDock.Panes(frmMain.pnlDock.Panes.Count - 1), DockStyle.Top, 0)
-                End If
-
                 Windows.errorsForm = New UI.Window.ErrorsAndInfos(Windows.errorsPanel)
                 Windows.errorsPanel = Windows.errorsForm
 
-                If ShowDefault Then
-                    Windows.errorsPanel.AutoHidePortion = 150
-                    Windows.errorsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                End If
-
                 Windows.sessionsForm = New UI.Window.Sessions(Windows.sessionsPanel)
                 Windows.sessionsPanel = Windows.sessionsForm
 
-                If ShowDefault Then
-                    Windows.sessionsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.sessionsPanel.DockTo(frmMain.pnlDock.Panes(frmMain.pnlDock.Panes.Count - 1), DockStyle.Bottom, 0)
-                End If
-
                 Windows.screenshotForm = New UI.Window.ScreenshotManager(Windows.screenshotPanel)
                 Windows.screenshotPanel = Windows.screenshotForm
 
-                If ShowDefault Then
-                    Windows.screenshotPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.screenshotForm.Hide()
-                End If
-
                 Windows.quickyForm = New UI.Window.QuickConnect(Windows.quickyPanel)
                 Windows.quickyPanel = Windows.quickyForm
 
-                If ShowDefault Then
-                    Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.quickyForm.Hide()
-                End If
-
                 Windows.updateForm = New UI.Window.Update(Windows.updatePanel)
                 Windows.updatePanel = Windows.updateForm
 
@@ -228,6 +204,29 @@ Namespace App
                 Windows.AnnouncementPanel = Windows.AnnouncementForm
             End Sub
 
+            Public Shared Sub SetDefaultLayout()
+                frmMain.pnlDock.Visible = False
+
+                frmMain.pnlDock.DockLeftPortion = 0.25
+                frmMain.pnlDock.DockRightPortion = 0.25
+                frmMain.pnlDock.DockTopPortion = 0.25
+                frmMain.pnlDock.DockBottomPortion = 0.25
+
+                Windows.treePanel.Show(frmMain.pnlDock, DockState.DockLeft)
+                Windows.configPanel.Show(frmMain.pnlDock)
+                Windows.configPanel.DockTo(Windows.treePanel.Pane, DockStyle.Bottom, -1)
+
+                Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+                Windows.screenshotPanel.Show(Windows.quickyPanel.Pane, Windows.quickyPanel)
+                Windows.sessionsPanel.Show(Windows.quickyPanel.Pane, Windows.screenshotPanel)
+                Windows.errorsPanel.Show(Windows.quickyPanel.Pane, Windows.sessionsPanel)
+
+                Windows.screenshotForm.Hide()
+                Windows.quickyForm.Hide()
+
+                frmMain.pnlDock.Visible = True
+            End Sub
+
             Public Shared Sub GetConnectionIcons()
                 Dim iPath As String = My.Application.Info.DirectoryPath & "\Icons\"
 
@@ -248,9 +247,30 @@ 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")
+                log.InfoFormat("{0} started.", My.Application.Info.ProductName)
+                log.InfoFormat("Command Line: {0}", Environment.GetCommandLineArgs)
+                Try
+                    Dim servicePack As Integer
+                    For Each managementObject As ManagementObject In New ManagementObjectSearcher("SELECT * FROM Win32_OperatingSystem").Get()
+                        servicePack = managementObject.GetPropertyValue("ServicePackMajorVersion")
+                        If servicePack = 0 Then
+                            log.InfoFormat("{0} {1}", managementObject.GetPropertyValue("Caption").Trim, managementObject.GetPropertyValue("OSArchitecture"))
+                        Else
+                            log.InfoFormat("{0} Service Pack {1} {2}", managementObject.GetPropertyValue("Caption").Trim, servicePack.ToString, managementObject.GetPropertyValue("OSArchitecture"))
+                        End If
+                    Next
+                Catch ex As Exception
+                    log.WarnFormat("Error retrieving operating system information from WMI. {0}", ex.Message)
+                End Try
+                log.InfoFormat("Microsoft .NET Framework {0}", System.Environment.Version.ToString)
+#If Not PORTABLE Then
+                log.InfoFormat("{0} {1}", My.Application.Info.ProductName.ToString, My.Application.Info.Version.ToString)
+#Else
+                log.InfoFormat("{0} {1} {2}", My.Application.Info.ProductName.ToString, My.Application.Info.Version.ToString, My.Resources.strLabelPortableEdition)
+#End If
+                log.InfoFormat("System Culture: {0}/{1}", Threading.Thread.CurrentThread.CurrentUICulture.Name, Threading.Thread.CurrentThread.CurrentUICulture.NativeName)
             End Sub
 
             Public Shared Sub UpdateCheck()
@@ -334,7 +354,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
@@ -372,7 +391,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
 
@@ -388,8 +407,10 @@ Namespace App
                 Try
                     LastSQLUpdate = Nothing
                     RemoveHandler Tools.Misc.SQLUpdateCheckFinished, AddressOf SQLUpdateCheckFinished
-                    tmrSqlWatcher.Stop()
-                    tmrSqlWatcher.Close()
+                    If tmrSqlWatcher IsNot Nothing Then
+                        tmrSqlWatcher.Stop()
+                        tmrSqlWatcher.Close()
+                    End If
                 Catch ex As Exception
                 End Try
             End Sub
@@ -414,20 +435,21 @@ 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
 
                     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
@@ -437,7 +459,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
@@ -452,6 +473,8 @@ Namespace App
                 My.Settings.ConDefaultCacheBitmaps = .CacheBitmaps
                 My.Settings.ConDefaultDisplayWallpaper = .DisplayWallpaper
                 My.Settings.ConDefaultDisplayThemes = .DisplayThemes
+                My.Settings.ConDefaultEnableFontSmoothing = .EnableFontSmoothing
+                My.Settings.ConDefaultEnableDesktopComposition = .EnableDesktopComposition
                 My.Settings.ConDefaultRedirectKeys = .RedirectKeys
                 My.Settings.ConDefaultRedirectDiskDrives = .RedirectDiskDrives
                 My.Settings.ConDefaultRedirectPrinters = .RedirectPrinters
@@ -474,13 +497,19 @@ Namespace App
                 My.Settings.ConDefaultVNCSmartSizeMode = .VNCSmartSizeMode.ToString
                 My.Settings.ConDefaultVNCViewOnly = .VNCViewOnly
                 My.Settings.ConDefaultExtApp = .ExtApp
+                My.Settings.ConDefaultRDGatewayUsageMethod = .RDGatewayUsageMethod.ToString
+                My.Settings.ConDefaultRDGatewayHostname = .RDGatewayHostname
+                My.Settings.ConDefaultRDGatewayUsername = .RDGatewayUsername
+                My.Settings.ConDefaultRDGatewayPassword = .RDGatewayPassword
+                My.Settings.ConDefaultRDGatewayDomain = .RDGatewayDomain
+                My.Settings.ConDefaultRDGatewayUseConnectionCredentials = .RDGatewayUseConnectionCredentials.ToString
             End With
         End Sub
 #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
@@ -506,6 +535,8 @@ Namespace App
                 My.Settings.InhDefaultCacheBitmaps = .CacheBitmaps
                 My.Settings.InhDefaultDisplayWallpaper = .DisplayWallpaper
                 My.Settings.InhDefaultDisplayThemes = .DisplayThemes
+                My.Settings.InhDefaultEnableFontSmoothing = .EnableFontSmoothing
+                My.Settings.InhDefaultEnableDesktopComposition = .EnableDesktopComposition
                 My.Settings.InhDefaultRedirectKeys = .RedirectKeys
                 My.Settings.InhDefaultRedirectDiskDrives = .RedirectDiskDrives
                 My.Settings.InhDefaultRedirectPrinters = .RedirectPrinters
@@ -516,6 +547,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
@@ -527,14 +559,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
@@ -544,13 +588,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")
@@ -564,11 +608,9 @@ Namespace App
 
                 pnlcForm.Show(frmMain.pnlDock, DockState.Document)
 
-                If NoTabber = True Then
+                If NoTabber Then
                     TryCast(cForm, UI.Window.Connection).TabController.Dispose()
-                End If
-
-                If NoTabber = False Then
+                Else
                     wL.Add(cForm)
                 End If
 
@@ -584,7 +626,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("&", "&&"))
@@ -600,7 +642,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))
@@ -631,37 +673,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
@@ -671,9 +705,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
 
@@ -730,18 +766,28 @@ Namespace App
                         End If
                     Else
                         If My.Settings.LoadConsFromCustomLocation = False Then
-                            conL.ConnectionFileName = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile
+                            Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName & "\" & App.Info.Connections.DefaultConnectionsFile
+                            Dim newPath As String = App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile
+#If Not PORTABLE Then
+                            If File.Exists(oldPath) Then
+                                conL.ConnectionFileName = oldPath
+                            Else
+                                conL.ConnectionFileName = newPath
+                            End If
+#Else
+                            conL.ConnectionFileName = newPath
+#End If
                         Else
                             conL.ConnectionFileName = My.Settings.CustomConsPath
+                            End If
                         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
@@ -752,11 +798,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
 
@@ -777,6 +822,7 @@ Namespace App
 
                 conL.UseSQL = My.Settings.UseSQLServer
                 conL.SQLHost = My.Settings.SQLHost
+                conL.SQLDatabaseName = My.Settings.SQLDatabaseName
                 conL.SQLUsername = My.Settings.SQLUser
                 conL.SQLPassword = Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey)
                 conL.SQLUpdate = Update
@@ -791,7 +837,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
 
@@ -806,9 +852,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
@@ -832,7 +878,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
 
@@ -847,7 +893,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
@@ -869,6 +915,8 @@ Namespace App
                                     Select Case pValue
                                         Case 8
                                             nConI.Colors = Connection.Protocol.RDP.RDPColors.Colors256
+                                        Case 15
+                                            nConI.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit
                                         Case 16
                                             nConI.Colors = Connection.Protocol.RDP.RDPColors.Colors16Bit
                                         Case 24
@@ -904,6 +952,18 @@ Namespace App
                                     Else
                                         nConI.DisplayThemes = False
                                     End If
+                                Case "allow font smoothing"
+                                    If pValue = 1 Then
+                                        nConI.EnableFontSmoothing = True
+                                    Else
+                                        nConI.EnableFontSmoothing = False
+                                    End If
+                                Case "allow desktop composition"
+                                    If pValue = 1 Then
+                                        nConI.EnableDesktopComposition = True
+                                    Else
+                                        nConI.EnableDesktopComposition = False
+                                    End If
                                 Case "redirectsmartcards"
                                     If pValue = 1 Then
                                         nConI.RedirectSmartCards = True
@@ -951,18 +1011,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
@@ -1077,6 +1137,7 @@ Namespace App
                 If My.Settings.UseSQLServer = True Then
                     conS.SaveFormat = Config.Connections.Save.Format.SQL
                     conS.SQLHost = My.Settings.SQLHost
+                    conS.SQLDatabaseName = My.Settings.SQLDatabaseName
                     conS.SQLUsername = My.Settings.SQLUser
                     conS.SQLPassword = Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey)
                 End If
@@ -1091,11 +1152,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
 
@@ -1106,7 +1168,6 @@ Namespace App
                     End If
                 End If
 
-                Dim conS As New Config.Connections.Save
 
                 Dim sD As SaveFileDialog = Tools.Controls.ConnectionsSaveAsDialog
 
@@ -1147,7 +1208,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
@@ -1159,57 +1220,31 @@ Namespace App
 
         Public Shared Function CreateQuicky(ByVal ConString As String, Optional ByVal Protocol As Connection.Protocol.Protocols = Connection.Protocol.Protocols.NONE) As Connection.Info
             Try
-                nCi = New Connection.Info
+                Dim Uri As System.Uri = New System.Uri("dummyscheme" + System.Uri.SchemeDelimiter + ConString)
 
-                If Protocol <> Connection.Protocol.Protocols.NONE Then
+                If Not String.IsNullOrEmpty(Uri.Host) Then
+                    nCi = New Connection.Info
+
+                    nCi.Name = String.Format(My.Resources.strQuick, Uri.Host)
                     nCi.Protocol = Protocol
-                End If
-
-                Dim qConS() As String = Split(ConString, ":")
-                Dim qHost As String = ""
-                Dim qPort As Integer = 0
-
-                For i As Integer = 0 To qConS.Length - 1
-                    If i = 0 Then
-                        qHost = qConS(i)
+                    nCi.Hostname = Uri.Host
+                    If Uri.Port = -1 Then
+                        nCi.Port = Nothing
+                    Else
+                        nCi.Port = Uri.Port
                     End If
-
-                    If i = 1 Then
-                        Try
-                            qPort = Int(qConS(i))
-                        Catch ex As Exception
-                            qHost += ":" & qConS(i)
-                        End Try
-                    End If
-
-                    If i = 2 Then
-                        Try
-                            qPort = Int(qConS(i))
-                        Catch ex As Exception
-                        End Try
-                    End If
-                Next
-
-                If qHost <> "" Then
-                    nCi.Name = "Quick: " & qHost
-                    nCi.Hostname = qHost
-                    nCi.Port = qPort
                     nCi.IsQuicky = True
 
                     Windows.quickyForm.ConnectionInfo = nCi
 
                     If Protocol = Connection.Protocol.Protocols.NONE Then
                         Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Else
-
                     End If
 
                     Return nCi
-                Else
-                    '--------
                 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
@@ -1219,11 +1254,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
@@ -1241,47 +1276,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
 
@@ -1298,7 +1333,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
@@ -1324,7 +1359,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
@@ -1374,7 +1409,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
@@ -1406,12 +1440,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()
@@ -1428,17 +1462,23 @@ 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
-                    If DisconnectedMessage > 3 Then
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & "Error Code: " & DisconnectedMessage & vbNewLine & "Error Description: " & Connection.Protocol.RDP.DisconnectionErrors.GetError(DisconnectedMessage))
+                    Dim Reason As String() = DisconnectedMessage.Split(vbCrLf)
+                    Dim ReasonCode As String = Reason(0)
+                    Dim ReasonDescription As String = Reason(1)
+                    If ReasonCode > 3 Then
+                        If ReasonDescription <> "" Then
+                            mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strRdpDisconnected & vbNewLine & ReasonDescription & vbNewLine & String.Format(My.Resources.strErrorCode, ReasonCode))
+                        Else
+                            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
 
@@ -1446,15 +1486,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
@@ -1468,30 +1507,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
@@ -1525,9 +1564,9 @@ 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 = "Website"
+            cI.Name = ""
             cI.Hostname = URL
             If URL.StartsWith("https:") Then
                 cI.Protocol = Connection.Protocol.Protocols.HTTPS
@@ -1537,7 +1576,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()
@@ -1562,7 +1601,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
 
@@ -1578,14 +1617,14 @@ 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
 
         Public Shared Sub SetMainFormText(Optional ByVal ConnectionFileName As String = "")
             Try
-                Dim txt As String = "mRemoteNG"
+                Dim txt As String = My.Application.Info.ProductName
 
                 If App.Editions.Spanlink.Enabled Then
                     txt &= " | Spanlink Communications"
@@ -1601,7 +1640,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
 
@@ -1639,6 +1678,17 @@ Namespace App
 
             Return Nothing
         End Function
+
+        ' Override the font of all controls in a container with the default font based on the OS version
+        Public Shared Sub FontOverride(ByRef ctlParent As Control)
+            Dim ctlChild As Control
+            For Each ctlChild In ctlParent.Controls
+                ctlChild.Font = New System.Drawing.Font(SystemFonts.MessageBoxFont.Name, ctlChild.Font.Size, ctlChild.Font.Style, ctlChild.Font.Unit, ctlChild.Font.GdiCharSet)
+                If ctlChild.Controls.Count > 0 Then
+                    FontOverride(ctlChild)
+                End If
+            Next
+        End Sub
 #End Region
 
 #Region "SQL Watcher"
@@ -1648,7 +1698,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.SupportedCultures.vb

@@ -0,0 +1,66 @@
+Namespace App
+    Public Class SupportedCultures
+        Inherits Dictionary(Of String, String)
+
+        Private Sub New()
+            Dim CultureInfo As Globalization.CultureInfo
+            For Each CultureName As String In My.Settings.SupportedUICultures.Split(",")
+                Try
+                    CultureInfo = New Globalization.CultureInfo(CultureName.Trim)
+                    Add(CultureInfo.Name, CultureInfo.TextInfo.ToTitleCase(CultureInfo.NativeName))
+                Catch ex As Exception
+                    Debug.Print(String.Format("An exception occurred while adding the culture '{0}' to the list of supported cultures. {1}", CultureName, ex.ToString))
+                End Try
+            Next
+        End Sub
+
+        Private Shared _Instance As SupportedCultures = Nothing
+        Public Shared Sub InstantiateSingleton()
+            If _Instance Is Nothing Then
+                _Instance = New SupportedCultures
+            End If
+        End Sub
+
+        Public Shared Function IsNameSupported(ByVal CultureName As String) As Boolean
+            Return _Instance.ContainsKey(CultureName)
+        End Function
+
+        Public Shared Function IsNativeNameSupported(ByVal CultureNativeName As String) As Boolean
+            Return _Instance.ContainsValue(CultureNativeName)
+        End Function
+
+        Public Shared ReadOnly Property CultureName(ByVal CultureNativeName As String) As String
+            Get
+                Dim Names(_Instance.Count) As String
+                Dim NativeNames(_Instance.Count) As String
+
+                _Instance.Keys.CopyTo(Names, 0)
+                _Instance.Values.CopyTo(NativeNames, 0)
+
+                For Index As Integer = 0 To _Instance.Count
+                    If NativeNames(Index) = CultureNativeName Then
+                        Return Names(Index)
+                    End If
+                Next
+
+                Throw New System.Collections.Generic.KeyNotFoundException()
+            End Get
+        End Property
+
+        Public Shared ReadOnly Property CultureNativeName(ByVal CultureName As String) As String
+            Get
+                Return _Instance.Item(CultureName)
+            End Get
+        End Property
+
+        Public Shared ReadOnly Property CultureNativeNames() As List(Of String)
+            Get
+                Dim ValueList As List(Of String) = New List(Of String)
+                For Each Value As String In _Instance.Values
+                    ValueList.Add(Value)
+                Next
+                Return ValueList
+            End Get
+        End Property
+    End Class
+End Namespace

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
@@ -75,7 +75,7 @@ Namespace App
                         'get Download URL
                         Dim strU As String = ""
 
-                        strU = strUpdate.Substring(strUpdate.IndexOf("dURL: ") + 6, strUpdate.IndexOf(vbNewLine) - 6).Replace(".exe", "_" & Language.Base.CurrentLanguage.ToString & ".exe")
+                        strU = strUpdate.Substring(strUpdate.IndexOf("dURL: ") + 6, strUpdate.IndexOf(vbNewLine) - 6)
 
                         uI.DownloadUrl = strU
 
@@ -125,7 +125,7 @@ Namespace App
 
                 _curUI.UpdateLocation = My.Computer.FileSystem.SpecialDirectories.Temp & "\mRemote_Update.exe"
                 wCl.DownloadFileAsync(New Uri(dURL), _curUI.UpdateLocation)
-
+                
                 Return True
             Catch ex As Exception
                 mC.AddMessage(Messages.MessageClass.WarningMsg, "Update download failed" & vbNewLine & ex.Message, True)
@@ -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,84 @@
-1.62:
+1.68 (2011-07-07):
+  Fixed issue #48 - VerifyDatabaseVersion fails with new (empty) database tables.
+  Fixed issue #60 - Can't save connections file
+  Fixed issue #62 - Connection file error upon launch.
+
+1.67 (2011-06-05):
+  Fixed migration of external tools configuration and panel layout from Local to Roaming folder.
+  Disable ICA Hotkeys for Citrix connections.  Fixes issue with international users.
+  Added a language selection option so users can override the language if they don't want it automatically detected.
+  Added partial French translation to the application.
+  Addded Thai translation to the installer.
+  Updated graphics in the installer to mRemoteNG logo.
+  Fixed RD Gateway default properties and RDP reconnection count setting not being saved.
+  Fixed bug 33 - IPv6 doesn't work in quick Connect box.
+  Moved the items under Tools in the Connections panel context menu up to the top level.
+  Added buttons for Add Connection, Add Folder, and Sort Ascending (A-Z) to the Connections panel toolbar.
+  Fixed rename edit control staying open when collapsing all folders.
+  Changed sorting to sort all subfolders below the selected folder.
+  Allow sorting of connections if a connection entry is selected.
+  Fixed adding a connection entry if nothing is selected in the tree.
+  Added 15-bit Color RDP setting.
+  Fixed loading of RDP Colors setting from SQL.
+  Added Font Smoothing and Desktop Composition RDP settings.
+  Improved error handling when loading XML connection files.
+  Added the mRemoteNG icon to the list of selectable icons for connection entries.
+  Added confirmation before closing connection tabs.
+  Fixed bug 42 - Maximized location not remembered with multiple monitors.
+  Improved loading and saving of window location.
+  Removed flickering on start up.
+  Changed the Options page into a normal dialog.
+  Improved Reset Layout function.
+  Changed to use full four part version numbers with major, minor, build, and revision.
+  Changed hard coded SQL database name into a user configurable setting.
+  Fixed tab order of controls in Options dialog.
+  Fixed bug 45 - Changing some settings in the config file may not save.
+
+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
+  Updated DockPanel Suite from 2.2.0 to 2.3.1
+  Fixed error if the mouse is clicked outside of the remote screen area of a VNC connection
+  Fixed flashing and red lines at bottom of the window on first run
+  Added View->Reset Layout menu item
+  Added F11 shortcut key to View->Full Screen
+  Improved RDP error reporting
+  Added support for Credential Security Support Provider (CredSSP) which is required for Network Level Authentication (NLA)
+  Added support for connecting through Remote Desktop Gateway servers
+  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 (2010-01-19):
   Switched to VncSharp, an open source VNC component
   VNC is supported again except for the following features:
     Windows authentication
@@ -14,11 +94,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
@@ -487,7 +567,7 @@ V0.0.3.2:
 V0.0.3.0:
   Added Options Tab
     Load connections file from different location
-    Save/Don’t Save connections file on exit
+    Save/Don't Save connections file on exit
     Show current tab name in window title
   Added drag and drop functionality to the connections tree
   Added feature to hide top bar
@@ -497,7 +577,7 @@ V0.0.3.0:
 V0.0.2.7:
   Added feature to save connection settings to all connections in the selected container
   Icon choosing bug fixed
-  Taskbar button had no text when in fullscreen – fixed
+  Taskbar button had no text when in fullscreen - fixed
   Fixed bug in Quick Connect GUI
   Disabled "Display Wallpaper" and "Display Themes" checkboxes as these features are not implemented
 

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,8 +18,6 @@ Namespace Config
             Private sqlQuery As SqlCommand
             Private sqlRd As SqlDataReader
 
-            Private sqlDB As String = "mRemote"
-
             Private selNode As TreeNode
 #End Region
 
@@ -43,6 +42,16 @@ Namespace Config
                 End Set
             End Property
 
+            Private _SQLDatabaseName As String
+            Public Property SQLDatabaseName() As String
+                Get
+                    Return _SQLDatabaseName
+                End Get
+                Set(ByVal value As String)
+                    _SQLDatabaseName = value
+                End Set
+            End Property
+
             Private _SQLUsername As String
             Public Property SQLUsername() As String
                 Get
@@ -83,10 +92,6 @@ Namespace Config
                 End Set
             End Property
 
-
-
-
-
             Private _ConnectionFileName As String
             Public Property ConnectionFileName() As String
                 Get
@@ -180,9 +185,9 @@ Namespace Config
                     App.Runtime.ConnectionsFileLoaded = False
 
                     If _SQLUsername <> "" Then
-                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
+                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
                     Else
-                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";Integrated Security=True")
+                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";Integrated Security=True")
                     End If
 
                     sqlCon.Open()
@@ -201,10 +206,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 +269,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 +415,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
 
@@ -536,6 +539,27 @@ Namespace Config
                             conI.Inherit.ExtApp = .Item("InheritExtApp")
                         End If
 
+                        If Me.confVersion >= 2.2 Then
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
+                            conI.RDGatewayHostname = .Item("RDGatewayHostname")
+                            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")
+                            conI.Inherit.RDGatewayUsageMethod = .Item("InheritRDGatewayUsageMethod")
+                            conI.Inherit.RDGatewayHostname = .Item("InheritRDGatewayHostname")
+                            conI.Inherit.RDGatewayUsername = .Item("InheritRDGatewayUsername")
+                            conI.Inherit.RDGatewayPassword = .Item("InheritRDGatewayPassword")
+                            conI.Inherit.RDGatewayDomain = .Item("InheritRDGatewayDomain")
+                        End If
+
+                        If Me.confVersion >= 2.3 Then
+                            conI.EnableFontSmoothing = .Item("EnableFontSmoothing")
+                            conI.EnableDesktopComposition = .Item("EnableDesktopComposition")
+                            conI.Inherit.EnableFontSmoothing = .Item("InheritEnableFontSmoothing")
+                            conI.Inherit.EnableDesktopComposition = .Item("InheritEnableDesktopComposition")
+                        End If
+
                         If SQLUpdate = True Then
                             conI.PleaseConnect = .Item("Connected")
                         End If
@@ -543,7 +567,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
@@ -611,12 +635,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.
@@ -654,7 +676,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
@@ -693,7 +715,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
 
@@ -769,14 +791,14 @@ 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
 
             Private Function GetConnectionInfoFromXml(ByVal xxNode As XmlNode) As Connection.Info
-                Try
-                    Dim conI As New Connection.Info
+                Dim conI As New Connection.Info
 
+                Try
                     With xxNode
                         If Me.confVersion > 0.1 Then '0.2
                             conI.Name = .Attributes("Name").Value
@@ -872,6 +894,8 @@ Namespace Config
                                     conI.Colors = Connection.Protocol.RDP.RDPColors.Colors24Bit
                                 Case 3
                                     conI.Colors = Connection.Protocol.RDP.RDPColors.Colors32Bit
+                                Case 4
+                                    conI.Colors = Connection.Protocol.RDP.RDPColors.Colors15Bit
                             End Select
 
                             conI.RedirectSound = .Attributes("RedirectSound").Value
@@ -907,7 +931,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
@@ -915,7 +939,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
@@ -925,16 +949,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
@@ -951,13 +975,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
@@ -973,16 +997,42 @@ Namespace Config
                             conI.ExtApp = .Attributes("ExtApp").Value
                             conI.Inherit.ExtApp = .Attributes("InheritExtApp").Value
                         End If
-                    End With
 
-                    Return conI
+                        If Me.confVersion > 2.1 Then '2.2
+                            ' 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(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
+                        End If
+
+                        If Me.confVersion > 2.2 Then '2.3
+                            ' Get settings
+                            conI.EnableFontSmoothing = .Attributes("EnableFontSmoothing").Value
+                            conI.EnableDesktopComposition = .Attributes("EnableDesktopComposition").Value
+
+                            ' Get inheritance settings
+                            conI.Inherit.EnableFontSmoothing = .Attributes("InheritEnableFontSmoothing").Value
+                            conI.Inherit.EnableDesktopComposition = .Attributes("InheritEnableDesktopComposition").Value
+                        End If
+                    End With
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetConnectionInfoFromXml failed" & vbNewLine & ex.Message, True)
-                    Return Nothing
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strGetConnectionInfoFromXmlFailed, conI.Name, Me.ConnectionFileName, ex.Message), False)
                 End Try
+                Return conI
             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,11 @@
 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
+Imports mRemoteNG.My.Resources
 
 Namespace Config
     Namespace Connections
@@ -23,8 +25,6 @@ Namespace Config
             Private xW As XmlTextWriter
             Private pW As String = App.Info.General.EncryptionKey
 
-            Private sqlDB As String = "mRemote"
-
             Private sqlCon As SqlConnection
             Private sqlQuery As SqlCommand
             Private sqlWr As Integer
@@ -44,6 +44,16 @@ Namespace Config
                 End Set
             End Property
 
+            Private _SQLDatabaseName As String
+            Public Property SQLDatabaseName() As String
+                Get
+                    Return _SQLDatabaseName
+                End Get
+                Set(ByVal value As String)
+                    _SQLDatabaseName = value
+                End Set
+            End Property
+
             Private _SQLUsername As String
             Public Property SQLUsername() As String
                 Get
@@ -164,22 +174,66 @@ Namespace Config
 #End Region
 
 #Region "SQL"
+            Private Function VerifyDatabaseVersion(ByVal sqlConnection As SqlConnection) As Boolean
+                Dim isVerified As Boolean = False
+                Dim sqlDataReader As SqlDataReader = Nothing
+                Dim databaseVersion As System.Version = Nothing
+                Try
+                    Dim sqlCommand As New SqlCommand("SELECT * FROM tblRoot", sqlConnection)
+                    sqlDataReader = sqlCommand.ExecuteReader()
+                    If (Not sqlDataReader.HasRows) Then Return True ' assume new empty database
+                    sqlDataReader.Read()
+
+                    Dim enCulture As CultureInfo = New CultureInfo("en-US")
+                    databaseVersion = New System.Version(Convert.ToDouble(sqlDataReader.Item("confVersion"), enCulture))
+
+                    sqlDataReader.Close()
+
+                    If databaseVersion.CompareTo(New System.Version(2, 2)) = 0 Then ' 2.2
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format("Upgrading database from version {0} to version {1}.", databaseVersion.ToString, "2.3"))
+                        sqlCommand = New SqlCommand("ALTER TABLE tblCons ADD EnableFontSmoothing bit NOT NULL DEFAULT 0, EnableDesktopComposition bit NOT NULL DEFAULT 0, InheritEnableFontSmoothing bit NOT NULL DEFAULT 0, InheritEnableDesktopComposition bit NOT NULL DEFAULT 0;", sqlConnection)
+                        sqlCommand.ExecuteNonQuery()
+                        databaseVersion = New System.Version(2, 3)
+                    End If
+
+                    If databaseVersion.CompareTo(New System.Version(2, 3)) = 0 Then ' 2.3
+                        isVerified = True
+                    End If
+
+                    If isVerified = False Then
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, String.Format(strErrorBadDatabaseVersion, databaseVersion.ToString, My.Application.Info.ProductName))
+                    End If
+                Catch ex As Exception
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(strErrorVerifyDatabaseVersionFailed, ex.Message))
+                Finally
+                    If sqlDataReader IsNot Nothing Then
+                        If Not sqlDataReader.IsClosed Then sqlDataReader.Close()
+                    End If
+                End Try
+                Return isVerified
+            End Function
+
             Private Sub SaveToSQL()
                 If _SQLUsername <> "" Then
-                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
+                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
                 Else
-                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";Integrated Security=True")
+                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";Integrated Security=True")
                 End If
 
                 sqlCon.Open()
 
+                If Not VerifyDatabaseVersion(sqlCon) Then
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, strErrorConnectionListSaveFailed)
+                    Return
+                End If
+
                 Dim tN As TreeNode
                 tN = RootTreeNode.Clone
 
                 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 +245,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
 
@@ -223,12 +273,14 @@ Namespace Config
                     sqlQuery = New SqlCommand("INSERT INTO tblCons (Name, Type, Expanded, Description, Icon, Panel, Username, " & _
                                                "DomainName, Password, Hostname, Protocol, PuttySession, " & _
                                                "Port, ConnectToConsole, RenderingEngine, ICAEncryptionStrength, RDPAuthenticationLevel, Colors, Resolution, DisplayWallpaper, " & _
-                                               "DisplayThemes, CacheBitmaps, RedirectDiskDrives, RedirectPorts, " & _
+                                               "DisplayThemes, EnableFontSmoothing, EnableDesktopComposition, CacheBitmaps, RedirectDiskDrives, RedirectPorts, " & _
                                                "RedirectPrinters, RedirectSmartCards, RedirectSound, RedirectKeys, " & _
                                                "Connected, PreExtApp, PostExtApp, MacAddress, UserField, ExtApp, VNCCompression, VNCEncoding, VNCAuthMode, " & _
                                                "VNCProxyType, VNCProxyIP, VNCProxyPort, VNCProxyUsername, VNCProxyPassword, " & _
-                                               "VNCColors, VNCSmartSizeMode, VNCViewOnly, InheritCacheBitmaps, InheritColors, " & _
-                                               "InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritDomain, " & _
+                                               "VNCColors, VNCSmartSizeMode, VNCViewOnly, " & _
+                                               "RDGatewayUsageMethod, RDGatewayHostname, RDGatewayUseConnectionCredentials, RDGatewayUsername, RDGatewayPassword, RDGatewayDomain, " & _
+                                               "InheritCacheBitmaps, InheritColors, " & _
+                                               "InheritDescription, InheritDisplayThemes, InheritDisplayWallpaper, InheritEnableFontSmoothing, InheritEnableDesktopComposition, InheritDomain, " & _
                                                "InheritIcon, InheritPanel, InheritPassword, InheritPort, " & _
                                                "InheritProtocol, InheritPuttySession, InheritRedirectDiskDrives, " & _
                                                "InheritRedirectKeys, InheritRedirectPorts, InheritRedirectPrinters, " & _
@@ -238,6 +290,7 @@ Namespace Config
                                                "InheritVNCAuthMode, InheritVNCProxyType, InheritVNCProxyIP, InheritVNCProxyPort, " & _
                                                "InheritVNCProxyUsername, InheritVNCProxyPassword, InheritVNCColors, " & _
                                                "InheritVNCSmartSizeMode, InheritVNCViewOnly, " & _
+                                               "InheritRDGatewayUsageMethod, InheritRDGatewayHostname, InheritRDGatewayUseConnectionCredentials, InheritRDGatewayUsername, InheritRDGatewayPassword, InheritRDGatewayDomain, " & _
                                                "PositionID, ParentID, ConstantID, LastChange)" & _
                                                "VALUES (", sqlCon)
 
@@ -308,6 +361,8 @@ Namespace Config
                     sqlQuery.CommandText &= "'" & .Resolution.ToString & "',"
                     sqlQuery.CommandText &= "'" & .DisplayWallpaper & "',"
                     sqlQuery.CommandText &= "'" & .DisplayThemes & "',"
+                    sqlQuery.CommandText &= "'" & .EnableFontSmoothing & "',"
+                    sqlQuery.CommandText &= "'" & .EnableDesktopComposition & "',"
                     sqlQuery.CommandText &= "'" & .CacheBitmaps & "',"
                     sqlQuery.CommandText &= "'" & .RedirectDiskDrives & "',"
                     sqlQuery.CommandText &= "'" & .RedirectPorts & "',"
@@ -340,6 +395,28 @@ Namespace Config
                     sqlQuery.CommandText &= "'" & .VNCSmartSizeMode.ToString & "',"
                     sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"
 
+                    sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod.ToString & "',"
+                    sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
+                    sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials.ToString & "',"
+
+                    If Me._SaveSecurity.Username = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
+                    If Me._SaveSecurity.Password = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
+                    If Me._SaveSecurity.Domain = True Then
+                        sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
+                    Else
+                        sqlQuery.CommandText &= "'" & "" & "',"
+                    End If
+
                     With .Inherit
                         If Me._SaveSecurity.Inheritance = True Then
                             sqlQuery.CommandText &= "'" & .CacheBitmaps & "',"
@@ -347,6 +424,8 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & .Description & "',"
                             sqlQuery.CommandText &= "'" & .DisplayThemes & "',"
                             sqlQuery.CommandText &= "'" & .DisplayWallpaper & "',"
+                            sqlQuery.CommandText &= "'" & .EnableFontSmoothing & "',"
+                            sqlQuery.CommandText &= "'" & .EnableDesktopComposition & "',"
                             sqlQuery.CommandText &= "'" & .Domain & "',"
                             sqlQuery.CommandText &= "'" & .Icon & "',"
                             sqlQuery.CommandText &= "'" & .Panel & "',"
@@ -383,6 +462,13 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & .VNCColors & "',"
                             sqlQuery.CommandText &= "'" & .VNCSmartSizeMode & "',"
                             sqlQuery.CommandText &= "'" & .VNCViewOnly & "',"
+
+                            sqlQuery.CommandText &= "'" & .RDGatewayUsageMethod & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayHostname & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayUseConnectionCredentials & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayUsername & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayPassword & "',"
+                            sqlQuery.CommandText &= "'" & .RDGatewayDomain & "',"
                         Else
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
@@ -425,6 +511,13 @@ Namespace Config
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
                             sqlQuery.CommandText &= "'" & False & "',"
+
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsageMethod
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayHostname
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUseConnectionCredentials
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayUsername
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayPassword
+                            sqlQuery.CommandText &= "'" & False & "'," ' .RDGatewayDomain
                         End If
                     End With
 
@@ -495,18 +588,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
@@ -600,6 +691,10 @@ Namespace Config
 
                     xW.WriteAttributeString("DisplayThemes", "", curConI.DisplayThemes)
 
+                    xW.WriteAttributeString("EnableFontSmoothing", "", curConI.EnableFontSmoothing)
+
+                    xW.WriteAttributeString("EnableDesktopComposition", "", curConI.EnableDesktopComposition)
+
                     xW.WriteAttributeString("CacheBitmaps", "", curConI.CacheBitmaps)
 
                     xW.WriteAttributeString("RedirectDiskDrives", "", curConI.RedirectDiskDrives)
@@ -638,12 +733,37 @@ Namespace Config
                     xW.WriteAttributeString("VNCSmartSizeMode", "", curConI.VNCSmartSizeMode.ToString)
                     xW.WriteAttributeString("VNCViewOnly", "", curConI.VNCViewOnly)
 
+                    xW.WriteAttributeString("RDGatewayUsageMethod", "", curConI.RDGatewayUsageMethod.ToString)
+                    xW.WriteAttributeString("RDGatewayHostname", "", curConI.RDGatewayHostname)
+
+                    xW.WriteAttributeString("RDGatewayUseConnectionCredentials", "", curConI.RDGatewayUseConnectionCredentials.ToString)
+
+                    If Me._SaveSecurity.Username = True Then
+                        xW.WriteAttributeString("RDGatewayUsername", "", curConI.RDGatewayUsername)
+                    Else
+                        xW.WriteAttributeString("RDGatewayUsername", "", "")
+                    End If
+
+                    If Me._SaveSecurity.Password = True Then
+                        xW.WriteAttributeString("RDGatewayPassword", "", curConI.RDGatewayPassword)
+                    Else
+                        xW.WriteAttributeString("RDGatewayPassword", "", "")
+                    End If
+
+                    If Me._SaveSecurity.Domain = True Then
+                        xW.WriteAttributeString("RDGatewayDomain", "", curConI.RDGatewayDomain)
+                    Else
+                        xW.WriteAttributeString("RDGatewayDomain", "", "")
+                    End If
+
                     If Me._SaveSecurity.Inheritance = True Then
                         xW.WriteAttributeString("InheritCacheBitmaps", "", curConI.Inherit.CacheBitmaps)
                         xW.WriteAttributeString("InheritColors", "", curConI.Inherit.Colors)
                         xW.WriteAttributeString("InheritDescription", "", curConI.Inherit.Description)
                         xW.WriteAttributeString("InheritDisplayThemes", "", curConI.Inherit.DisplayThemes)
                         xW.WriteAttributeString("InheritDisplayWallpaper", "", curConI.Inherit.DisplayWallpaper)
+                        xW.WriteAttributeString("InheritEnableFontSmoothing", "", curConI.Inherit.EnableFontSmoothing)
+                        xW.WriteAttributeString("InheritEnableDesktopComposition", "", curConI.Inherit.EnableDesktopComposition)
                         xW.WriteAttributeString("InheritDomain", "", curConI.Inherit.Domain)
                         xW.WriteAttributeString("InheritIcon", "", curConI.Inherit.Icon)
                         xW.WriteAttributeString("InheritPanel", "", curConI.Inherit.Panel)
@@ -679,12 +799,20 @@ Namespace Config
                         xW.WriteAttributeString("InheritVNCColors", "", curConI.Inherit.VNCColors)
                         xW.WriteAttributeString("InheritVNCSmartSizeMode", "", curConI.Inherit.VNCSmartSizeMode)
                         xW.WriteAttributeString("InheritVNCViewOnly", "", curConI.Inherit.VNCViewOnly)
+                        xW.WriteAttributeString("InheritRDGatewayUsageMethod", "", curConI.Inherit.RDGatewayUsageMethod)
+                        xW.WriteAttributeString("InheritRDGatewayHostname", "", curConI.Inherit.RDGatewayHostname)
+                        xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", curConI.Inherit.RDGatewayUseConnectionCredentials)
+                        xW.WriteAttributeString("InheritRDGatewayUsername", "", curConI.Inherit.RDGatewayUsername)
+                        xW.WriteAttributeString("InheritRDGatewayPassword", "", curConI.Inherit.RDGatewayPassword)
+                        xW.WriteAttributeString("InheritRDGatewayDomain", "", curConI.Inherit.RDGatewayDomain)
                     Else
                         xW.WriteAttributeString("InheritCacheBitmaps", "", False)
                         xW.WriteAttributeString("InheritColors", "", False)
                         xW.WriteAttributeString("InheritDescription", "", False)
                         xW.WriteAttributeString("InheritDisplayThemes", "", False)
                         xW.WriteAttributeString("InheritDisplayWallpaper", "", False)
+                        xW.WriteAttributeString("InheritEnableFontSmoothing", "", False)
+                        xW.WriteAttributeString("InheritEnableDesktopComposition", "", False)
                         xW.WriteAttributeString("InheritDomain", "", False)
                         xW.WriteAttributeString("InheritIcon", "", False)
                         xW.WriteAttributeString("InheritPanel", "", False)
@@ -720,6 +848,11 @@ Namespace Config
                         xW.WriteAttributeString("InheritVNCColors", "", False)
                         xW.WriteAttributeString("InheritVNCSmartSizeMode", "", False)
                         xW.WriteAttributeString("InheritVNCViewOnly", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayHostname", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayUseConnectionCredentials", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayUsername", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayPassword", "", False)
+                        xW.WriteAttributeString("InheritRDGatewayDomain", "", False)
                     End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveConnectionFields failed" & vbNewLine & ex.Message, True)
@@ -727,8 +860,9 @@ Namespace Config
             End Sub
 #End Region
 
-            Private csvWr As StreamWriter
 #Region "CSV"
+            Private csvWr As StreamWriter
+
             Private Sub SaveTomRCSV()
                 If App.Runtime.ConnectionsFileLoaded = False Then
                     Exit Sub
@@ -759,13 +893,12 @@ Namespace Config
                     csvLn += "Domain;"
                 End If
 
-                csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;"
+                csvLn += "Hostname;Protocol;PuttySession;Port;ConnectToConsole;RenderingEngine;ICAEncryptionStrength;RDPAuthenticationLevel;Colors;Resolution;DisplayWallpaper;DisplayThemes;EnableFontSmoothing;EnableDesktopComposition;CacheBitmaps;RedirectDiskDrives;RedirectPorts;RedirectPrinters;RedirectSmartCards;RedirectSound;RedirectKeys;PreExtApp;PostExtApp;MacAddress;UserField;ExtApp;VNCCompression;VNCEncoding;VNCAuthMode;VNCProxyType;VNCProxyIP;VNCProxyPort;VNCProxyUsername;VNCProxyPassword;VNCColors;VNCSmartSizeMode;VNCViewOnly;RDGatewayUsageMethod;RDGatewayHostname;RDGatewayUseConnectionCredentials;RDGatewayUsername;RDGatewayPassword;RDGatewayDomain;"
 
                 If SaveSecurity.Inheritance Then
-                    csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly"
+                    csvLn += "InheritCacheBitmaps;InheritColors;InheritDescription;InheritDisplayThemes;InheritDisplayWallpaper;InheritEnableFontSmoothing;InheritEnableDesktopComposition;InheritDomain;InheritIcon;InheritPanel;InheritPassword;InheritPort;InheritProtocol;InheritPuttySession;InheritRedirectDiskDrives;InheritRedirectKeys;InheritRedirectPorts;InheritRedirectPrinters;InheritRedirectSmartCards;InheritRedirectSound;InheritResolution;InheritUseConsoleSession;InheritRenderingEngine;InheritUsername;InheritICAEncryptionStrength;InheritRDPAuthenticationLevel;InheritPreExtApp;InheritPostExtApp;InheritMacAddress;InheritUserField;InheritExtApp;InheritVNCCompression;InheritVNCEncoding;InheritVNCAuthMode;InheritVNCProxyType;InheritVNCProxyIP;InheritVNCProxyPort;InheritVNCProxyUsername;InheritVNCProxyPassword;InheritVNCColors;InheritVNCSmartSizeMode;InheritVNCViewOnly;InheritRDGatewayUsageMethod;InheritRDGatewayHostname;InheritRDGatewayUseConnectionCredentials;InheritRDGatewayUsername;InheritRDGatewayPassword;InheritRDGatewayDomain"
                 End If
 
-
                 csvWr.WriteLine(csvLn)
 
                 SaveNodemRCSV(tNC)
@@ -814,10 +947,10 @@ Namespace Config
                     csvLn += con.Domain & ";"
                 End If
 
-                csvLn += con.Hostname & ";" & con.Protocol.ToString & ";" & con.PuttySession & ";" & con.Port & ";" & con.UseConsoleSession & ";" & con.RenderingEngine.ToString & ";" & con.ICAEncryption.ToString & ";" & con.RDPAuthenticationLevel.ToString & ";" & con.Colors.ToString & ";" & con.Resolution.ToString & ";" & con.DisplayWallpaper & ";" & con.DisplayThemes & ";" & con.CacheBitmaps & ";" & con.RedirectDiskDrives & ";" & con.RedirectPorts & ";" & con.RedirectPrinters & ";" & con.RedirectSmartCards & ";" & con.RedirectSound.ToString & ";" & con.RedirectKeys & ";" & con.PreExtApp & ";" & con.PostExtApp & ";" & con.MacAddress & ";" & con.UserField & ";" & con.ExtApp & ";" & con.VNCCompression.ToString & ";" & con.VNCEncoding.ToString & ";" & con.VNCAuthMode.ToString & ";" & con.VNCProxyType.ToString & ";" & con.VNCProxyIP & ";" & con.VNCProxyPort & ";" & con.VNCProxyUsername & ";" & con.VNCProxyPassword & ";" & con.VNCColors.ToString & ";" & con.VNCSmartSizeMode.ToString & ";" & con.VNCViewOnly & ";"
+                csvLn += con.Hostname & ";" & con.Protocol.ToString & ";" & con.PuttySession & ";" & con.Port & ";" & con.UseConsoleSession & ";" & con.RenderingEngine.ToString & ";" & con.ICAEncryption.ToString & ";" & con.RDPAuthenticationLevel.ToString & ";" & con.Colors.ToString & ";" & con.Resolution.ToString & ";" & con.DisplayWallpaper & ";" & con.DisplayThemes & ";" & con.EnableFontSmoothing & ";" & con.EnableDesktopComposition & ";" & con.CacheBitmaps & ";" & con.RedirectDiskDrives & ";" & con.RedirectPorts & ";" & con.RedirectPrinters & ";" & con.RedirectSmartCards & ";" & con.RedirectSound.ToString & ";" & con.RedirectKeys & ";" & con.PreExtApp & ";" & con.PostExtApp & ";" & con.MacAddress & ";" & con.UserField & ";" & con.ExtApp & ";" & con.VNCCompression.ToString & ";" & con.VNCEncoding.ToString & ";" & con.VNCAuthMode.ToString & ";" & con.VNCProxyType.ToString & ";" & con.VNCProxyIP & ";" & con.VNCProxyPort & ";" & con.VNCProxyUsername & ";" & con.VNCProxyPassword & ";" & con.VNCColors.ToString & ";" & con.VNCSmartSizeMode.ToString & ";" & con.VNCViewOnly & ";"
 
                 If SaveSecurity.Inheritance Then
-                    csvLn += con.Inherit.CacheBitmaps & ";" & con.Inherit.Colors & ";" & con.Inherit.Description & ";" & con.Inherit.DisplayThemes & ";" & con.Inherit.DisplayWallpaper & ";" & con.Inherit.Domain & ";" & con.Inherit.Icon & ";" & con.Inherit.Panel & ";" & con.Inherit.Password & ";" & con.Inherit.Port & ";" & con.Inherit.Protocol & ";" & con.Inherit.PuttySession & ";" & con.Inherit.RedirectDiskDrives & ";" & con.Inherit.RedirectKeys & ";" & con.Inherit.RedirectPorts & ";" & con.Inherit.RedirectPrinters & ";" & con.Inherit.RedirectSmartCards & ";" & con.Inherit.RedirectSound & ";" & con.Inherit.Resolution & ";" & con.Inherit.UseConsoleSession & ";" & con.Inherit.RenderingEngine & ";" & con.Inherit.Username & ";" & con.Inherit.ICAEncryption & ";" & con.Inherit.RDPAuthenticationLevel & ";" & con.Inherit.PreExtApp & ";" & con.Inherit.PostExtApp & ";" & con.Inherit.MacAddress & ";" & con.Inherit.UserField & ";" & con.Inherit.ExtApp & ";" & con.Inherit.VNCCompression & ";" & con.Inherit.VNCEncoding & ";" & con.Inherit.VNCAuthMode & ";" & con.Inherit.VNCProxyType & ";" & con.Inherit.VNCProxyIP & ";" & con.Inherit.VNCProxyPort & ";" & con.Inherit.VNCProxyUsername & ";" & con.Inherit.VNCProxyPassword & ";" & con.Inherit.VNCColors & ";" & con.Inherit.VNCSmartSizeMode & ";" & con.Inherit.VNCViewOnly
+                    csvLn += con.Inherit.CacheBitmaps & ";" & con.Inherit.Colors & ";" & con.Inherit.Description & ";" & con.Inherit.DisplayThemes & ";" & con.Inherit.DisplayWallpaper & ";" & con.Inherit.EnableFontSmoothing & ";" & con.Inherit.EnableDesktopComposition & ";" & con.Inherit.Domain & ";" & con.Inherit.Icon & ";" & con.Inherit.Panel & ";" & con.Inherit.Password & ";" & con.Inherit.Port & ";" & con.Inherit.Protocol & ";" & con.Inherit.PuttySession & ";" & con.Inherit.RedirectDiskDrives & ";" & con.Inherit.RedirectKeys & ";" & con.Inherit.RedirectPorts & ";" & con.Inherit.RedirectPrinters & ";" & con.Inherit.RedirectSmartCards & ";" & con.Inherit.RedirectSound & ";" & con.Inherit.Resolution & ";" & con.Inherit.UseConsoleSession & ";" & con.Inherit.RenderingEngine & ";" & con.Inherit.Username & ";" & con.Inherit.ICAEncryption & ";" & con.Inherit.RDPAuthenticationLevel & ";" & con.Inherit.PreExtApp & ";" & con.Inherit.PostExtApp & ";" & con.Inherit.MacAddress & ";" & con.Inherit.UserField & ";" & con.Inherit.ExtApp & ";" & con.Inherit.VNCCompression & ";" & con.Inherit.VNCEncoding & ";" & con.Inherit.VNCAuthMode & ";" & con.Inherit.VNCProxyType & ";" & con.Inherit.VNCProxyIP & ";" & con.Inherit.VNCProxyPort & ";" & con.Inherit.VNCProxyUsername & ";" & con.Inherit.VNCProxyPassword & ";" & con.Inherit.VNCColors & ";" & con.Inherit.VNCSmartSizeMode & ";" & con.Inherit.VNCViewOnly
                 End If
 
                 csvWr.WriteLine(csvLn)

mRemoteV1/Config/Config.Settings.Load.vb

@@ -1,7 +1,8 @@
 Imports System.IO
 Imports WeifenLuo.WinFormsUI.Docking
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Xml
+Imports System.Environment
 
 Namespace Config
     Namespace Settings
@@ -37,28 +38,44 @@ Namespace Config
                             My.Settings.UpdatePending = False
                         End If
 
-                        If My.Settings.MainFormLocation <> New Point(999, 999) Then
-                            .Location = My.Settings.MainFormLocation
+                        App.SupportedCultures.InstantiateSingleton()
+                        If Not My.Settings.OverrideUICulture = "" And App.SupportedCultures.IsNameSupported(My.Settings.OverrideUICulture) Then
+                            Threading.Thread.CurrentThread.CurrentUICulture = New Globalization.CultureInfo(My.Settings.OverrideUICulture)
+                            log.InfoFormat("Override Culture: {0}/{1}", Threading.Thread.CurrentThread.CurrentUICulture.Name, Threading.Thread.CurrentThread.CurrentUICulture.NativeName)
                         End If
 
-                        If My.Settings.MainFormSize <> Nothing Then
-                            .Size = My.Settings.MainFormSize
-                        End If
-
-                        'check if form is visible
-                        Dim curScreen As Screen = Screen.FromHandle(.Handle)
-
-                        If .Right < curScreen.Bounds.Left Or .Left > curScreen.Bounds.Right _
-                            Or .Top * -1 > curScreen.Bounds.Top * -1 Or .Bottom > curScreen.Bounds.Bottom Then
-                            .Location = curScreen.Bounds.Location
-                        End If
-
-
-                        If My.Settings.MainFormState = Nothing Or My.Settings.MainFormState = FormWindowState.Minimized Then
-                            .WindowState = FormWindowState.Normal
+                        .WindowState = FormWindowState.Normal
+                        If My.Settings.MainFormState = FormWindowState.Normal Then
+                            If Not My.Settings.MainFormLocation.IsEmpty Then .Location = My.Settings.MainFormLocation
+                            If Not My.Settings.MainFormSize.IsEmpty Then .Size = My.Settings.MainFormSize
                         Else
-                            .WindowState = My.Settings.MainFormState
+                            If Not My.Settings.MainFormRestoreLocation.IsEmpty Then .Location = My.Settings.MainFormRestoreLocation
+                            If Not My.Settings.MainFormRestoreSize.IsEmpty Then .Size = My.Settings.MainFormRestoreSize
                         End If
+                        If My.Settings.MainFormState = FormWindowState.Maximized Then
+                            .WindowState = FormWindowState.Maximized
+                        End If
+
+                        ' Make sure the form is visible on the screen
+                        Const minHorizontal As Integer = 300
+                        Const minVertical As Integer = 150
+                        Dim screenBounds As Drawing.Rectangle = Screen.FromHandle(.Handle).Bounds
+                        Dim newBounds As Drawing.Rectangle = .Bounds
+
+                        If newBounds.Right < screenBounds.Left + minHorizontal Then
+                            newBounds.X = screenBounds.Left + minHorizontal - newBounds.Width
+                        End If
+                        If newBounds.Left > screenBounds.Right - minHorizontal Then
+                            newBounds.X = screenBounds.Right - minHorizontal
+                        End If
+                        If newBounds.Bottom < screenBounds.Top + minVertical Then
+                            newBounds.Y = screenBounds.Top + minVertical - newBounds.Height
+                        End If
+                        If newBounds.Top > screenBounds.Bottom - minVertical Then
+                            newBounds.Y = screenBounds.Bottom - minVertical
+                        End If
+
+                        .Location = newBounds.Location
 
                         If My.Settings.MainFormKiosk = True Then
                             Tools.Misc.Fullscreen.EnterFullscreen()
@@ -158,16 +175,19 @@ Namespace Config
                             dc.Close()
                         Loop
 
-                        .pnlDock.SuspendLayout(True)
+                        Startup.CreatePanels()
 
-                        If File.Exists(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName) And My.Settings.ResetPanels = False Then
-                            Startup.CreatePanels()
-                            .pnlDock.LoadFromXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName, AddressOf GetContentFromPersistString)
+                        Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName & "\" & App.Info.Settings.LayoutFileName
+                        Dim newPath As String = App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName
+                        If File.Exists(newPath) Then
+                            .pnlDock.LoadFromXml(newPath, AddressOf GetContentFromPersistString)
+#If Not PORTABLE Then
+                        ElseIf File.Exists(oldPath) Then
+                            .pnlDock.LoadFromXml(oldPath, AddressOf GetContentFromPersistString)
+#End If
                         Else
-                            Startup.CreatePanels(True)
+                            Startup.SetDefaultLayout()
                         End If
-
-                        .pnlDock.ResumeLayout(True, True)
                     End With
                 Catch ex As Exception
                     App.Runtime.log.Error("LoadPanelsFromXML failed" & vbNewLine & ex.Message)
@@ -176,13 +196,19 @@ Namespace Config
             End Sub
 
             Public Sub LoadExternalAppsFromXML()
-                If File.Exists(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName) = False Then
+                Dim oldPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName & "\" & App.Info.Settings.ExtAppsFilesName
+                Dim newPath As String = App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName
+                Dim xDom As New XmlDocument()
+                If File.Exists(newPath) Then
+                    xDom.Load(newPath)
+#If Not PORTABLE Then
+                ElseIf File.Exists(oldPath) Then
+                    xDom.Load(oldPath)
+#End If
+                Else
                     Exit Sub
                 End If
 
-                Dim xDom As New XmlDocument()
-                xDom.Load(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName)
-
                 For Each xEl As XmlElement In xDom.DocumentElement.ChildNodes
                     Dim extA As New Tools.ExternalApp
                     extA.DisplayName = xEl.Attributes("DisplayName").Value
@@ -210,6 +236,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.Providers.vb

@@ -6,15 +6,13 @@ Namespace Config
     Namespace Settings
         Namespace Providers
             Public Class ChooseProvider
-                'Exchange to make portable/normal
+#If Not PORTABLE Then
                 Inherits LocalFileSettingsProvider
-                'Inherits PortableSettingsProvider
+#Else
+                Inherits PortableSettingsProvider
+#End If
             End Class
 
-
-
-
-
             Public Class PortableSettingsProvider
                 Inherits SettingsProvider
 
@@ -145,13 +143,17 @@ Namespace Config
                     End Try
 
                     'Check to see if the node exists, if so then set its new value
-                    If Not SettingNode Is Nothing Then
-                        SettingNode.InnerText = propVal.SerializedValue.ToString
+                    If SettingNode IsNot Nothing Then
+                        If propVal.SerializedValue IsNot Nothing Then
+                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                        End If
                     Else
                         If IsRoaming(propVal.Property) Then
                             'Store the value as an element of the Settings Root Node
                             SettingNode = SettingsXML.CreateElement(propVal.Name)
-                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                            If propVal.SerializedValue IsNot Nothing Then
+                                SettingNode.InnerText = propVal.SerializedValue.ToString
+                            End If
                             SettingsXML.SelectSingleNode(SETTINGSROOT).AppendChild(SettingNode)
                         Else
                             'Its machine specific, store as an element of the machine name node,
@@ -169,10 +171,14 @@ Namespace Config
                             End If
 
                             SettingNode = SettingsXML.CreateElement(propVal.Name)
-                            SettingNode.InnerText = propVal.SerializedValue.ToString
+                            If propVal.SerializedValue IsNot Nothing Then
+                                SettingNode.InnerText = propVal.SerializedValue.ToString
+                            End If
                             MachineNode.AppendChild(SettingNode)
                         End If
                     End If
+
+
                 End Sub
 
                 Private Function IsRoaming(ByVal prop As SettingsProperty) As Boolean

mRemoteV1/Config/Config.Settings.Save.vb

@@ -1,6 +1,7 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Xml
 Imports System.IO
+Imports mRemoteNG.Tools.WindowPlacement
 
 Namespace Config
     Namespace Settings
@@ -25,12 +26,18 @@ Namespace Config
             Public Sub Save()
                 Try
                     With Me._MainForm
-                        If .WindowState = FormWindowState.Normal Then
-                            My.Settings.MainFormLocation = .Location
-                            My.Settings.MainFormSize = .Size
-                        Else
-                            My.Settings.MainFormLocation = .RestoreBounds.Location
-                            My.Settings.MainFormSize = .RestoreBounds.Size
+                        Dim windowPlacement As New Tools.WindowPlacement(_MainForm)
+                        If .WindowState = FormWindowState.Minimized And windowPlacement.RestoreToMaximized Then
+                            .Opacity = 0
+                            .WindowState = FormWindowState.Maximized
+                        End If
+
+                        My.Settings.MainFormLocation = .Location
+                        My.Settings.MainFormSize = .Size
+
+                        If Not .WindowState = FormWindowState.Normal Then
+                            My.Settings.MainFormRestoreLocation = .RestoreBounds.Location
+                            My.Settings.MainFormRestoreSize = .RestoreBounds.Size
                         End If
 
                         My.Settings.MainFormState = .WindowState

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,7 +1,7 @@
 Imports System.Windows.Forms
-Imports mRemote.App.Runtime
-Imports Skybound.Gecko
+Imports mRemoteNG.App.Runtime
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -19,7 +19,6 @@ Namespace Connection
             Public Sub New(ByVal RenderingEngine As RenderingEngine)
                 Try
                     If RenderingEngine = RenderingEngine.Gecko Then
-                        'Skybound.Gecko.Xpcom.Initialize(My.Settings.XULRunnerPath)
                         Me.Control = New MiniGeckoBrowser.MiniGeckoBrowser
                         TryCast(Me.Control, MiniGeckoBrowser.MiniGeckoBrowser).XULrunnerPath = My.Settings.XULRunnerPath
                     Else
@@ -28,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
 
@@ -39,24 +38,34 @@ Namespace Connection
                 MyBase.SetProps()
 
                 Try
-                    wBrowser = Me.Control
+                    Dim objTabPage As Crownwood.Magic.Controls.TabPage = TryCast(Me.InterfaceControl.Parent, Crownwood.Magic.Controls.TabPage)
+                    Me.tabTitle = objTabPage.Title
+                Catch ex As Exception
+                    Me.tabTitle = ""
+                End Try
+
+                Try
+                    Me.wBrowser = Me.Control
 
                     If InterfaceControl.Info.RenderingEngine = RenderingEngine.Gecko Then
-                        'AddHandler TryCast(wBrowser, GeckoWebBrowser).CreateWindow, AddressOf gex_CreateWindow
-                        AddHandler TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser).TitleChanged, AddressOf wBrowser_DocumentTitleChanged
-                        AddHandler TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser).LastTabRemoved, AddressOf wBrowser_LastTabRemoved
-                        'wBrowser.Width = wBrowser.Width
-                    Else
-                        TryCast(wBrowser, WebBrowser).AllowWebBrowserDrop = False
-                        TryCast(wBrowser, WebBrowser).ScrollBarsEnabled = True
+                        Dim objMiniGeckoBrowser As MiniGeckoBrowser.MiniGeckoBrowser = TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser)
 
-                        AddHandler TryCast(wBrowser, WebBrowser).DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged
-                        AddHandler TryCast(wBrowser, WebBrowser).NewWindow, AddressOf wBrowser_NewWindow
+                        AddHandler objMiniGeckoBrowser.TitleChanged, AddressOf wBrowser_DocumentTitleChanged
+                        AddHandler objMiniGeckoBrowser.LastTabRemoved, AddressOf wBrowser_LastTabRemoved
+                    Else
+                        Dim objWebBrowser As WebBrowser = TryCast(wBrowser, WebBrowser)
+                        Dim objAxWebBrowser As SHDocVw.WebBrowser = DirectCast(objWebBrowser.ActiveXInstance, SHDocVw.WebBrowser)
+
+                        objWebBrowser.AllowWebBrowserDrop = False
+                        objWebBrowser.ScrollBarsEnabled = True
+
+                        AddHandler objWebBrowser.DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged
+                        AddHandler objAxWebBrowser.NewWindow3, AddressOf wBrowser_NewWindow3
                     End If
 
                     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
@@ -99,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
@@ -111,14 +120,15 @@ Namespace Connection
 
 #Region "Events"
             Private Sub gex_CreateWindow(ByVal sender As Object, ByVal e As Skybound.Gecko.GeckoCreateWindowEventArgs)
-                'Dim tP As TabPage = AddTab()
-                'e.WebBrowser = tP.Controls(0)
                 e.WebBrowser = Me.wBrowser
             End Sub
 
-            Private Sub wBrowser_NewWindow(ByVal sender As Object, ByVal e As CancelEventArgs)
-                e.Cancel = True
-                TryCast(wBrowser, WebBrowser).Navigate(TryCast(wBrowser, WebBrowser).StatusText)
+            Private Sub wBrowser_NewWindow3(ByRef ppDisp As Object, ByRef Cancel As Boolean, ByVal dwFlags As Long, ByVal bstrUrlContext As String, ByVal bstrUrl As String)
+                If (dwFlags And NWMF.NWMF_OVERRIDEKEY) Then
+                    Cancel = False
+                Else
+                    Cancel = True
+                End If
             End Sub
 
             Private Sub wBrowser_LastTabRemoved(ByVal sender As Object)
@@ -131,10 +141,6 @@ Namespace Connection
                     tabP = TryCast(InterfaceControl.Parent, Crownwood.Magic.Controls.TabPage)
 
                     If tabP IsNot Nothing Then
-                        If tabTitle = "" Then
-                            tabTitle = tabP.Title
-                        End If
-
                         Dim shortTitle As String = ""
 
                         If Me.InterfaceControl.Info.RenderingEngine = RenderingEngine.Gecko Then
@@ -151,20 +157,43 @@ Namespace Connection
                             End If
                         End If
 
-                        tabP.Title = tabTitle & " - " & shortTitle
+                        If Me.tabTitle <> "" Then
+                            tabP.Title = tabTitle & " - " & shortTitle
+                        Else
+                            tabP.Title = shortTitle
+                        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
+
+            Private Enum NWMF
+                NWMF_UNLOADING = &H1
+                NWMF_USERINITED = &H2
+                NWMF_FIRST = &H4
+                NWMF_OVERRIDEKEY = &H8
+                NWMF_SHOWHELP = &H10
+                NWMF_HTMLDIALOG = &H20
+                NWMF_FROMDIALOGCHILD = &H40
+                NWMF_USERREQUESTED = &H80
+                NWMF_USERALLOWED = &H100
+                NWMF_FORCEWINDOW = &H10000
+                NWMF_FORCETAB = &H20000
+                NWMF_SUGGESTWINDOW = &H40000
+                NWMF_SUGGESTTAB = &H80000
+                NWMF_INACTIVETAB = &H100000
+            End Enum
+#End Region
         End Class
     End Namespace
 End Namespace

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
 
@@ -45,13 +46,37 @@ Namespace Connection
 
                     Me.SetSecurity()
 
+                    'Disable hotkeys for international users
+                    ICA.Hotkey1Shift = Nothing
+                    ICA.Hotkey1Char = Nothing
+                    ICA.Hotkey2Shift = Nothing
+                    ICA.Hotkey2Char = Nothing
+                    ICA.Hotkey3Shift = Nothing
+                    ICA.Hotkey3Char = Nothing
+                    ICA.Hotkey4Shift = Nothing
+                    ICA.Hotkey4Char = Nothing
+                    ICA.Hotkey5Shift = Nothing
+                    ICA.Hotkey5Char = Nothing
+                    ICA.Hotkey6Shift = Nothing
+                    ICA.Hotkey6Char = Nothing
+                    ICA.Hotkey7Shift = Nothing
+                    ICA.Hotkey7Char = Nothing
+                    ICA.Hotkey8Shift = Nothing
+                    ICA.Hotkey8Char = Nothing
+                    ICA.Hotkey9Shift = Nothing
+                    ICA.Hotkey9Char = Nothing
+                    ICA.Hotkey10Shift = Nothing
+                    ICA.Hotkey10Char = Nothing
+                    ICA.Hotkey11Shift = Nothing
+                    ICA.Hotkey11Char = Nothing
+
                     ICA.PersistentCacheEnabled = Info.CacheBitmaps
 
                     ICA.Title = Info.Name
 
                     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 +89,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 +135,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 +160,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
 
@@ -143,6 +168,8 @@ Namespace Connection
                 Select Case Info.Colors
                     Case RDP.RDPColors.Colors256
                         ICA.SetProp("DesiredColor", 2)
+                    Case RDP.RDPColors.Colors15Bit
+                        ICA.SetProp("DesiredColor", 4)
                     Case RDP.RDPColors.Colors16Bit
                         ICA.SetProp("DesiredColor", 4)
                     Case Else
@@ -174,7 +201,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 +256,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,17 +1,19 @@
-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
         Public Class PuttyBase
             Inherits Connection.Protocol.Base
 
+#Region "Constants"
+            Private Const IDM_RECONF As Int32 = &H50 ' PuTTY Settings Menu ID
+#End Region
+
 #Region "Private Properties"
-            Private PuttyProcessStartInfo As New ProcessStartInfo()
-            Private Arguments As String
 #End Region
 
 #Region "Public Properties"
@@ -101,50 +103,52 @@ Namespace Connection
 
             Public Overrides Function Connect() As Boolean
                 Try
-                    PuttyProcessStartInfo.FileName = _PuttyPath
+                    PuttyProcess = New Process
 
-                    Select Case Me._PuttyProtocol
-                        Case Putty_Protocol.raw
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.rlogin
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.ssh
-                            Dim UserArg As String = ""
-                            Dim PassArg As String = ""
+                    With PuttyProcess.StartInfo
+                        .FileName = _PuttyPath
 
-                            If My.Settings.EmptyCredentials = "windows" Then
-                                UserArg = " -l """ & Environment.UserName & """"
-                            ElseIf My.Settings.EmptyCredentials = "custom" Then
-                                UserArg = " -l """ & My.Settings.DefaultUsername & """"
-                                PassArg = " -pw """ & Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) & """"
-                            End If
+                        Select Case Me._PuttyProtocol
+                            Case Putty_Protocol.raw
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.rlogin
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.ssh
+                                Dim UserArg As String = ""
+                                Dim PassArg As String = ""
 
-                            If Me.InterfaceControl.Info.Username <> "" Then
-                                UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
-                            End If
+                                If My.Settings.EmptyCredentials = "windows" Then
+                                    UserArg = " -l """ & Environment.UserName & """"
+                                ElseIf My.Settings.EmptyCredentials = "custom" Then
+                                    UserArg = " -l """ & My.Settings.DefaultUsername & """"
+                                    PassArg = " -pw """ & Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) & """"
+                                End If
 
-                            If Me.InterfaceControl.Info.Password <> "" Then
-                                PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
-                            End If
+                                If Me.InterfaceControl.Info.Username <> "" Then
+                                    UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
+                                End If
 
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.telnet
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        Case Putty_Protocol.serial
-                            Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                    End Select
+                                If Me.InterfaceControl.Info.Password <> "" Then
+                                    PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
+                                End If
 
-                    'REMOVE IN RELEASE!
-                    'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & Arguments, True)
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.telnet
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                            Case Putty_Protocol.serial
+                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                        End Select
 
-                    PuttyProcessStartInfo.Arguments = Arguments
+                        'REMOVE IN RELEASE!
+                        'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & .Arguments, True)
+                    End With
 
-                    PuttyProcess = Process.Start(PuttyProcessStartInfo)
                     PuttyProcess.EnableRaisingEvents = True
-                    PuttyProcess.WaitForInputIdle()
-
                     AddHandler PuttyProcess.Exited, AddressOf ProcessExited
 
+                    PuttyProcess.Start()
+                    PuttyProcess.WaitForInputIdle()
+
                     Dim TryCount As Integer = 0
                     Do Until PuttyProcess.MainWindowHandle <> IntPtr.Zero And Me.InterfaceControl.Handle <> IntPtr.Zero And Me.PuttyProcess.MainWindowTitle <> "Default IME"
                         If TryCount >= My.Settings.MaxPuttyWaitTime * 2 Then
@@ -161,31 +165,29 @@ 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(Me.PuttyHandle, Me.InterfaceControl.Parent.Handle)
-                    SetWindowLong(Me.PuttyHandle, 0, WS_VISIBLE)
-                    ShowWindow(Me.PuttyHandle, SW_SHOWMAXIMIZED)
+                    SetParent(PuttyHandle, InterfaceControl.Parent.Handle)
+                    ShowWindow(PuttyHandle, SW_SHOWMAXIMIZED)
                     Resize()
 
                     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
 
-
             Public Overrides Sub Focus()
                 Try
-                    SetForegroundWindow(PuttyHandle)
+                    '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
 
@@ -193,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
 
@@ -203,17 +205,26 @@ 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()
             End Sub
+
+            Public Sub ShowSettingsDialog()
+                Try
+                    PostMessage(Me.PuttyHandle, WM_SYSCOMMAND, IDM_RECONF, 0)
+                    SetForegroundWindow(Me.PuttyHandle)
+                Catch ex As Exception
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True)
+                End Try
+            End Sub
 #End Region
 
 #Region "Public Shared Methods"
@@ -233,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
@@ -247,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
@@ -33,15 +34,14 @@ Namespace Connection
 #End Region
 
 #Region "Private Declarations"
-            Private rd As MSTSCLib.IMsRdpClient5
-            Private RDP As AxMsRdpClient5
+            Private RDP As AxMsRdpClient6NotSafeForScripting
             Private Info As Connection.Info
             Private RDPVersion As Version
 #End Region
 
 #Region "Public Methods"
             Public Sub New()
-                Me.Control = New AxMsRdpClient5
+                Me.Control = New AxMsRdpClient6NotSafeForScripting
             End Sub
 
             Public Overrides Function SetProps() As Boolean
@@ -59,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)
 
@@ -76,10 +75,11 @@ 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
+                    RDP.AdvancedSettings7.EnableCredSspSupport = True
 
                     RDP.AdvancedSettings2.overallConnectionTimeout = 20
 
@@ -90,17 +90,17 @@ Namespace Connection
                     Me.SetRedirectKeys()
                     Me.SetRedirection()
                     Me.SetAuthenticationLevel()
-                    Me.SetTSGateway()
+                    Me.SetRDGateway()
 
                     RDP.ColorDepth = Int(Me.Info.Colors)
 
                     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,21 +150,35 @@ 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
 
 #Region "Private Methods"
-            Private Sub SetTSGateway()
+            Private Sub SetRDGateway()
                 Try
-                    'If RDP.TransportSettings.GatewayIsSupported = 1 Then
-                    '    MsgBox("TS Gateway supported")
-                    'Else
-                    '    MsgBox("TS Gateway unsupported")
-                    'End If
+                    If RDP.TransportSettings.GatewayIsSupported = 1 Then
+                        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
+                            RDP.TransportSettings.GatewayHostname = Me.Info.RDGatewayHostname
+                            If Me.Info.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes Then
+                                RDP.TransportSettings.GatewayUsername = Me.Info.Username
+                                RDP.TransportSettings.GatewayPassword = Me.Info.Password
+                                RDP.TransportSettings.GatewayDomain = Me.Info.Domain
+                            Else
+                                RDP.TransportSettings.GatewayUsername = Me.Info.RDGatewayUsername
+                                RDP.TransportSettings.GatewayPassword = Me.Info.RDGatewayPassword
+                                RDP.TransportSettings.GatewayDomain = Me.Info.RDGatewayDomain
+                            End If
+                        End If
+                    Else
+                        mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strRdpGatewayNotSupported, True)
+                    End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetTSGateway failed" & vbNewLine & ex.Message, True)
+                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpSetGatewayFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -172,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
 
@@ -239,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
 
@@ -270,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
 
@@ -280,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
 
@@ -293,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
 
@@ -305,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
 
@@ -320,9 +334,17 @@ Namespace Connection
                         pFlags += Int(Connection.Protocol.RDP.RDPPerformanceFlags.DisableWallpaper)
                     End If
 
-                    RDP.AdvancedSettings2.PerformanceFlags = pFlags
+                    If Me.Info.EnableFontSmoothing Then
+                        pFlags += Int(Connection.Protocol.RDP.RDPPerformanceFlags.EnableFontSmoothing)
+                    End If
+
+                    If Me.Info.EnableDesktopComposition Then
+                        pFlags += Int(Connection.Protocol.RDP.RDPPerformanceFlags.EnableDesktopComposition)
+                    End If
+
+                    RDP.AdvancedSettings.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
 
@@ -330,7 +352,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
 
@@ -342,7 +364,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
@@ -353,7 +375,8 @@ Namespace Connection
             End Sub
 
             Private Sub RDPEvent_OnDisconnected(ByVal sender As Object, ByVal e As AxMSTSCLib.IMsTscAxEvents_OnDisconnectedEvent)
-                MyBase.Event_Disconnected(Me, e.discReason)
+                Dim Reason As String = RDP.GetErrorDescription(e.discReason, RDP.ExtendedDisconnectReason)
+                MyBase.Event_Disconnected(Me, e.discReason & vbCrLf & Reason)
 
                 If My.Settings.ReconnectOnDisconnect Then
                     ReconnectGroup = New ReconnectGroup
@@ -393,46 +416,52 @@ Namespace Connection
             End Enum
 
             Public Enum RDPColors
-                <Description(Language.Base.RDP256Colors)> _
+                <LocalizedDescription("strRDP256Colors")> _
                 Colors256 = 8
-                <Description("16 Bit")> _
+                <LocalizedDescription("strRDP32768Colors")> _
+                Colors15Bit = 15
+                <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")> _
-                DisableWallpaper = 1
-                <Description("Disable Full Window drag")> _
-                DisableFullWindowDrag = 2
-                <Description("Disable Menu Animations")> _
-                DisableMenuAnimations = 4
-                <Description("Disable Themes")> _
-                DisableThemes = 8
-                <Description("Disable Cursor Shadow")> _
-                DisableCursorShadow = 20
-                <Description("Disable Cursor blinking")> _
-                DisableCursorBlinking = 40
+                <Description("strRDPDisableWallpaper")> _
+                DisableWallpaper = &H1
+                <Description("strRDPDisableFullWindowdrag")> _
+                DisableFullWindowDrag = &H2
+                <Description("strRDPDisableMenuAnimations")> _
+                DisableMenuAnimations = &H4
+                <Description("strRDPDisableThemes")> _
+                DisableThemes = &H8
+                <Description("strRDPDisableCursorShadow")> _
+                DisableCursorShadow = &H20
+                <Description("strRDPDisableCursorblinking")> _
+                DisableCursorBlinking = &H40
+                <Description("strRDPEnableFontSmoothing")> _
+                EnableFontSmoothing = &H80
+                <Description("strRDPEnableDesktopComposition")> _
+                EnableDesktopComposition = &H100
             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
@@ -473,13 +502,29 @@ 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
+                <LocalizedDescription("strNever")> _
+                Never = 0 ' TSC_PROXY_MODE_NONE_DIRECT
+                <LocalizedDescription("strAlways")> _
+                Always = 1 ' TSC_PROXY_MODE_DIRECT
+                <LocalizedDescription("strDetect")> _
+                Detect = 2 ' TSC_PROXY_MODE_DETECT
+            End Enum
+
+            Public Enum RDGatewayUseConnectionCredentials
+                <LocalizedDescription("strUseDifferentUsernameAndPassword")> _
+                No = 0
+                <LocalizedDescription("strUseSameUsernameAndPassword")> _
+                Yes = 1
+            End Enum
 #End Region
 
 #Region "Resolution"
@@ -526,7 +571,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
 
@@ -553,7 +598,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
@@ -581,7 +626,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
@@ -592,7 +637,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
 
@@ -615,14 +660,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
@@ -661,7 +706,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
@@ -717,71 +762,27 @@ Namespace Connection
             End Class
 #End Region
 
-#Region "Disconnection Errors"
-            Public Class DisconnectionErrors
-                Public Shared Code(3080) As String
-
-                Public Shared Function GetError(ByVal id As Integer) As String
-                    Try
-                        Code(1) = "Local Disconnection (not an error)"
-                        Code(2) = "Remote Disconnection by user (not an error)"
-                        Code(3) = "Remote Disconnection by server (not an error)"
-                        Code(260) = "DNS Lookup Failed"
-                        Code(262) = "Out of memory condition"
-                        Code(264) = "Connection Timed Out"
-                        Code(516) = "WinSock socket connect failed"
-                        Code(518) = "Out of memory condition"
-                        Code(520) = "Host Not Found error (GetHostByName failed)."
-                        Code(772) = "WinSock send call failed"
-                        Code(774) = "Out of memory condition"
-                        Code(776) = "Invalid IP address specified"
-                        Code(1028) = "WinSock recv call failed"
-                        Code(1030) = "Invalid Security Data"
-                        Code(1032) = "Internal error (code 1032)"
-                        Code(1286) = "Invalid Encryption Method"
-                        Code(1288) = "DNS Lookup failed"
-                        Code(1540) = "GetHostByName call failed"
-                        Code(1542) = "Invalid server security data"
-                        Code(1544) = "Internal Error (timer error)"
-                        Code(1796) = "Timeout occurred"
-                        Code(1798) = "Failed to unpack server certificate"
-                        Code(2052) = "Bad IP address specified"
-                        Code(2054) = "Internal Security Error"
-                        Code(2308) = "Socket closed"
-                        Code(2310) = "Internal Security Error"
-                        Code(2566) = "Internal Security Error"
-                        Code(2822) = "Encryption error"
-                        Code(2824) = "Your session was taken by someone else"
-                        Code(3078) = "Decryption error"
-
-                        Return (Code(id))
-                    Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetError failed (DisconnectionErrors)" & vbNewLine & ex.Message, True)
-                    End Try
-
-                    Return ""
-                End Function
-            End Class
-
+#Region "Fatal Errors"
             Public Class FatalErrors
-                Public Shared Code(110) As String
+                Protected Shared _description() As String = { _
+                    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
-                        Code(0) = "An unknown error has occurred"
-                        Code(1) = "Internal error code 1"
-                        Code(2) = "Out of memory error"
-                        Code(3) = "Window creation error"
-                        Code(4) = "Internal error code 2"
-                        Code(5) = "Internal error code 3 (Invalid state)"
-                        Code(100) = "Winsock initialization error"
-
-                        Return (Code(id))
+                        Return (_description(id))
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetError failed (FatalErrors)" & vbNewLine & ex.Message, True)
+                        mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strRdpErrorGetFailure & vbNewLine & ex.Message, True)
+                        Return String.Format(My.Resources.strRdpErrorUnknown, id)
                     End Try
-
-                    Return ""
                 End Function
             End Class
 #End Region

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,16 +23,45 @@ Partial Class frmMain
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container
+        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
@@ -48,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
@@ -77,32 +107,85 @@ 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.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
         '
         Me.pnlDock.ActiveAutoHideContent = Nothing
         Me.pnlDock.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnlDock.DockBackColor = System.Drawing.SystemColors.Control
         Me.pnlDock.DockLeftPortion = 230
         Me.pnlDock.DockRightPortion = 230
         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, 474)
+        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
@@ -114,86 +197,177 @@ Partial Class frmMain
         Me.msMain.Location = New System.Drawing.Point(3, 0)
         Me.msMain.Name = "msMain"
         Me.msMain.Padding = New System.Windows.Forms.Padding(2, 2, 0, 2)
-        Me.msMain.Size = New System.Drawing.Size(182, 24)
+        Me.msMain.Size = New System.Drawing.Size(274, 24)
         Me.msMain.Stretch = False
         Me.msMain.TabIndex = 16
         Me.msMain.Text = "Main Toolbar"
         '
         '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"
+        Me.mMenFileImportExport.Visible = False
+        '
+        '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)
+        Me.mMenFileSep3.Visible = False
+        '
+        '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
         '
-        Me.mMenView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewAddConnectionPanel, Me.mMenViewConnectionPanels, Me.mMenViewSep1, Me.mMenViewConnections, Me.mMenViewConfig, Me.mMenViewSessions, Me.mMenViewErrorsAndInfos, Me.mMenViewScreenshotManager, Me.ToolStripSeparator1, Me.mMenViewJumpTo, Me.mMenViewSep2, Me.mMenViewQuickConnectToolbar, Me.mMenViewExtAppsToolbar, Me.mMenViewSep3, Me.mMenViewFullscreen})
+        Me.mMenView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewAddConnectionPanel, Me.mMenViewConnectionPanels, Me.mMenViewSep1, Me.mMenViewConnections, Me.mMenViewConfig, Me.mMenViewSessions, Me.mMenViewErrorsAndInfos, Me.mMenViewScreenshotManager, Me.ToolStripSeparator1, Me.mMenViewJumpTo, Me.mMenViewResetLayout, Me.mMenViewSep2, Me.mMenViewQuickConnectToolbar, Me.mMenViewExtAppsToolbar, Me.mMenViewSep3, Me.mMenViewFullscreen})
         Me.mMenView.Name = "mMenView"
         Me.mMenView.Size = New System.Drawing.Size(44, 20)
         Me.mMenView.Text = "&View"
         '
         '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"
@@ -207,7 +381,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"
@@ -234,7 +408,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"
@@ -254,7 +428,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"
@@ -264,7 +438,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
@@ -272,7 +446,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
@@ -280,9 +454,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"
@@ -290,7 +470,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"
@@ -309,10 +489,11 @@ 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)
-        Me.mMenViewFullscreen.Text = "Fullscreen (Kiosk Mode)"
+        Me.mMenViewFullscreen.Text = "Full Screen"
         '
         'mMenTools
         '
@@ -323,17 +504,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
         '
@@ -344,7 +526,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"
@@ -356,7 +538,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"
@@ -398,7 +580,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"
@@ -411,7 +593,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"
@@ -423,14 +605,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"
@@ -442,7 +624,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"
@@ -463,7 +645,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
         '
@@ -476,7 +658,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, 474)
+        Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 424)
         Me.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill
         '
         'tsContainer.LeftToolStripPanel
@@ -497,42 +679,14 @@ 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
         Me.tsExtAppsToolbar.Dock = System.Windows.Forms.DockStyle.None
-        Me.tsExtAppsToolbar.Location = New System.Drawing.Point(254, 24)
+        Me.tsExtAppsToolbar.Location = New System.Drawing.Point(39, 49)
         Me.tsExtAppsToolbar.Name = "tsExtAppsToolbar"
         Me.tsExtAppsToolbar.Size = New System.Drawing.Size(111, 25)
         Me.tsExtAppsToolbar.TabIndex = 17
@@ -551,6 +705,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
@@ -566,9 +805,10 @@ Partial Class frmMain
         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.Opacity = 0
         Me.Text = "mRemoteNG"
         Me.msMain.ResumeLayout(False)
         Me.msMain.PerformLayout()
@@ -577,9 +817,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
@@ -592,10 +834,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
@@ -644,5 +885,28 @@ Partial Class frmMain
     Friend WithEvents ToolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
     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
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAwAA
-        CwMBSY6M0gAAArhJREFUOE91U91LU3EYnt0GjUYSgv+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
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAwAA
-        CwMBSY6M0gAAA4RJREFUOE9lk21MU3cUh/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,28 +1,45 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Reflection
 Imports Crownwood
+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 "Properties"
+    Private _IsClosing As Boolean = False
+    Public ReadOnly Property IsClosing() As Boolean
+        Get
+            Return _IsClosing
+        End Get
+    End Property
+#End Region
 
 #Region "Startup & Shutdown"
     Private Sub frmMain_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         'insert enable edition code here
         App.Editions.Spanlink.Enabled = False
 
-        ApplyLanguage()
+        Startup.CreateLogger()
+
+        ' Create gui config load and save objects
+        sL = New Config.Settings.Load(Me)
+        sS = New Config.Settings.Save(Me)
+
+        ' Load GUI Configuration
+        sL.Load()
 
         Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now)
 
         Startup.ParseCommandLineArgs()
 
+        ApplyLanguage()
 
-        sL = New Config.Settings.Load(Me)
-        sS = New Config.Settings.Save(Me)
-
-        Startup.CreateLogger()
-
-        sL.Load()
+        fpChainedWindowHandle = SetClipboardViewer(Me.Handle)
 
         mC = New Messages.Collector(Windows.errorsForm)
 
@@ -49,9 +66,14 @@ Public Class frmMain
         End If
 
         If Not My.Settings.CheckForUpdatesAsked Then
-            Windows.Show(UI.Window.Type.Options)
-            Windows.optionsForm.ShowUpdatesTab()
-            My.Settings.CheckForUpdatesAsked = True
+            Dim CommandButtons() As String = {My.Resources.strAskUpdatesCommandRecommended, My.Resources.strAskUpdatesCommandCustom, My.Resources.strAskUpdatesCommandAskLater}
+            Dim Result As DialogResult = cTaskDialog.ShowTaskDialogBox(Me, My.Application.Info.ProductName, My.Resources.strAskUpdatesMainInstruction, String.Format(My.Resources.strAskUpdatesContent, My.Application.Info.ProductName), "", "", "", "", String.Join("|", CommandButtons), eTaskDialogButtons.None, eSysIcons.Question, eSysIcons.Question)
+            If cTaskDialog.CommandButtonResult = 0 Or cTaskDialog.CommandButtonResult = 1 Then
+                My.Settings.CheckForUpdatesAsked = True
+            End If
+            If cTaskDialog.CommandButtonResult = 1 Then
+                Windows.ShowUpdatesTab()
+            End If
         End If
 
         Startup.UpdateCheck()
@@ -60,64 +82,100 @@ Public Class frmMain
 
         AddSysMenuItems()
         AddHandler Microsoft.Win32.SystemEvents.DisplaySettingsChanged, AddressOf DisplayChanged
+
+        Me.Opacity = 1
     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
-            If MsgBox(Language.Base.UnclosedConnectionPanels, MsgBoxStyle.YesNo Or MsgBoxStyle.Question) = MsgBoxResult.No Then
+            Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.ProductName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
+            If cTaskDialog.VerificationChecked Then
+                My.Settings.ConfirmExit = False
+            End If
+            If Result = DialogResult.No Then
                 e.Cancel = True
                 Exit Sub
             End If
         End If
 
+        _IsClosing = True
+
+        For Each Window As UI.Window.Base In wL
+            Window.Close()
+        Next
+
         App.Runtime.Shutdown.BeforeQuit()
 
         Debug.Print("[END] - " & Now)
-        End
     End Sub
 #End Region
 
+#Region "Timer"
     Private tmrRuns As Integer = 0
     Private Sub tmrShowUpdate_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tmrShowUpdate.Tick
         If tmrRuns = 5 Then
@@ -141,7 +199,7 @@ Public Class frmMain
         mC.AddMessage(Messages.MessageClass.InformationMsg, "Doing AutoSave", True)
         App.Runtime.SaveConnections()
     End Sub
-
+#End Region
 
 #Region "Ext Apps Toolbar"
     Private Sub cMenToolbarShowText_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles cMenToolbarShowText.Click
@@ -209,13 +267,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
@@ -237,6 +347,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"
@@ -258,6 +383,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)
@@ -335,6 +466,12 @@ Public Class frmMain
         Windows.errorsForm.Activate()
     End Sub
 
+    Private Sub mMenViewResetLayout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewResetLayout.Click
+        If MsgBox(My.Resources.strConfirmResetLayout, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            App.Runtime.Startup.SetDefaultLayout()
+        End If
+    End Sub
+
     Private Sub mMenViewAddConnectionPanel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewAddConnectionPanel.Click
         AddPanel()
     End Sub
@@ -413,7 +550,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
@@ -428,21 +565,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
@@ -541,13 +678,14 @@ 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
     End Sub
 #End Region
 
+#Region "Window Overrides and DockPanel Stuff"
     Private Sub frmMain_Resize(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Resize
         If Me.WindowState = FormWindowState.Minimized Then
             If My.Settings.MinimizeToTray Then
@@ -561,44 +699,47 @@ Public Class frmMain
         End If
     End Sub
 
-#Region "Window Overrides and DockPanel Stuff"
-    Private Const WM_GETTEXT As Integer = &HD
-    Private Const WM_ACTIVATEAPP As Integer = &H1C
-    Private Const WM_WINDOWPOSCHANGED As Integer = &H47
-
     Private bWmGetTextFlag As Boolean = False
     Private bWmWindowPosChangedFlag As Boolean = False
 
     Protected Overloads Overrides Sub WndProc(ByRef m As Message)
         Try
+#If Config = "Debug" Then
             'Debug.Print(m.Msg)
+#End If
 
-            If m.Msg = WM_GETTEXT Then
-                bWmGetTextFlag = True
-            ElseIf m.Msg = WM_WINDOWPOSCHANGED Then
-                If bWmGetTextFlag Then
-                    ActivateConnection()
-                End If
-
-                bWmGetTextFlag = False
-                bWmWindowPosChangedFlag = True
-            ElseIf m.Msg = WM_ACTIVATEAPP Then
-                If bWmWindowPosChangedFlag Then
-                    ActivateConnection()
-                End If
-            Else
-                bWmGetTextFlag = False
-                bWmWindowPosChangedFlag = False
-            End If
-
-            If m.Msg = Tools.SystemMenu.Flags.WM_SYSCOMMAND Then
-                For i As Integer = 0 To SysMenSubItems.Length - 1
-                    If SysMenSubItems(i) = m.WParam Then
-                        Screens.SendFormToScreen(Screen.AllScreens(i))
-                        Exit For
+            Select Case m.Msg
+                Case WM_GETTEXT
+                    bWmGetTextFlag = True
+                Case WM_WINDOWPOSCHANGED
+                    If bWmGetTextFlag Then
+                        ActivateConnection()
                     End If
-                Next
-            End If
+
+                    bWmGetTextFlag = False
+                    bWmWindowPosChangedFlag = True
+                Case WM_ACTIVATEAPP
+                    If bWmWindowPosChangedFlag Then
+                        ActivateConnection()
+                    End If
+                Case WM_SYSCOMMAND
+                    For i As Integer = 0 To SysMenSubItems.Length - 1
+                        If SysMenSubItems(i) = m.WParam Then
+                            Screens.SendFormToScreen(Screen.AllScreens(i))
+                            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
+            End Select
         Catch ex As Exception
         End Try
 
@@ -639,10 +780,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/frmOptions.resx

@@ -0,0 +1,277 @@
+<?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>
+  <metadata name="imgListPages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="imgListPages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABu
+        IgAAAk1TRnQBSQFMAgEBBwEAAdABAAHQAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIB4AAeIB7wH0Af8BqAHJAdcB/wF3AaQBtgH/AVoBhgGcAf8BRQFsAYoB/wFA
+        AWcBhwH/AUABcQGVAf8BUwGOAasB/wGPAbcBzQH/Ad0B6gHxAf8MAANXAbcDnwH/A5oB/wOWAf8DkQH/
+        A40B/wOJAf8DhAH/A4AB/wNiAf8DXgH/A1oB/wNXAf8DUwH/A1AB/wNXAbcYAAMNARIDVgG2A1YBtgMN
+        ARFgAAGtAc8B3wH/AVIBkQGtAf8BVwGjAb8B/wFzAcAB1AH/AZUB2QHmAf8BgQHbAfAB/wFLAcYB7AH/
+        AR8BqgHdAf8BEQGSAccB/wEdAYABrAH/ATQBbAGSAf8BnQG/AdEB/wgAA6gB/wPpAf8D0wH/A9IB/wPR
+        Af8D0AH/A84B/wPNAf8DzQH/A8sB/wPLAf8DygH/A8kB/wPIAf8D4gH/A1AB/xgAA14B2QPkAf8D4wH/
+        A1gBwWAAAVUBhAGbAf8BPwG9AecB/wFiAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHw
+        Af8BGQG2Ae0B/wEAAacB6AH/AQABoQHhAf8BBAGWAdIB/wE4AVkBdQH/CAADrQH/A9YB/wO6Af8DuAH/
+        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DVAH/CAADCwEPA1QBrQM6
+        AWEDPwFuA3sB+AHiAeEB3wH/AeEB4AHfAf8DawHzAzwBZwM8AWYDUwGtAwsBD1AAAVgBhwGeAf8BPgHE
+        AfAB/wFkAdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHwAf8BGQG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE5AVoBdwH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOw
+        Af8DrwH/A60B/wOrAf8DqQH/A6gB/wPKAf8DWAH/CAADWgHFBP8CtAGzAf4CswGyAf4C5wHmAf8B1gHV
+        AdMB/wHXAdYB1AH/AeMB4gHgAf8BqAGnAaUB/gKxAbAB/QHpAegB5gH/A1gBwVAAAVoBiQGgAf8BPgHE
+        Ae8B/wFjAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/AUwBygHwAf8BGQG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE7AV0BeQH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0
+        Af8DsgH/A7AB/wOtAf8DrAH/A6wB/wPPAf8DXAH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/
+        AckByAHGAf8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeVQAAFcAYwBogH/
+        AUABxgHwAf8BZQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wFMAcoB8AH/ARkBtgHtAf8BAAGo
+        AegB/wEAAaIB4gH/AQABmwHbAf8BPQFgAYAB/wgAA1oBvQPaAf8DyAH/A8AB/wO/Af8DvQH/A7oB/wO4
+        Af8DtwH/A7UB/wOzAf8DsAH/A68B/wOzAf8DwgH/A1oBvQgAA04BlQH2AfUB9AH/AeYB5QHkAf8BvwG+
+        Ab0B/wLrAeoB/wHUAdMB0gH/AdYB1QHUAf8B4gLhAf8CtAGzAf8B1wHWAdQB/wHiAeEB3wH/A0oBjVAA
+        AV8BjwGlAf8BQQHGAfAB/wFlAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUsBygHwAf8BGQG2
+        Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wE/AWMBgwH/CAADWgG9A+MB/wPnAf8D4QH/A+AB/wPg
+        Af8D3wH/A98B/wPeAf8D3QH/A90B/wPcAf8D2wH/A+AB/wPQAf8DWgG9AwsBDwNVAbUDZAHnAeQB4wHi
+        Af8B0QHQAc8B/wLwAe8B/wOuAf8DZAHxA2cB8gKsAasB/wLoAecB/wLLAcoB/wHgAd8B3QH/A2EB5ANV
+        AbUDCwEPSAABYAGSAagB/wFBAcUB8AH/AWYB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0Af8BSwHK
+        AfAB/wEZAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/AUEBZgGGAf8IAAMpAT8DzgH/A+wB/wPe
+        Af8D2AH/A9IB/wPMAf8DyAH/A8cB/wPIAf8DywH/A9AB/wPdAf8D6AH/A6QB/wMrAUIDPwFtAuQB4wH/
+        AdgB1gHVAf8B0gHRAdAB/wHFAcQBwwH/Ae0B7AHrAf8DVwG6CAADXAHNAegB5wHmAf8BtgG1AbQB/wHW
+        AdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmSAABYwGVAasB/wFBAcUB8AH/AWYB1AHyAf8BjQHjAfQB/wGi
+        AesB9gH/AYMB3wH0Af8BTAHLAfAB/wEZAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/AUQBaQGI
+        Af8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wFKAa0BTgH/AVwBqgFKAf8BVgGvAU4B/wE8AaUBSAH/
+        AawBxQGsAf8DwgH/A9EB/wPTAf8DWgG9BAADQgF2AewB6wHoAf8B2gHZAdcB/wHUAdMB0QH/AcYBxQHE
+        Af8B3gLcAf8DRgF+CAADUAGaAd0B3AHbAf8ByAHGAcUB/wLiAeEB/wLhAd8B/wHuAe0B7AH/Az8Bb0gA
+        AWUBmAGuAf8BQQHFAfAB/wFmAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHwAf8BGQG2
+        Ae0B/wEAAagB6QH/AQABoQHhAf8BAAGcAdoB/wFGAWsBigH/DAADKQE/A9EB/wPzAf8BxwHeAcoB/wFK
+        AckBhQH/AbMB3AGkAf8B5wHHAWIB/wHcAb8BWQH/AVwBzAGPAf8BNQGtAU4B/wG4AdABuAH/A/EB/wOv
+        Af8DKwFCBAADLwFKA2AB6wONAfwB3gHdAdwB/wHLAsoB/wHmAuUB/wNhAeEDMgFQAzgBXANgAesC7gHs
+        Af8BzALLAf8B5wHmAeUB/wKOAY0B/ANgAesDLAFDSAABaAGbAbAB/wFAAcYB8AH/AWYB1AHyAf8BjQHj
+        AfQB/wGiAesB9gH/AYMB3wH0Af8BTAHKAfAB/wEZAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/
+        AUkBbwGOAf8QAANaAb0DxAH/AVwBzgGLAf8BmQHkAasB/wGwAcUBQwH/AeoBtQEuAf8B4QGiAR8B/wGl
+        AZ0BJgH/AYIBxQGPAf8BLwGaATwB/wOgAf8DWgG9EAADXgHOAeEB4AHeAf8B2QHXAdYB/wG4ArcB/wHh
+        AeAB3wH/A6wB/QOxAf0C9gH1Af8CwAG/Af8B6gHpAegB/wLzAfIB/wNcAclQAAFrAZ8BswH/AUABxgHw
+        Af8BZAHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wFMAcoB8AH/ARkBtgHtAf8BAAGnAegB/wEA
+        AaEB4QH/AQABmwHaAf8BSwFyAZAB/xgAAWgBlQFzAfwBogHpAZUB/wHWAc8BTwH/AeIBswEtAf8B0QG7
+        ATUB/wHCAa4BKAH/AYIBvQFSAf8BMQF5AV4B/BgAA0wBkQHjAeIB4AH/At4B3AH/AeEB4AHfAf8BzALL
+        Af8BxAHDAcIB/wLPAc4B/wLeAd0B/wLwAe8B/wLwAe8B/wL2AfUB/wNIAYdQAAFsAaEBtQH/AWYB1QH0
+        Af8BmgHoAfcB/wG1AfMB+gH/AcIB+AH8Af8BwwH4Af0B/wHBAfcB/QH/Aa8B8AH7Af8BjwHiAfcB/wFl
+        AdAB8AH/ATkBuAHlAf8BTgF1AZMB/xgAAWoBlQF0AfwBogHwAZ8B/wHYAe0BrwH/Ad4BxQFOAf8BtAHi
+        AUsB/wFGAecBHwH/AVEB1wFRAf8BQAF7AWUB/BQAAwEBAgNfAeMB5QHkAeEB/wLuAe0B/wLuAe0B/wLr
+        AeoB/wHjAeIB4QH/AugB5wH/AuoB6QH/AvMB8gH/AvUB9AH/AfoB+QH4Af8DXAHfUAABbwGjAbgB/wHF
+        AfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9
+        Af8BxQH5Af0B/wHFAfkB/QH/AVABeAGVAf8YAANhAdwByAH3AdQB/wHYAfYBygH/AecB4wGpAf8B2wHP
+        AVIB/wGvAdwBTgH/AZ0B6gGrAf8DXwHgGAADQAFvA38B/gNkAecDXwHzAegB5wHmAf8B5wHmAeUB/wLt
+        AewB/wL7AfoB/wNnAfIDZAHnA4QB/gM9AWhQAAG3AdcB4QH/AYwBvQHMAf8BnQHPAdsB/wGtAd8B6AH/
+        AbkB7AHzAf8BwgH1AfoB/wHCAfUB+gH/AbgB6wHxAf8BqQHaAeMB/wGUAcQB0QH/AXYBqAG4Af8BqQHF
+        AdEB/xgAAy0BRQFrAYUBdwH6AdsB+AHpAf8B5wHyAdgB/wHtAeUBswH/Ad8B2QGmAf8BXwGPAV8B+wMy
+        AVAgAAMPARQDCgEOA1MBqgHvAe4B7QH/AvQB8wH/A1IBpAMIAQsDEQEXWAAC/gL/AeMB8QH0Af8BuQHX
+        AeEB/wGVAb4BzAH/AXYBqAG7Af8BaQGbAbAB/wFlAZgBrQH/AW4BoQGzAf8BjAGyAcIB/wGxAc0B1wH/
+        Ad8B6wHvAf8D/gH/HAADLgFHA14B2QFuAZUBcgH8AW4BkQFuAfwDXgHdAzIBUCwAAy8BSgNdAfADYgHv
+        AywBQ2QAAxEBFwNWAbMBUwFUAVMBrLQAAwQBBQMQARUDHwEtAykBPwMvAUkDLgFIAygBPQMeASsDDwEU
+        AwMBBBAAA7cB/wGcAagBngH/AQABXQE4Af8BIgGSAVoB/wEAAWEBOAH/AQoBTgGgAf8BBwFMAZ4B/wED
+        AUkBmwH/AQABRwGZAf8BAAFFAZcB/wEAAUIBlAH/AQABQQGTAf8DUgH/A1IB/xwAA0EBcgFMAl8B8wFZ
+        AlwBzwFLAkwBkAMjATNcAAMFAQcDHwEsAj4BPQFqAlIBUAGjAVsCWQHEAV0CWgHTAV0CWgHTAVsCWQHD
+        AVICUQGhAzwBZgMcASgDBAEGDAADFQEdA1EBogEnAZUBXgH/AYIBvgGqAf8BNgGlAYIB/wEXAZcBUAH/
+        ARoBmQFVAf8BHgGZAVkB/wEiAZ0BXgH/AVwBqgHSAf8BWgGoAdEB/wEAAUMBlQH/IAADIQEwASsBRgFy
+        AfwBhgGtAeEB/wFkAagB3AH/AUUBkgHJAf8BFgFYAasB/wFVAlYBsQMfAS1TAAEBAxIBGAM+AWsBXQJZ
+        AdcBYAErASkB/AGsATMBCgH/AeEBUwEnAf8B5AFlATsB/wHTAVEBHwH/AaMBQAEwAf0BYQJeAdoCPgE9
+        AWoDDwEUCAADGAEiAVABUgFQAaQDVgGzAVMBrAGfAf8BWgG3AZ4B/wFkAbsBrAH/AWQBuwGuAf8BZQG7
+        AbAB/wGAAbwBswH/AR0BmgFhAf8BOgGVAccB/wFdAasB0wH/AQABRgGYAf8gAAFUAlYBqwFTAZ0B0QH/
+        AZkBvAHrAf8BVwGgAeMB/wGWAbkB6gH/AZQBuAHqAf8BRgGTAcoB/wErATQBbgH8A0MBeFAAAxsBJgNZ
+        AdIBIwENAQAB/wGKAUIBKgH/AcoBhgFMAf8B9gG8AZwB/wH5AcwBtwH/AeMBoAFeAf8BsQFdAUMB/wFf
+        ATkBGgH/AV4CWAHdAxwBKAgAAVUBVgFVAbEDVgGzA1YBswFCAaQBkQH/AVUBtgGbAf8BTgGyAZsB/wFQ
+        AbIBngH/AVIBswGhAf8BhQG/AbYB/wEkAZ4BggH/AT8BmQHJAf8BYQGtAdQB/wEEAUoBnAH/HAADHwEt
+        ASsBWQF2AfwBnQG/AewB/wFPAZwB4gH/AUEBkwHfAf8BPgGRAd8B/wFFAZQB4AH/AZUBuAHqAf8BhgGt
+        AeEB/wEvAYMBuwH/AUsCTAGQBAADnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/CAABUwJPAaUBOgEfAQcB/wFfAUoBNQH/AY8BXAFHAf8BrAGI
+        AVEB/wHCAaMBiAH/AcEBpQGOAf8BswGYAYEB/wGRAVwBRgH/AVoBQQEsAf8BSQEiAQAB/wFWAlUBsQgA
+        AwgBCwNVAbIDVgGzAVwBsgGoAf8BYwG9AacB/wGHAcEBtQH/AYYBwQG2Af8BhwHBAbcB/wGIAcEBuQH/
+        ASoBogGIAf8BRAGcAcsB/wFlAbAB1QH/AQkBTQGfAf8QAAMrAUIDSAGEAVUCVwG3AUwBXwFhAfMBXAGk
+        AdcB/wGhAcIB7QH/AZ8BwAHtAf8BnQG/Ae0B/wFaAaMB5AH/AUABkgHfAf8BPgGQAd4B/wFhAacB5gH/
+        AZIBtgHoAf8BKQFlAbcB/wM3AVoDnQH/AboCvQH/AeYC7AH/AeYC7QH/AecC7QH/AegC7gH/AekC7wH/
+        AekC7wH/AeoC7wH/AeoC8AH/AesC8AH/AesC8QH/AewC8QH/AewC8QH/Ab0CvwH/A50B/wQAAzkBXwFb
+        ATsBIAH/AcMBsQGiAf8BtgGcAYMB/wGmAV8BMgH/AagBXQEvAf8BwwGkAYcB/wHYAcYBsAH/Ab0BqQGL
+        Af8BZQFFASUB/wFCASIBAwH/ATgBFAEAAf8BPwEYAQAB/wMzAVMIAAMGAQgDVQGyATUBoAGKAf8BkwHJ
+        AboB/wFFAa8BlwH/ASoBogGDAf8BKwGjAYcB/wEtAaQBiwH/ASwBqgGSAf8BOgHCAe0B/wGBAbQB1wH/
+        AQ4BUQGjAf8MAANMAZMBSgGXAc8B/wFhAagB2QH/AY0BtAHiAf8BowHEAe0B/wGnAccB7gH/AUoBlwHN
+        Af8BGgFbAbIB/wFFAZMByQH/AZ8BwAHtAf8BXgGWAaMB/wGeAZYBLgH/AWIBlAGRAf8BjQGzAekB/wFf
+        AaUB2AH/AVoCXgHYBAADXAHqAdsC4gH/Ac0CzwH/A8sB/wPMAf8DzgH/A88B/wPQAf8D0gH/A9MB/wPV
+        Af8B1wLYAf8B5wLsAf8DbQH3BAADIgExAVYCVQGxAU0BIQEAAf8BqgGFAUUB/wGyAVgBFgH/Aa0BNQEA
+        Af8BugFSAQoB/wHqAdUBvwH/Af0B/AH6Af8B1gG+AaYB/wGQAUUBEgH/AUgBFgEAAf8BSQEmAQUB/wFC
+        ASIBBAH/A1cBxQMcAScIAAMEAQYBGwGUAV0B/wFUAbkBngH/AS8BpgGJAf8BXwGxAdUB/wFbAa0B1AH/
+        AVcBqwHSAf8BRQG6AeQB/wEAAZkBTwH/AQ0BjgE+Af8BEAFWAZoB/wwAAUgCYgH2Aa4BzQHwAf8BsAHP
+        AfAB/wGYAb8B7AH/AWQBrgHnAf8BqgHKAe8B/wEjAWEBuAH/BAABGwFcAbMB/wGiAcMB7QH/AagBlwEX
+        Af8BxAG1AUAB/wGsAZcBDAH/AUEBkwHfAf8BmAG7AesB/wECAUoBnwH/BAADXAHqAdkC4QH/AcsCzAH/
+        A8cB/wPIAf8DygH/A8sB/wPNAf8DzgH/A9AB/wPRAf8B0wLUAf8B5QLrAf8DbQH3BAADLgFHA1kB7AFI
+        ARYBAAH/AZkBNQEAAf8BuAFNAQAB/wHCAUkBAAH/AckBWwEJAf8B5gG/AZQB/wHsAdQBtgH/Ac0BnAFI
+        Af8BqAFSARIB/wGZAVMBJwH/AaMBjAFYAf8BZQFMATUB/wJRAT8B9wE1AjQBVQwAAT4BjgHEAf8BOAGs
+        AYsB/wE1AaoBjwH/AWQBtQHYAf8BYAGyAdYB/wFdAa8B1QH/AVkBrAHTAf8BCgGQAUgB/wE/AagBhAH/
+        AQABXgE5Af8DFAEbCAABWgJgAd4BqAHJAe0B/wGEAacB7QH/AT4BUAHtAf8BUAGOAekB/wGtAc0B8AH/
+        AVMBnQHSAf8BJAFiAbkB/wFNAZkBzgH/AaUBxQHuAf8BlQGaAU8B/wGtAZcBDAH/AZ0BlwEzAf8BTAGb
+        AeIB/wGYAbsB6gH/AUgCYgH2BAADXAHqAdcC3wH/AccCyQH/A8IB/wPEAf8DxQH/A8gB/wPJAf8DygH/
+        A8wB/wPNAf8B0ALRAf8B4wLqAf8DbQH3BAADOQFfAkABHQH9AVoBIQEAAf8BrgE/AQAB/wHAAUcBAAH/
+        AecBlgEsAf8B6AGyAWAB/wHkAbEBYAH/AdIBiQEfAf8BvQFMAQAB/wGoAToBAAH/AbgBjQFDAf8B1AHD
+        AbIB/wGYAYQBVAH/AUEBIwEFAf8BPgI9AWoMAAFEAZEByQH/AaQBzAHkAf8BhwG7AdsB/wElAaEBYAH/
+        AR8BnAFaAf8BGgGaAVYB/wEVAZYBUAH/ATEBowGBAf8BhAHAAasB/wEoAZYBXwH/A1EBogMVAR0EAANR
+        AZwBkgG5AeUB/wFUAVoB9gH/AYEBhAH1Af8CJgHwAf8BkAG7AesB/wGuAc0B8AH/AawBzAHwAf8BqgHK
+        AfAB/wGFAbIB6QH/AUQBqQHBAf8BKgGzAY0B/wE8AagBtgH/AVYBoQHkAf8BlwG6AegB/wNdAe0EAANc
+        AeoB1gLfAf8BwwLFAf8DwAH/A8AB/wPCAf8DwwH/A8QB/wPFAf8DyAH/A8kB/wPNAf8B4ALoAf8DbQH3
+        BAADNwFaAV0BTQEoAfoBgwEsAQAB/wHLAVYBAQH/AeUBiwEjAf8B/gG2AVgC/wHjAcIB/wH0AbwBhQH/
+        AdYBXQEPAf8BxQFUAQAB/wG6AUkBAAH/Aa8BXQEfAf8BrgGIAUMB/wGUAVwBQwH/AUIBJAEIAf8DPAFm
+        DAABSQGVAc0B/wGoAc8B5QH/AYwBvwHdAf8BKwGlAYEB/wGNAcUBuAH/AYkBwwG0Af8BhgHBAbEB/wGE
+        Ab8BrwH/AV0BuQGfAf8BVAGtAaAB/wNWAbMBUAFSAVABpAMYASIDIwEzATABawGHAfwBkgGkAfUB/wE/
+        AUAB9gH/ATcBhgH0Af8BIQGmAfsB/wFCAasB8gH/AWQBrwHnAf8BYQGtAecB/wFeAaoB5gH/ASUBtgGA
+        Af8BRgHIAZcB/wEhAbcBYAH/AWMBrAHnAf8BjwG1AeMB/wFaAl4B1QQAA2AB1gHHAs0B/wHbAuQB/wHb
+        AuQB/wHbAuUB/wHcAuUB/wHcAuUB/wHdAuYB/wHdAuYB/wHeAucB/wHfAugB/wHgAugB/wHNAtMB/wNf
+        AeMEAAMmATkBYAJaAd4BjgE0AQAB/wHsAZ4BOQH/Af4BvwGFAv8BzAGhAv8B3wG7Af8B/gHCAWUB/wHi
+        AY4BLwH/AdMBhAEgAf8BygFfARIB/wG1AVYBEAH/AZcBRwENAf8BgQFEAR8B/wNZAewDLgFIDAABTQGY
+        AdAB/wGrAdEB5wH/AZABwgHfAf8BMgGpAYgB/wGRAckBuwH/AVwBugGlAf8BWAG4AaEB/wFUAbYBngH/
+        AVgBuAGdAf8BQwGlAZIB/wNWAbMDVgGzAVUBVgFVAbEEAANJAYcBhgGvAeEB/wG5AdcB8wH/ARgBpgH+
+        Af8BUgG/Av8BEQGjAv8BTAG+AfAB/wEgAc4B+wH/AUABvgHxAf8BOAGzAaAB/wEhAbcBXwH/AS0BswGQ
+        Af8BpwHIAe4B/wFdAaUB1gH/AU8CUQGcBAADLAFDA1sByAOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOd
+        Af8DnQH/A50B/wOdAf8DXgHdAzEBTgQAAwkBDANLAY4BwAFUARMC/wG8AWUB/wH6Ac4BpwH/AfgB2wG+
+        Av8B4gHGAv8BvgGGAf8B9AGsAVsB/wHsAcIBmgH/AeIBtQGLAf8BuAFbARkB/wGdAUoBEgH/AYgBSgEm
+        Af8DTwGlAxABFQwAAVEBmwHTAf8BrgHUAegB/wGrAdMB6AH/AT8BsQGQAf8BmwHOAcAB/wGZAc0BvQH/
+        AZYBywG7Af8BlQHKAbkB/wGAAb8BqAH/AV0BswGpAf8DVgGzA1UBsgMIAQsEAAMEAQYDUQGfAYUBrgHh
+        Af8BQAGyAfkB/wERAaMC/wEmAakB+wH/ARYB0wH+Af8BUgHiAv8BEQHVAv8BZQGwAegB/wFiAa0B5wH/
+        AakBygHvAf8BpQHFAe0B/wErAV0BeAH8AyEBMEQAAxMBGgJkAVMB8QHYAZ4BWAH/AecB0wHAAf8B/AH1
+        Ae4C/wH4AesC/wHlAcIB/wH2AbkBggH/AfIB0gG4Af8B7gHSAbYB/wHCAYYBNAH/AacBXAEtAf8CTQEp
+        AfoDHQEpEAABVAGdAdUB/wFSAZsB0wH/AU8BmgHSAf8BLwGhAYwB/wEqAZ8BigH/AScBnQGFAf8BIwGZ
+        AYAB/wE8AaUBkgH/AWUBuAGxAf8BNgGhAYsB/wNVAbIDBgEIEAADQgF1AV8CYgH2AY4BtgHjAf8BuQHX
+        AfMB/wFDAdUB+wH/ARAB1QL/AScB0QH7Af8BswHSAfIB/wGxAdAB8QH/AZIBuAHiAf8BSAGVAcwB/wNK
+        AYpMAAM1AVcBqQFIARoB/wHKAbgBqAb/Af4B/AL/AfYB4gH/AfsBxQGgAf8B5AG5AZUB/wHbAawBYwH/
+        AcMBjgFCAf8BkwFKAR4B/wE+Aj0BajAAAVMCVAGsA1YBswNWAbMDBAEGGAADFgEeA1QBrgFcAaMB3AH/
+        AZEBuAHkAf8BqAHKAewB/wGlAccB7AH/AY0BtQHiAf8BTgGaAdIB/wFaAl8B2wMxAU5UAAMyAVECZAFZ
+        AewB0AGyAZUB/wHsAeAB2QH/AeYB1QHEAf8B0wGwAZQB/wHTAaYBXQH/AcsBjwE7Af8BZwFlAVkB8gE6
+        AjkBYDQAAVMCVAGsA1YBswMEAQYkAAMrAUIDTAGQAVsCXQHSAVkCXAHPA04BmQMtAUVgAAMRARcDRAF6
+        AloBVwHFAmUBXgHlAmEBWAHmAlwBWQHJAkgBRwGDAxUBHRAAAUIBTQE+BwABPgMAASgDAAFAAwABIAMA
+        AQEBAAEBBgABARYAA/8BAAHgAQcCAAH8AT8CAAHAAQMCAAH8AT8CAAHAAQMCAAHAAQMCAAHAAQMCAAHA
+        AQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMGAAHAAQMCAAEBAYACAAHAAQMBgAIBAYACAAHA
+        AQMBgAEBBAABwAEDAcABAwHAAQMCAAHAAQMB8AEPAcABAwIAAcABAwHwAQ8BgAEDAgABwAEDAfABDwHA
+        AQMCAAHAAQMB8AEPAfABDwIAAcABAwH4AR8B/AE/AgAB4wX/AeABBwGAAQEB/AEfAv8BwAEDAYABBwH4
+        AQcC/wGAAQMBAAEHAfgBAwL/AcABAwEAAQcB8AEBAgABwAEDAQABBwGAAwABgAEBAYABBwIAAYABAQIA
+        AcABBwEBAQABgAEBAgAB4AEDAgABgAEBAgAB4AEBAgABgAEBAgAB4AMAAYABAQIAAeABAAGAAQABgAEB
+        AgAB4AEAAYABAAL/AYABAQHgAQEB4AEBAv8BwAEDAf8BwwHwAQMC/wHgAQcB/wHHAfwBDwL/AfABDws=
+</value>
+  </data>
+</root>

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/Help/SQLScript.txt

@@ -37,6 +37,8 @@ CREATE TABLE [dbo].[tblCons] (
 	[Resolution] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
 	[DisplayWallpaper] [bit] NOT NULL ,
 	[DisplayThemes] [bit] NOT NULL ,
+	[EnableFontSmoothing] [bit] NOT NULL ,
+	[EnableDesktopComposition] [bit] NOT NULL ,
 	[CacheBitmaps] [bit] NOT NULL ,
 	[RedirectDiskDrives] [bit] NOT NULL ,
 	[RedirectPorts] [bit] NOT NULL ,
@@ -61,11 +63,19 @@ CREATE TABLE [dbo].[tblCons] (
 	[VNCColors] [varchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[VNCSmartSizeMode] [varchar] (20) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[VNCViewOnly] [bit] NOT NULL ,
+	[RDGatewayUsageMethod] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+	[RDGatewayHostname] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayUseConnectionCredentials] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
+	[RDGatewayUsername] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayPassword] [varchar] (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[RDGatewayDomain] [varchar] (512) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[InheritCacheBitmaps] [bit] NOT NULL ,
 	[InheritColors] [bit] NOT NULL ,
 	[InheritDescription] [bit] NOT NULL ,
 	[InheritDisplayThemes] [bit] NOT NULL ,
 	[InheritDisplayWallpaper] [bit] NOT NULL ,
+	[InheritEnableFontSmoothing] [bit] NOT NULL ,
+	[InheritEnableDesktopComposition] [bit] NOT NULL ,
 	[InheritDomain] [bit] NOT NULL ,
 	[InheritIcon] [bit] NOT NULL ,
 	[InheritPanel] [bit] NOT NULL ,
@@ -100,7 +110,13 @@ CREATE TABLE [dbo].[tblCons] (
 	[InheritVNCProxyPassword] [bit] NOT NULL ,
 	[InheritVNCColors] [bit] NOT NULL ,
 	[InheritVNCSmartSizeMode] [bit] NOT NULL ,
-	[InheritVNCViewOnly] [bit] NOT NULL
+	[InheritVNCViewOnly] [bit] NOT NULL ,
+	[InheritRDGatewayUsageMethod] [bit] NOT NULL ,
+	[InheritRDGatewayHostname] [bit] NOT NULL ,
+	[InheritRDGatewayUseConnectionCredentials] [bit] NOT NULL ,
+	[InheritRDGatewayUsername] [bit] NOT NULL ,
+	[InheritRDGatewayPassword] [bit] NOT NULL ,
+	[InheritRDGatewayDomain] [bit] NOT NULL
 ) ON [PRIMARY]
 GO
  

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,393 +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_General As String = "General"
-        Public Const Props_Display As String = "Display"
-        Public Const Props_Connection As String = "Connection"
-        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 = "Fullscreen (Kiosk Mode)"
-        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 About As String = "About"
-        Public Const ChangeLog As String = "Change Log:"
-        Public Const ReleasedUnderGPL As String = "Released under the GNU General Public License (GPL)"
-        Public Const SomeIconsBy As String = "Some Icons by"
-        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 UnclosedConnectionPanels As String = "There are unclosed connection panels, are you sure you want to quit?"
-        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.0 installed. You can get it here: http://support.microsoft.com/kb/925876" & vbNewLine & _
-                                     "If you have RDP 6.0 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

@@ -117,4 +117,37 @@
   <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>
+  <data name="strRDP16777216Colors" xml:space="preserve">
+    <value>16777216 Colors (24-bit)</value>
+  </data>
+  <data name="strRDP256Colors" xml:space="preserve">
+    <value>256 Colors (8-bit)</value>
+  </data>
+  <data name="strRDP4294967296Colors" xml:space="preserve">
+    <value>16777216 Colors (32-bit)</value>
+  </data>
+  <data name="strRDP65536Colors" xml:space="preserve">
+    <value>65536 Colors (16-bit)</value>
+  </data>
+  <data name="strRDP32768Colors" xml:space="preserve">
+    <value>32768 Colors (15-bit)</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,4 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.62")> 
-<Assembly: AssemblyFileVersion("1.62")> 
+<Assembly: AssemblyVersion("1.68.*")>