Update CHANGELOG.TXT for release of 1.70 Release Candidate 2.

This reverts commit c29c5015d5.

.gitignore

@@ -1,10 +1,26 @@
-Release
-mRemoteV1/bin
-mRemoteV1/obj
-mRemoteV1/publish
+Release/
+mRemoteV1/bin/
+mRemoteV1/obj/
+mRemoteV1/publish/
 *.pfx
 *.suo
 *.vbproj.user
 Thumbs.db
-_ReSharper.*
+[Dd]ebug/
+_Re[Ss]harper.*
+*.resharper
 *.resharper.user
+*.suo
+*.cache
+*~
+*.swp
+*.user*
+*.pidb
+*.gpState
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML
+*.orig
+*.sdf
+*.opensdf
+*.ipch

BUILD.CMD

@@ -1,32 +1,82 @@
 @echo off
 
-SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
-SET DEVENV="devenv.exe"
-SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
-SET RAR="%ProgramFiles%\WinRAR\Rar.exe"
-SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip"
-SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip"
+setlocal enabledelayedexpansion
+
+set VERSIONTAG=
+
+set VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
+set DEVENV="devenv.exe"
+set MAKENSIS="%ProgramFiles(x86)%\NSIS\Unicode\makensis.exe"
+set RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+set SIGNCMD=signtool.exe sign /n "Next Generation Software" /sha1 "c4ece717747eb7d0cac824f6c7431e5237138b02" /t http://timestamp.verisign.com/scripts/timstamp.dll
+
+rem Windows Sysinternals Sigcheck from http://technet.microsoft.com/en-us/sysinternals/bb897441
+set SIGCHECK="%ProgramFiles(x86)%\Sigcheck\sigcheck.exe"
 
 call %VCVARSALL% x86
 
-rmdir /s /q "%~dp0\mRemoteV1\bin"
-rmdir /s /q "%~dp0\mRemoteV1\obj"
+rmdir /s /q "%~dp0\mRemoteV1\bin" > nul 2>&1
+rmdir /s /q "%~dp0\mRemoteV1\obj" > nul 2>&1
 
+echo Building release version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
+
+echo Building portable version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
 
-mkdir "%~dp0\Release"
+echo Signing binaries...
+%SIGNCMD% "%~dp0\mRemoteV1\bin\Release\de\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release\en-US\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release\fr\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release\AxInterop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release\Interop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release\Interop.ShDocVw.dll" "%~dp0\mRemoteV1\bin\Release\Interop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe" "%~dp0\mRemoteV1\bin\Release Portable\de\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release Portable\en-US\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release Portable\fr\mRemoteNG.resources.dll" "%~dp0\mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" "%~dp0\mRemoteV1\bin\Release Portable\mRemoteNG.exe"
 
-%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
+mkdir "%~dp0\Release" > nul 2>&1
 
-del /f /q %BINARYZIP%
+echo Getting product version...
+set VERSIONNSH="%~dp0\Release\Version.nsh"
+set SIGCHECK=!SIGCHECK:"=^"!
+set SIGCHECK=!SIGCHECK: =^^ !
+set SIGCHECK=!SIGCHECK:(=^^(!
+set SIGCHECK=!SIGCHECK:)=^^)!
+for /F "usebackq delims=. tokens=1-4" %%i in (`!SIGCHECK! /accepteula -q -n "%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe"`) do (
+   set PRODUCT_VERSION_SHORT=%%i.%%j
+   echo ^^!define PRODUCT_VERSION "%%i.%%j.%%k.%%l" > %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_SHORT "%%i.%%j" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MAJOR "%%i" >> %VERSIONNSH%
+   echo ^^!define PRODUCT_VERSION_MINOR "%%j" >> %VERSIONNSH%
+)
+echo Version is %PRODUCT_VERSION_SHORT%
 
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT"
+echo Creating installer package...
+if defined VERSIONTAG (
+	%MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% "%~dp0\Installer\mRemote.nsi"
 
-del /f /q %PORTABLEZIP%
+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%-%VERSIONTAG%.exe"
+	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"
 
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT"
+	set INSTALLEREXE="%~dp0\Release\mRemoteNG-Installer-%PRODUCT_VERSION_SHORT%.exe"
+	set BINARYZIP="%~dp0\Release\mRemoteNG-%PRODUCT_VERSION_SHORT%.zip"
+	set PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-%PRODUCT_VERSION_SHORT%.zip"
+)
+
+del %VERSIONNSH%
+
+echo Signing installer package...
+%SIGNCMD% %INSTALLEREXE%
+
+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"
+
+echo.
+echo Build process complete.
+echo.
+pause

CHANGELOG.TXT

@@ -1,4 +1,164 @@
-1.63:
+1.70 (2013-02-25):
+  Fixed issue MR-332 - Can't select different tab with one click after disconnecting existing tab
+  Fixed issue MR-338 - PuTTYNG crashing on fresh install of mRemoteNG
+  Re-enabled PuTTYNG integration enhancements on Windows 8
+
+1.70 Release Candidate 1 (2013-02-22):
+  Fixed issue MR-183 - Error trying to save connections when using SQL - Invalid column name _parentConstantId
+  Fixed issue MR-225 - Tabs do not open in a panel until multiple panels are displayed.
+  Fixed issue MR-229 - Integrated PuTTY doesn't work in Windows 8 RP
+  Fixed issue MR-264 - Windows 8 support
+  Fixed issue MR-317 - Difficulty right-clicking on Tab
+  Fixed issue MR-318 - Wrong tab gets selected when tab names overflow on the tab bar
+  Fixed issue MR-321 - New connection panel doesn't get panel header if its the only one or is moved
+  Fixed issue MR-322 - Connection Button not listing servers
+  Added option to always show panel tabs.
+  Fixed "Decryption failed. Padding is invalid and cannot be removed." notification.
+  Fixed KiTTY opening in a separate window when using a saved session.
+
+1.70 Beta 2 (2013-02-18):
+  Fixed issue MR-47 - Silent Installation Prompts for Language
+  Fixed issue MR-54 - Error When disconnecting from SSL channel RDP
+  Fixed issue MR-58 - Bug when duplicating connection in connection view 
+  Fixed issue MR-68 - Config Window Loses Options
+  Fixed issue MR-71 - Minimizing mRemoteNG causes temporary re-size of Putty sessions (windows)
+  Fixed issue MR-80 - Reconnect previous sessions
+  Fixed issue MR-81 - Problem Duplicating Folder w/ Sub-Folders
+  Fixed issue MR-85 - Microsoft .NET Framework warning
+  Fixed issue MR-86 - Citrix GDI+ Error when screen is locked
+  Fixed issue MR-96 - When pressing SHIFT+F4 to create a new connection inside a folder, the new connections doesn't inherit any properties from its parent
+  Fixed issue MR-101 - Collapse all folders causes a NullReferenceException
+  Fixed issue MR-165 - Can't close About window if it is the last tab
+  Fixed issue MR-166 - Inheritance button is disabled on some connections
+  Fixed issue MR-167 - Name and description of properties not show in inheritance list
+  Fixed issue MR-171 - Inherit configuration not showing friendly names for each inherit component
+  Fixed issue MR-172 - RDGatewayPassword is unencrypted in confCons.xml file
+  Fixed issue MR-174 - Trailing Space on a Hostname/IP will cause the connection not to happen.
+  Fixed issue MR-175 - Problem with focus when 2 or more PuTTY sessions opened
+  Fixed issue MR-176 - Del key while editing connection name triggers 'Delete Connection'
+  Fixed issue MR-178 - 3 different panels crashes all connections
+  Fixed issue MR-181 - Sessions on startup
+  Fixed issue MR-190 - Can't click on tab/session
+  Fixed issue MR-196 - Cannot export list without usernames and passwords
+  Fixed issue MR-199 - when using screen inside putty, screen becomes dead when reduce mremoteNG
+  Fixed issue MR-202 - The Connection "Tab" show Ampersands as underscores.
+  Fixed issue MR-214 - Hostname/IP reset
+  Fixed issue MR-224 - Session tabs become un-clickable after duplicating a tab or opening a new one in the same panel
+  Fixed issue MR-233 - Backslash at end of password prevents success of putty invocation and corresponding auto-logon
+  Fixed issue MR-235 - Config file gets corrupted when leaving the password entry box with ESC
+  Fixed issue MR-264 - Windows 8 support
+  Fixed issue MR-277 - Inheritance configuration button not appear in configuration tab
+  Fixed issue MR-284 - SSH: Text not showing properly
+  Fixed issue MR-299 - mRemoteNG crashes while using remotely (Windows XP remote desktop)
+  Fixed issue MR-306 - Fatal .NET exception on program start
+  Fixed issue MR-313 - PuTTY window not maximized when loading from saved session
+  mRemoteNG now requires .NET Framework 3.0 instead of 2.0.
+  Updated translations.
+  Added translations for Spanish (Argentina), Italian, Polish, Portuguese, Chinese (Simplified).
+  Improved the use of Tab and Shift-Tab to cycle through entries in the Config grid.
+  Improved loading of XML files from older versions of mRemote/mRemoteNG.
+
+1.70 Beta 1 (2012-02-27):
+  Fixed issue MR-77 - VerifyDatabaseVersion (Config.Connections.Save) failed. Version string portion was too short or too long.
+  Fixed issue MR-78 - Renaming Connections
+  Fixed issue MR-79 - MoveUp/Down item doesn't work + Sort button broken
+  Fixed issue MR-93 - Regional settings problem when using SQL connection in mRemoteNG
+  Fixed issue MR-97 - Integrate Dutch translation
+  Fixed issue MR-98 - Integrate Russian and Ukranian translations
+  Fixed issue MR-99 - Integrate Spanish translation
+  Fixed issue MR-131 - RD Gateway does not respect setting for use different credentials
+  Added compatibility check for "Use FIPS compliant algorithms" security setting.
+  Improved reporting of errors when encrypting and decrypting connection files.
+  Added partial Polish translation.
+  The panel tabs are now hidden if only one panel is open.
+  Fix focus issue with RDP connections when changing tabs.
+  Show changes live as connection tabs are being dragged around to change their order.
+  Updated PuTTY to version 0.62.
+  Improved error handling when loading connection files.
+  Fixed bugs with creating a new connection file.
+  A backup of the connection file is saved when it is loaded. The most recent ten backup copies are kept.
+  Added the option to use a smart card for RD Gateway credentials.
+  Made the use of CredSSP for RDP connections optional.
+  Updated VncSharpNG to version 1.2.4440.36644.
+  Added debugging symbols for VncSharpNG.
+
+1.69 (2011-12-09):
+  Fixed issue #66 - Fresh Install Fails to Create Config
+  Fixed issue #69 - Connection file gets erased
+  Fixed issue #72 - scrollbars added to RDP window after minimize/restore of mRemoteNG
+  Disabled automatic updates in the portable edition
+  Fixed file name in window title changing when exporting an XML file.
+  Fixed Use only Notifications panel checkbox.
+  Updated PuTTY to version 0.61
+  Binaries are now digitally signed
+  Added Credits, License, and Version History items to the Start Menu and made Start Menu item names localizable.
+
+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
@@ -13,7 +173,7 @@
   Popups can now be allowed in Internet Explorer by holding Ctrl+Alt when clicking a link
   Added PuTTY Settings item to tab context menu
 
-1.62:
+1.62 (2010-01-19):
   Switched to VncSharp, an open source VNC component
   VNC is supported again except for the following features:
     Windows authentication
@@ -29,11 +189,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
@@ -502,7 +662,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
@@ -512,7 +672,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
 

CREDITS.TXT

@@ -1,8 +1,15 @@
 Contributors
 ============
 
+Jason Barbier
+Wiktor Beryt
+Lionel Caignec
 Felix Deimel
+Holger Henke
+Tom Hiller
 Riley McArdle
+Apisitt Rattana
+Andreas Rehm
 David Vidmar
 
 
@@ -14,6 +21,11 @@ Copyright
 MIT License
 http://www.codeproject.com/KB/recipes/command_line.aspx
 
+DotNetVer
+Copyright <20> 2010 David Grinberg
+Copyright <20> 2010-2011 Brandon Hansen
+http://nsis.sourceforge.net/DotNetVer
+
 
 Included Components
 ===================
@@ -74,8 +86,8 @@ MiniTabControl 1.0
 Copyright <20> 2008 Felix Deimel
 http://www.appjuice.org/
 
-PuTTY 0.60
-Copyright <20> 1997-2007 Simon Tatham
+PuTTY 0.62
+Copyright <20> 1997-2011 Simon Tatham
 MIT License
 http://www.chiark.greenend.org.uk/~sgtatham/putty/
 

Installer/DotNetVer.nsh

@@ -0,0 +1,296 @@
+; ---------------------
+;      DotNetVer.nsh
+;      Written by: David Grinberg
+;      Homepage: http://ontheperiphery.veraida.com/
+;      Updated By: Brandon Hansen (http://www.remotehams.com/)
+; ---------------------
+;
+; LogicLib extensions for checking Microsoft .NET Framework versions and service packs.
+;
+; Latests Updates by Brandon Hansen, KG6YPI (RemoteHams.com)
+; Dec 26, 2011 - .NET Framework 4.0 detection fixes - client profile not being found
+; Dec 07, 2010 - .NET Framework 4.0 detection added by Brandon Hansen (KG6YPI)
+;
+; Usage examples:
+;
+; ${If} ${HasDotNet4.0}
+;    DetailPrint "Microsoft .NET Framework 4.0 installed."
+;    ${If} ${DOTNETVER_4_0} AtLeastDotNetServicePack 1
+;        DetailPrint "Microsoft .NET Framework 4.0 is at least SP1."
+;    ${Else}
+;        DetailPrint "Microsoft .NET Framework 4.0 SP1 not installed."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetClientProfile 1
+;        DetailPrint "Microsoft .NET Framework 4.0 (Client Profile) available."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 1
+;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) available."
+;    ${EndIf}
+;    ${If} ${DOTNETVER_4_0} HasDotNetFullProfile 0
+;        DetailPrint "Microsoft .NET Framework 4.0 (Full Profile) not available."
+;    ${EndIf}
+; ${EndIf}
+ 
+ 
+!verbose push
+!verbose 3
+ 
+!ifndef ___DOTNETVER__NSH___
+!define ___DOTNETVER__NSH___
+ 
+!include LogicLib.nsh
+!include Util.nsh
+ 
+# constants
+ 
+!define DOTNETVER_1_0  "1.0"
+!define DOTNETVER_1_1  "1.1"
+!define DOTNETVER_2_0  "2.0"
+!define DOTNETVER_3_0  "3.0"
+!define DOTNETVER_3_5  "3.5"
+!define DOTNETVER_4_0  "4.0"
+ 
+# variable declaration
+ 
+Var /GLOBAL __DONTNET_FOUNDVER
+ 
+!macro __DotNetVer_DeclareVars
+    !ifndef __DOTNETVER_VARS_DECLARED
+        !define __DOTNETVER_VARS_DECLARED
+        Var /GLOBAL __DOTNET_1.0
+        Var /GLOBAL __DOTNET_1.1
+        Var /GLOBAL __DOTNET_2.0
+        Var /GLOBAL __DOTNET_3.0
+        Var /GLOBAL __DOTNET_3.5
+        Var /GLOBAL __DOTNET_4.0
+ 
+        Var /GLOBAL __DOTNETVER_1.0_SP
+        Var /GLOBAL __DOTNETVER_1.1_SP
+        Var /GLOBAL __DOTNETVER_2.0_SP
+        Var /GLOBAL __DOTNETVER_3.0_SP
+        Var /GLOBAL __DOTNETVER_3.5_SP
+        Var /GLOBAL __DOTNETVER_4.0_SP
+ 
+        Var /GLOBAL __DOTNET_1.0_CLIENT
+        Var /GLOBAL __DOTNET_1.1_CLIENT
+        Var /GLOBAL __DOTNET_2.0_CLIENT
+        Var /GLOBAL __DOTNET_3.0_CLIENT
+        Var /GLOBAL __DOTNET_3.5_CLIENT
+        Var /GLOBAL __DOTNET_4.0_CLIENT
+ 
+        Var /GLOBAL __DOTNET_1.0_FULL
+        Var /GLOBAL __DOTNET_1.1_FULL
+        Var /GLOBAL __DOTNET_2.0_FULL
+        Var /GLOBAL __DOTNET_3.0_FULL
+        Var /GLOBAL __DOTNET_3.5_FULL
+        Var /GLOBAL __DOTNET_4.0_FULL
+ 
+        StrCpy $__DOTNET_1.0 0
+        StrCpy $__DOTNET_1.1 0
+        StrCpy $__DOTNET_2.0 0
+        StrCpy $__DOTNET_3.0 0
+        StrCpy $__DOTNET_3.5 0
+        StrCpy $__DOTNET_4.0 0
+ 
+        StrCpy $__DOTNETVER_1.0_SP 0
+        StrCpy $__DOTNETVER_1.1_SP 0
+        StrCpy $__DOTNETVER_2.0_SP 0
+        StrCpy $__DOTNETVER_3.0_SP 0
+        StrCpy $__DOTNETVER_3.5_SP 0
+        StrCpy $__DOTNETVER_4.0_SP 0
+ 
+        StrCpy $__DOTNET_1.0_CLIENT 0
+        StrCpy $__DOTNET_1.1_CLIENT 0
+        StrCpy $__DOTNET_2.0_CLIENT 0
+        StrCpy $__DOTNET_3.0_CLIENT 0
+        StrCpy $__DOTNET_3.5_CLIENT 0
+        StrCpy $__DOTNET_4.0_CLIENT 0
+ 
+        StrCpy $__DOTNET_1.0_FULL 0
+        StrCpy $__DOTNET_1.1_FULL 0
+        StrCpy $__DOTNET_2.0_FULL 0
+        StrCpy $__DOTNET_3.0_FULL 0
+        StrCpy $__DOTNET_3.5_FULL 0
+        StrCpy $__DOTNET_4.0_FULL 0
+ 
+  !endif
+!macroend
+ 
+ 
+# lazy initialization macro
+ 
+!macro __DotNetVer_InitVars
+    # only calculate version once
+    StrCmp $__DONTNET_FOUNDVER "" dotnetver.noveryet
+        Return
+ 
+    dotnetver.noveryet:
+    !insertmacro __DotNetVer_DeclareVars
+ 
+    Push $0    ;registry count
+    Push $1    ;registry key
+    Push $2    ;version number
+    Push $3    ;installed
+    Push $4    ;service pack number
+    Push $8    ;strLen helper var
+ 
+    StrCpy $0 0
+ 
+    dotnetver.startenum:
+ 
+    EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+    StrCmp $1 "" dotnetver.done
+ 
+    IntOp $0 $0 + 1
+ 
+    StrCpy $2 $1 1 0
+    StrCmp $2 "v" +1 dotnetver.startenum
+    StrCpy $2 $1 3 1
+ 
+    ; Check for .NET 1.0 to 3.5
+    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "Install"
+    ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1" "SP"
+    IntCmp $3 1 dotnetcheck.skipalt
+    ; Alternate check for versions that don't set the Install key
+    ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\$1\Setup" "InstallSuccess"
+    dotnetcheck.skipalt:
+    ; This is a sanity check that works on .NET 1.0 to 3.5
+    ; if it fails check for dotnet 4
+    IntCmp $3 0 dotnetcheck.40
+    StrCmp $2 ${DOTNETVER_1_0} dotnetver.10
+    StrCmp $2 ${DOTNETVER_1_1} dotnetver.11
+    StrCmp $2 ${DOTNETVER_2_0} dotnetver.20
+    StrCmp $2 ${DOTNETVER_3_0} dotnetver.30
+    StrCmp $2 ${DOTNETVER_3_5} dotnetver.35
+    dotnetcheck.40:
+    StrCmp $2 ${DOTNETVER_4_0} dotnetver.40
+    StrCmp $2 "4" dotnetver.40
+ 
+    Goto dotnetver.startenum
+ 
+    dotnetver.10:
+        StrCpy $__DOTNET_1.0 1
+        StrCpy $__DOTNETVER_1.0_SP $4
+        StrCpy $__DOTNET_1.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.11:
+        StrCpy $__DOTNET_1.1 1
+        StrCpy $__DOTNETVER_1.1_SP $4
+        StrCpy $__DOTNET_1.1_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.20:
+        StrCpy $__DOTNET_2.0 1
+        StrCpy $__DOTNETVER_2.0_SP $4
+        StrCpy $__DOTNET_2.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.30:
+        StrCpy $__DOTNET_3.0 1
+        StrCpy $__DOTNETVER_3.0_SP $4
+        StrCpy $__DOTNET_3.0_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.35:
+        StrCpy $__DOTNET_3.5 1
+        StrCpy $__DOTNETVER_3.5_SP $4
+        StrCpy $__DOTNET_3.5_FULL 1
+        Goto dotnetver.startenum
+    dotnetver.40:
+        ; Check for .NET 4.0 (Full Profile)
+        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Install"
+        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "SP"
+	StrLen $8 $3
+        IntCmp $8 0 dotnetcheck.40c
+        IntCmp $3 0 dotnetcheck.40c
+        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Full
+        StrCmp $2 "4" dotnetver.40_Full
+        dotnetcheck.40c:
+        ; Check for .NET 4.0 (Client Profile)
+        ReadRegDWORD $3 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "Install"
+        ReadRegDWORD $4 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client" "SP"
+	StrLen $8 $3
+        IntCmp $8 0 dotnetver.startenum
+        IntCmp $3 0 dotnetver.startenum
+        StrCmp $2 ${DOTNETVER_4_0} dotnetver.40_Client
+        StrCmp $2 "4" dotnetver.40_Client
+        Goto dotnetver.startenum
+    dotnetver.40_Full:
+        StrCpy $__DOTNET_4.0 1
+        StrCpy $__DOTNETVER_4.0_SP $4
+        StrCpy $__DOTNET_4.0_FULL 1
+        Goto dotnetcheck.40c ; continue looking for other profiles
+    dotnetver.40_Client:
+        StrCpy $__DOTNET_4.0 1
+        StrCpy $__DOTNETVER_4.0_SP $4
+        StrCpy $__DOTNET_4.0_CLIENT 1
+        Goto dotnetver.startenum
+ 
+    dotnetver.done:
+ 
+    StrCpy $__DONTNET_FOUNDVER "1"
+ 
+    Pop $8
+    Pop $4
+    Pop $3
+    Pop $2
+    Pop $1
+    Pop $0
+!macroend
+ 
+!macro _HasDotNet _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+   !insertmacro _= `$__DOTNET_${_b}` `1` `${_t}` `${_f}`
+!macroend
+ 
+!macro __DotNetVer_DefineTest Ver
+  !define HasDotNet${Ver} `"" HasDotNet ${Ver}`
+!macroend
+ 
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_1_1}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_2_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_0}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_3_5}
+!insertmacro __DotNetVer_DefineTest ${DOTNETVER_4_0}
+ 
+!macro _AtLeastDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _>= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define AtLeastDotNetServicePack `AtLeastDotNetServicePack`
+ 
+ 
+!macro _AtMostDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _<= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define AtMostDotNetServicePack `AtMostDotNetServicePack`
+ 
+ 
+!macro _IsDotNetServicePack _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNETVER_${_a}_SP` `${_b}` `${_t}` `${_f}`
+!macroend
+!define IsDotNetServicePack `IsDotNetServicePack`
+ 
+!macro _HasDotNetClientProfile _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNET_${_a}_CLIENT` `${_b}` `${_t}` `${_f}`
+!macroend
+!define HasDotNetClientProfile `HasDotNetClientProfile`
+ 
+!macro _HasDotNetFullProfile _a _b _t _f
+    ${CallArtificialFunction} __DotNetVer_InitVars
+ 
+    !insertmacro _= `$__DOTNET_${_a}_FULL` `${_b}` `${_t}` `${_f}`
+!macroend
+!define HasDotNetFullProfile `HasDotNetFullProfile`
+ 
+# done
+ 
+!endif # !___DOTNETVER__NSH___
+ 
+!verbose pop

Installer/Language/czech.nsi

@@ -0,0 +1,22 @@
+; 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 3.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."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_CZECH} "Credits"
+LangString CopyingLinkName ${LANG_CZECH} "License"
+LangString UninstallLinkName ${LANG_CZECH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_CZECH} "Version History"

Installer/Language/dutch.nsi

@@ -0,0 +1,22 @@
+; 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 3.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."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_DUTCH} "Credits"
+LangString CopyingLinkName ${LANG_DUTCH} "License"
+LangString UninstallLinkName ${LANG_DUTCH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_DUTCH} "Version History"

Installer/Language/english.nsi

@@ -0,0 +1,22 @@
+; 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 3.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."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_ENGLISH} "Credits"
+LangString CopyingLinkName ${LANG_ENGLISH} "License"
+LangString UninstallLinkName ${LANG_ENGLISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_ENGLISH} "Version History"

Installer/Language/french.nsi

@@ -0,0 +1,22 @@
+; 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 3.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."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_FRENCH} "Credits"
+LangString CopyingLinkName ${LANG_FRENCH} "License"
+LangString UninstallLinkName ${LANG_FRENCH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_FRENCH} "Version History"

Installer/Language/german.nsi

@@ -0,0 +1,22 @@
+; 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 3.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."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_GERMAN} "Credits"
+LangString CopyingLinkName ${LANG_GERMAN} "License"
+LangString UninstallLinkName ${LANG_GERMAN} "Uninstall"
+LangString ChangeLogLinkName ${LANG_GERMAN} "Version History"

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,22 @@
+; 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 3.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."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_POLISH} "Credits"
+LangString CopyingLinkName ${LANG_POLISH} "License"
+LangString UninstallLinkName ${LANG_POLISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_POLISH} "Version History"

Installer/Language/spanish.nsi

@@ -0,0 +1,22 @@
+; 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 3.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."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_SPANISH} "Credits"
+LangString CopyingLinkName ${LANG_SPANISH} "License"
+LangString UninstallLinkName ${LANG_SPANISH} "Uninstall"
+LangString ChangeLogLinkName ${LANG_SPANISH} "Version History"

Installer/Language/thai.nsi

@@ -0,0 +1,23 @@
+; 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 3.0. เป็นพื้นฐาน"
+
+; User needs to be Admin
+LangString RequiresAdminUser ${LANG_THAI} "คุณต้องเป็นสมาชิกในกลุ่มของ 'Power Users' หรือ 'Administrators' เพื่อการติดตั้ง mRemoteNG"
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_THAI} "Credits"
+LangString CopyingLinkName ${LANG_THAI} "License"
+LangString UninstallLinkName ${LANG_THAI} "Uninstall"
+LangString ChangeLogLinkName ${LANG_THAI} "Version History"

Installer/mRemote.nsi

@@ -2,33 +2,38 @@
 !include "WordFunc.nsh"
 !insertmacro VersionCompare
 
-!DEFINE PRODUCT_VERSION_MAJOR 1
-!DEFINE PRODUCT_VERSION_MINOR 63
+!include "DotNetVer.nsh"
+!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"
-
-; Global Variables
-Var InstallDotNET
+; 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
 
 ; Basic Config
-Name "mRemoteNG ${PRODUCT_VERSION}"
-OutFile "..\Release\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 <EFBFBD> 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 "CompanyName" "Next Generation Software"
+VIAddVersionKey "ProductName" "mRemoteNG"
+VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION}
+VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2013 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 +53,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,35 +60,87 @@ 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
-	; Check .NET version
-	StrCpy $InstallDotNET "No"
-	Call GetDotNETVersion
+	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
 
-	${If} $0 == "not found"
-		StrCpy $InstallDotNET "Yes"
-	${EndIf}
+	Win9x:
+	doit:
+		# We can install
+		IfSilent +2
+			Call SelectLanguage
+		Goto end
+	noop:
+		MessageBox MB_OK "$(RequiresAdminUser)"
+		Quit
+	end:
+FunctionEnd
 
-	StrCpy $0 $0 "" 1 # skip "v"
+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)"
 
-	${VersionCompare} $0 "2.0" $1
-	${If} $1 == 2
-		StrCpy $InstallDotNET "Yes"
-	${EndIf}
+	Pop $LANGUAGE
+	StrCmp $LANGUAGE "cancel" 0 +2
+		Abort
 
-	${If} $InstallDotNET == "Yes"
-		MessageBox MB_OK|MB_ICONEXCLAMATION "mRemoteNG requires Microsoft .NET Framework 2.0."
+	; Check .NET version
+	${IfNot} ${HasDotNet3.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\*.*"
@@ -98,15 +154,18 @@ Section "" ; Install
  
 	; Start Menu
 	CreateDirectory "$SMPROGRAMS\mRemoteNG"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CreditsLinkName).lnk" "$INSTDIR\CREDITS.TXT"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(CopyingLinkName).lnk" "$INSTDIR\COPYING.TXT"
 	CreateShortCut "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk" "$INSTDIR\mRemoteNG.exe"
-	CreateShortCut "$SMPROGRAMS\mRemoteNG\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(UninstallLinkName).lnk" "$INSTDIR\Uninstall.exe"
+	CreateShortCut "$SMPROGRAMS\mRemoteNG\$(ChangeLogLinkName).lnk" "$INSTDIR\CHANGELOG.TXT"
 
 	; Registry
 	WriteRegStr HKLM "Software\mRemoteNG" "InstallPath" $INSTDIR
 	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" "Publisher" "Next Generation Software"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe"
-	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 6464
+	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 7080
 
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION}
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR}
@@ -125,9 +184,10 @@ Section "un.Uninstall"
 	RMDIR /r $INSTDIR
 
 	; Start Menu
-	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
-	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
-	RMDir "$SMPROGRAMS\mRemoteNG"
+	SetShellVarContext all
+	RMDir /r "$SMPROGRAMS\mRemoteNG"
+	SetShellVarContext current
+	RMDir /r "$SMPROGRAMS\mRemoteNG"
 
 	; Registry
 	DeleteRegValue HKLM "Software\mRemoteNG" "InstallPath"
@@ -135,15 +195,3 @@ Section "un.Uninstall"
 	DeleteRegKey /ifempty HKCU "Software\mRemoteNG"
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG"
 SectionEnd
-
-Function GetDotNETVersion
-	Push $0
-	Push $1
-
-	System::Call "mscoree::GetCORVersion(w .r0, i ${NSIS_MAX_STRLEN}, *i) i .r1"
-	StrCmp $1 "error" 0 +2
-	StrCpy $0 "not found"
-
-	Pop $1
-	Exch $0
-FunctionEnd

Update Languages.cmd

@@ -0,0 +1,50 @@
+@echo off
+
+set ZIP_FILE="%~dp0\..\mremoteng.zip"
+set TEMP_FOLDER="%TEMP%\Translations.tmp"
+set SORTRESX="%~dp0\Tools\SortRESX.exe"
+set RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+
+call :expand %ZIP_FILE%
+goto :skip
+:expand
+set ZIP_FILE="%~f1"
+exit /b
+:skip
+
+echo.
+echo This script updates the language files with new translations from Crowdin
+echo.
+echo Download the latest translation file from Crowdin and place it here:
+echo.
+echo %ZIP_FILE%
+echo.
+
+choice /m "Would you like to continue?"
+
+echo.
+
+mkdir %TEMP_FOLDER%
+%RAR% x -o+ %ZIP_FILE% *.* %TEMP_FOLDER%
+
+%SORTRESX% %TEMP_FOLDER%\ar\Language.ar.resx "%~dp0\mRemoteV1\Language\Language.ar.resx"
+%SORTRESX% %TEMP_FOLDER%\de\Language.de.resx "%~dp0\mRemoteV1\Language\Language.de.resx"
+%SORTRESX% %TEMP_FOLDER%\en-US\Language.en.resx "%~dp0\mRemoteV1\Language\Language.en-US.resx"
+%SORTRESX% %TEMP_FOLDER%\es-AR\Language.es.resx "%~dp0\mRemoteV1\Language\Language.es-AR.resx"
+%SORTRESX% %TEMP_FOLDER%\es-ES\Language.es.resx "%~dp0\mRemoteV1\Language\Language.es.resx"
+%SORTRESX% %TEMP_FOLDER%\fr\Language.fr.resx "%~dp0\mRemoteV1\Language\Language.fr.resx"
+%SORTRESX% %TEMP_FOLDER%\hu\Language.hu.resx "%~dp0\mRemoteV1\Language\Language.hu.resx"
+%SORTRESX% %TEMP_FOLDER%\it\Language.it.resx "%~dp0\mRemoteV1\Language\Language.it.resx"
+%SORTRESX% %TEMP_FOLDER%\nl\Language.nl.resx "%~dp0\mRemoteV1\Language\Language.nl.resx"
+%SORTRESX% %TEMP_FOLDER%\pl\Language.pl.resx "%~dp0\mRemoteV1\Language\Language.pl.resx"
+%SORTRESX% %TEMP_FOLDER%\pt-BR\Language.pt.resx "%~dp0\mRemoteV1\Language\Language.pt-BR.resx"
+%SORTRESX% %TEMP_FOLDER%\pt-PT\Language.pt.resx "%~dp0\mRemoteV1\Language\Language.pt.resx"
+%SORTRESX% %TEMP_FOLDER%\ru\Language.ru.resx "%~dp0\mRemoteV1\Language\Language.ru.resx"
+%SORTRESX% %TEMP_FOLDER%\uk\Language.uk.resx "%~dp0\mRemoteV1\Language\Language.uk.resx"
+%SORTRESX% %TEMP_FOLDER%\zh-CN\Language.zh.resx "%~dp0\mRemoteV1\Language\Language.zh-CN.resx"
+
+rmdir /s /q %TEMP_FOLDER%
+
+echo Done.
+echo.
+pause

mRemoteV1.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mRemoteV1", "mRemoteV1\mRemoteV1.vbproj", "{4934A491-40BC-4E5B-9166-EA1169A220F6}"
 EndProject
 Global

mRemoteV1/App/App.Announcement.vb

@@ -1,21 +1,25 @@
-Imports System.IO
-Imports System.Net
-Imports mRemote.App.Runtime
+Imports System.Net
+Imports mRemoteNG.App.Runtime
 
 Namespace App
     Public Class Announcement
-#Region "Private Properties"
-        Private wCl As WebClient
-        Private wPr As WebProxy
+        Implements IDisposable
+
+#Region "Private Variables"
+        Private webClient As WebClient
+        Private webProxy As WebProxy
 #End Region
 
-        Private _curAI As Info
-        Public ReadOnly Property curAI() As Info
+#Region "Public Properties"
+        Private _currentAnnouncementInfo As Info
+        Public ReadOnly Property CurrentAnnouncementInfo() As Info
             Get
-                Return _curAI
+                Return _currentAnnouncementInfo
             End Get
         End Property
+#End Region
 
+#Region "Public Methods"
         Public Function IsAnnouncementAvailable() As Boolean
             Try
                 Dim aI As Info = GetAnnouncementInfo()
@@ -30,7 +34,7 @@ Namespace App
                     Return False
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncementAvailable failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncementAvailable failed" & vbNewLine & ex.Message, True)
                 Return False
             End Try
         End Function
@@ -58,7 +62,7 @@ Namespace App
 
                         strU = strAnnouncement.Substring(strAnnouncement.IndexOf("URL: ") + 5, strAnnouncement.IndexOf(vbNewLine) - 5)
 
-                        aI.URL = strU
+                        aI.Url = strU
                     Catch ex As Exception
                         aI.InfoOk = False
                     End Try
@@ -66,10 +70,10 @@ Namespace App
                     aI.InfoOk = False
                 End If
 
-                _curAI = aI
+                _currentAnnouncementInfo = aI
                 Return aI
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting Announcement info failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Getting Announcement info failed" & vbNewLine & ex.Message, True)
                 Return Nothing
             End Try
         End Function
@@ -81,37 +85,35 @@ Namespace App
                 Dim strTemp As String
 
                 Try
-                    strTemp = wCl.DownloadString(App.Info.General.URLAnnouncement)
+                    strTemp = webClient.DownloadString(App.Info.General.URLAnnouncement)
                 Catch ex As Exception
                     strTemp = ""
                 End Try
 
                 Return strTemp
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "GetAnnouncementFile failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetAnnouncementFile failed" & vbNewLine & ex.Message, True)
                 Return ""
             End Try
         End Function
 
         Private Sub CreateWebClient()
-            wCl = New WebClient()
+            webClient = New WebClient()
 
             If My.Settings.UpdateUseProxy Then
-                wPr = New WebProxy(My.Settings.UpdateProxyAddress, My.Settings.UpdateProxyPort)
+                webProxy = New WebProxy(My.Settings.UpdateProxyAddress, My.Settings.UpdateProxyPort)
 
                 If My.Settings.UpdateProxyUseAuthentication Then
                     Dim cred As ICredentials
                     cred = New NetworkCredential(My.Settings.UpdateProxyAuthUser, Security.Crypt.Decrypt(My.Settings.UpdateProxyAuthPass, App.Info.General.EncryptionKey))
 
-                    wPr.Credentials = cred
+                    webProxy.Credentials = cred
                 End If
 
-                wCl.Proxy = wPr
+                webClient.Proxy = webProxy
             End If
         End Sub
-
-
-
+#End Region
 
         Public Class Info
             Private _Name As String
@@ -124,17 +126,16 @@ Namespace App
                 End Set
             End Property
 
-            Private _URL As String
-            Public Property URL() As String
+            Private _url As String
+            Public Property Url() As String
                 Get
-                    Return _URL
+                    Return _url
                 End Get
                 Set(ByVal value As String)
-                    _URL = value
+                    _url = value
                 End Set
             End Property
 
-
             Private _InfoOk As Boolean
             Public Property InfoOk() As Boolean
                 Get
@@ -145,5 +146,36 @@ Namespace App
                 End Set
             End Property
         End Class
+
+#Region "IDisposable Support"
+        Private disposedValue As Boolean ' To detect redundant calls
+
+        ' IDisposable
+        Protected Overridable Sub Dispose(disposing As Boolean)
+            If Not Me.disposedValue Then
+                If disposing Then
+                    If webClient IsNot Nothing Then webClient.Dispose()
+                End If
+
+                ' TODO: free unmanaged resources (unmanaged objects) and override Finalize() below.
+                ' TODO: set large fields to null.
+            End If
+            Me.disposedValue = True
+        End Sub
+
+        ' TODO: override Finalize() only if Dispose(ByVal disposing As Boolean) above has code to free unmanaged resources.
+        'Protected Overrides Sub Finalize()
+        '    ' Do not change this code.  Put cleanup code in Dispose(ByVal disposing As Boolean) above.
+        '    Dispose(False)
+        '    MyBase.Finalize()
+        'End Sub
+
+        ' This code added by Visual Basic to correctly implement the disposable pattern.
+        Public Sub Dispose() Implements IDisposable.Dispose
+            ' Do not change this code.  Put cleanup code in Dispose(ByVal disposing As Boolean) above.
+            Dispose(True)
+            GC.SuppressFinalize(Me)
+        End Sub
+#End Region
     End Class
 End Namespace

mRemoteV1/App/App.Editions.vb

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

mRemoteV1/App/App.Info.vb

@@ -15,7 +15,7 @@ Namespace App
 
         Public Class Settings
 #If Not PORTABLE Then
-            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName
+            Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.ApplicationData) & "\" & My.Application.Info.ProductName
 #Else
             Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath
 #End If
@@ -36,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.2
+            Public Shared ReadOnly ConnectionFileVersion As Double = 2.4
         End Class
 
         Public Class Credentials

mRemoteV1/App/App.Native.vb

@@ -2,135 +2,196 @@
 
 Namespace App
     Public Class Native
-#Region "Dll Imports"
-        <DllImport("user32.dll", EntryPoint:="GetWindowThreadProcessId", SetLastError:=True, CharSet:=CharSet.Unicode, ExactSpelling:=True, CallingConvention:=CallingConvention.StdCall)> _
-        Public Shared Function GetWindowThreadProcessId(ByVal hWnd As Long, ByVal lpdwProcessId As Long) As Long
-        End Function
+        Private Sub New()
+            ' Fix Warning 292 CA1053 : Microsoft.Design : Because type 'Native' contains only 'static' ('Shared' in Visual Basic) members, add a default private constructor to prevent the compiler from adding a default public constructor.
+        End Sub
 
-        <DllImport("user32.dll", SetLastError:=True)> _
-        Public Shared Function FindWindow(ByVal lpClassName As String, ByVal lpWindowName As String) As IntPtr
-        End Function
-
-        <DllImport("user32.dll", SetLastError:=True)> _
-        Public Shared Function SetParent(ByVal hWndChild As IntPtr, ByVal hWndNewParent As IntPtr) As Long
-        End Function
-
-        <DllImport("user32.dll", EntryPoint:="GetWindowLongA", SetLastError:=True)> _
-        Public Shared Function GetWindowLong(ByVal hWnd As IntPtr, ByVal nIndex As Integer) As Long
-        End Function
-
-        <DllImport("user32.dll")> _
-        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)> _
-        Public Shared Function SetWindowPos(ByVal hWnd As IntPtr, ByVal hWndInsertAfter As Long, ByVal x As Long, ByVal y As Long, ByVal cx As Long, ByVal cy As Long, ByVal wFlags As Long) As Long
-        End Function
-
-        <DllImport("user32.dll", SetLastError:=True)> _
-        Public Shared Function MoveWindow(ByVal hWnd As IntPtr, ByVal x As Integer, ByVal y As Integer, ByVal cx As Integer, ByVal cy As Integer, ByVal repaint As Boolean) As Boolean
-        End Function
-
-        <DllImport("user32.dll", EntryPoint:="PostMessageA", SetLastError:=True)> _
-        Public Shared Function PostMessage(ByVal hWnd As IntPtr, ByVal Msg As UInteger, ByVal wParam As Integer, ByVal lParam As Integer) As Boolean
-        End Function
-
-        <DllImport("user32")> _
-        Public Shared Function ShowWindow(ByVal hWnd As IntPtr, ByVal nCmdShow As Integer) As Integer
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function BringWindowToTop(ByVal hWnd As IntPtr) As Boolean
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function SetForegroundWindow(ByVal hWnd As IntPtr) As Boolean
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function GetForegroundWindow() As IntPtr
-        End Function
-
-        <DllImport("user32.dll", EntryPoint:="GetWindowTextLengthA")> _
-        Public Shared Function GetWindowTextLength(ByVal hWnd As IntPtr) As Long
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function IsIconic(ByVal hWnd As IntPtr) As Integer
-        End Function
-
-        <DllImport("user32.dll")> _
-        Public Shared Function GetSystemMenu(ByVal hWnd As IntPtr, ByVal bRevert As Boolean) As IntPtr
-        End Function
-
-        <DllImport("user32.dll")> _
+#Region "Functions"
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
         Public Shared Function AppendMenu(ByVal hMenu As IntPtr, ByVal uFlags As Int32, ByVal uIDNewItem As IntPtr, ByVal lpNewItem As String) As Boolean
         End Function
 
-        <DllImport("user32")> _
-        Public Shared Function InsertMenu(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal uIDNewItem As IntPtr, ByVal lpNewItem As String) As Boolean
-        End Function
-
-        <DllImport("user32")> _
-        Public Shared Function SetMenuItemBitmaps(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal hBitmapUnchecked As IntPtr, ByVal hBitmapChecked As IntPtr) As Boolean
-        End Function
-
-        <DllImport("user32")> _
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
         Public Shared Function CreatePopupMenu() As IntPtr
         End Function
 
-        <DllImport("user32")> _
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function FindWindowEx(ByVal parentHandle As IntPtr, ByVal childAfter As IntPtr, ByVal lclassName As String, ByVal windowTitle As String) As IntPtr
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function GetForegroundWindow() As IntPtr
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function GetSystemMenu(ByVal hWnd As IntPtr, ByVal bRevert As Boolean) As IntPtr
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function InsertMenu(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal uIDNewItem As IntPtr, ByVal lpNewItem As String) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function IsIconic(ByVal hWnd As IntPtr) As Integer
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function MoveWindow(ByVal hWnd As IntPtr, ByVal x As Integer, ByVal y As Integer, ByVal cx As Integer, ByVal cy As Integer, ByVal repaint As Boolean) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function PostMessage(ByVal hWnd As IntPtr, ByVal Msg As UInteger, ByVal wParam As Integer, ByVal lParam As Integer) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
         Public Shared Function SendMessage(ByVal hWnd As IntPtr, ByVal msg As Integer, ByVal wparam As Integer, ByVal lparam As Integer) As Integer
         End Function
 
-        <DllImport("user32")> _
-        Public Shared Function MapVirtualKey(ByVal wCode As Integer, ByVal wMapType As Integer) As Integer
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetClipboardViewer(ByVal hWndNewViewer 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
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetForegroundWindow(ByVal hWnd As IntPtr) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetMenuItemBitmaps(ByVal hMenu As IntPtr, ByVal uPosition As Integer, ByVal uFlags As Integer, ByVal hBitmapUnchecked As IntPtr, ByVal hBitmapChecked As IntPtr) As Boolean
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetParent(ByVal hWndChild As IntPtr, ByVal hWndNewParent As IntPtr) As Long
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        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, CharSet:=CharSet.Auto)> _
+        Public Shared Function ShowWindow(ByVal hWnd As IntPtr, ByVal nCmdShow As Integer) As Integer
+        End Function
+
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function WindowFromPoint(ByVal point As Point) As IntPtr
         End Function
 #End Region
 
+#Region "Structures"
+        <StructLayout(LayoutKind.Sequential)> _
+        Public Structure WINDOWPOS
+            Public hwnd As IntPtr
+            Public hwndInsertAfter As IntPtr
+            Public x As Integer
+            Public y As Integer
+            Public cx As Integer
+            Public cy As Integer
+            Public flags As Integer
+        End Structure
+#End Region
+
+#Region "Helpers"
+        Public Shared Function MAKELONG(ByRef wLow As Int32, ByRef wHigh As Int32) As Int32
+            Return wLow Or wHigh << 16
+        End Function
+
+        Public Shared Function MAKELPARAM(ByRef wLow As Int32, ByRef wHigh As Int32) As Int32
+            Return MAKELONG(wLow, wHigh)
+        End Function
+
+        Public Shared Function LOWORD(ByRef value As Int32) As Int32
+            Return value And &HFFFF
+        End Function
+
+        Public Shared Function LOWORD(ByRef value As IntPtr) As Int32
+            Return LOWORD(value.ToInt32)
+        End Function
+
+        Public Shared Function HIWORD(ByRef value As Int32) As Int32
+            Return value >> 16
+        End Function
+
+        Public Shared Function HIWORD(ByRef value As IntPtr) As Int32
+            Return HIWORD(value.ToInt32)
+        End Function
+
+#End Region
+
 #Region "Constants"
-        Public Const SWP_NOOWNERZORDER As Integer = 512
-        Public Const SWP_NOREDRAW As Integer = 8
-        Public Const SWP_NOZORDER As Integer = 4
-        Public Const SWP_SHOWWINDOW As Integer = 64
-        Public Const WS_EX_MDICHILD As Integer = 64
-        Public Const SWP_FRAMECHANGED As Integer = 32
-        Public Const SWP_NOACTIVATE As Integer = 16
-        Public Const SWP_ASYNCWINDOWPOS As Integer = 16384
-        Public Const SWP_NOMOVE As Integer = 2
-        Public Const SWP_NOSIZE As Integer = 1
+        ' GetWindowLong
         Public Const GWL_STYLE As Integer = (-16)
-        Public Const WS_VISIBLE As Integer = 268435456
-        Public Const WM_CLOSE As Integer = 16
-        Public Const WS_CHILD As Integer = 1073741824
-        Public Const WS_MAXIMIZE As Integer = 16777216
+
+        ' AppendMenu / ModifyMenu / DeleteMenu / RemoveMenu
+        Public Const MF_BYCOMMAND As Integer = &H0
+        Public Const MF_BYPOSITION As Integer = &H400
+        Public Const MF_STRING As Integer = &H0
+        Public Const MF_POPUP As Integer = &H10
+        Public Const MF_SEPARATOR As Integer = &H800
+
+        ' WM_LBUTTONDOWN / WM_LBUTTONUP
+        Public Const MK_LBUTTON As Integer = &H1
+
+        ' ShowWindow
         Public Const SW_SHOWMAXIMIZED As Integer = 3
         Public Const SW_RESTORE As Integer = 9
 
-        Public Const MF_STRING As Integer = &H0
-        Public Const MF_SEPARATOR As Integer = &H800&
-        Public Const MF_BYCOMMAND As Integer = &H0
-        Public Const MF_BYPOSITION As Integer = &H400
-        Public Const MF_POPUP As Integer = &H10
+        ' SetWindowPos / WM_WINDOWPOSCHANGING / WM_WINDOWPOSCHANGED
+        Public Const SWP_NOSIZE As Integer = &H1
+        Public Const SWP_NOMOVE As Integer = &H2
+        Public Const SWP_NOZORDER As Integer = &H4
+        Public Const SWP_NOREDRAW As Integer = &H8
+        Public Const SWP_NOACTIVATE As Integer = &H10
+        Public Const SWP_DRAWFRAME As Integer = &H20
+        Public Const SWP_FRAMECHANGED As Integer = &H20
+        Public Const SWP_SHOWWINDOW As Integer = &H40
+        Public Const SWP_HIDEWINDOW As Integer = &H80
+        Public Const SWP_NOCOPYBITS As Integer = &H100
+        Public Const SWP_NOOWNERZORDER As Integer = &H200
+        Public Const SWP_NOSENDCHANGING As Integer = &H400
+        Public Const SWP_NOCLIENTSIZE As Integer = &H800
+        Public Const SWP_NOCLIENTMOVE As Integer = &H1000
+        Public Const SWP_DEFERERASE As Integer = &H2000
+        Public Const SWP_ASYNCWINDOWPOS As Integer = &H4000
+        Public Const SWP_STATECHANGED As Integer = &H8000
 
+        ' WM_ACTIVATE
+        Public Const WA_INACTIVE As Integer = &H0
+        Public Const WA_ACTIVE As Integer = &H1
+        Public Const WA_CLICKACTIVE As Integer = &H2
+
+        ' Window Messages
+        Public Const WM_CREATE As Integer = &H1
+        Public Const WM_DESTROY As Integer = &H2
+        Public Const WM_ACTIVATE As Integer = &H6
         Public Const WM_GETTEXT As Integer = &HD
+        Public Const WM_CLOSE As Integer = &H10
         Public Const WM_ACTIVATEAPP As Integer = &H1C
+        Public Const WM_MOUSEACTIVATE As Integer = &H21
         Public Const WM_WINDOWPOSCHANGED As Integer = &H47
-
+        Public Const WM_KEYDOWN As Integer = &H100
+        Public Const WM_KEYUP As Integer = &H101
         Public Const WM_SYSCOMMAND As Integer = &H112
-
+        Public Const WM_MOUSEMOVE As Integer = &H200
         Public Const WM_LBUTTONDOWN As Integer = &H201
         Public Const WM_LBUTTONUP As Integer = &H202
         Public Const WM_RBUTTONDOWN As Integer = &H204
         Public Const WM_RBUTTONUP As Integer = &H205
+        Public Const WM_MBUTTONDOWN As Integer = &H207
+        Public Const WM_MBUTTONUP As Integer = &H208
+        Public Const WM_XBUTTONDOWN As Integer = &H20B
+        Public Const WM_XBUTTONUP As Integer = &H20C
+        Public Const WM_PARENTNOTIFY As Integer = &H210
+        Public Const WM_ENTERSIZEMOVE As Integer = &H231
+        Public Const WM_EXITSIZEMOVE As Integer = &H232
+        Public Const WM_DRAWCLIPBOARD As Integer = &H308
+        Public Const WM_CHANGECBCHAIN As Integer = &H30D
 
-        Public Const WM_KEYDOWN As Integer = &H100
-        Public Const WM_KEYUP As Integer = &H101
+        ' Window Styles
+        Public Const WS_MAXIMIZE As Integer = &H1000000
+        Public Const WS_VISIBLE As Integer = &H10000000
+        Public Const WS_CHILD As Integer = &H40000000
+        Public Const WS_EX_MDICHILD As Integer = &H40
 
+        ' Virtual Key Codes
         Public Const VK_CONTROL As Integer = &H11
         Public Const VK_C As Integer = &H67
 #End Region

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 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
@@ -27,10 +27,8 @@ Namespace App
                 Dim uI As Info = GetUpdateInfo()
 
                 Return uI.InfoOk
-
-                uI = Nothing
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsProxyOK (App.Update) failed" & vbNewLine & ex.Message, False)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsProxyOK (App.Update) failed" & vbNewLine & ex.Message, False)
                 Return False
             End Try
         End Function
@@ -49,7 +47,7 @@ Namespace App
                     Return False
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsUpdateAvailable failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "IsUpdateAvailable failed" & vbNewLine & ex.Message, True)
                 Return False
             End Try
         End Function
@@ -99,7 +97,7 @@ Namespace App
                             Dim strImgURLLink As String = strUpdate.Substring(strUpdate.IndexOf("imgURLLink: ") + 12, strUpdate.IndexOf(vbNewLine) - 12)
                             uI.ImageURLLink = strImgURLLink
                         Catch ex As Exception
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "Update Image Info could not be read." & vbNewLine & ex.Message, True)
+                            MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Update Image Info could not be read." & vbNewLine & ex.Message, True)
                         End Try
                     Catch ex As Exception
                         uI.InfoOk = False
@@ -111,7 +109,7 @@ Namespace App
                 _curUI = uI
                 Return uI
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting update info failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Getting update info failed" & vbNewLine & ex.Message, True)
                 Return Nothing
             End Try
         End Function
@@ -125,10 +123,10 @@ 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)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Update download failed" & vbNewLine & ex.Message, True)
                 Return False
             End Try
         End Function
@@ -166,7 +164,7 @@ Namespace App
 
                 Return strTemp
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "GetUpdateFile failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "GetUpdateFile failed" & vbNewLine & ex.Message, True)
                 Return ""
             End Try
         End Function
@@ -186,14 +184,11 @@ Namespace App
                     RaiseEvent DownloadCompleted(sender, e, False)
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "DLCompleted failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "DLCompleted failed" & vbNewLine & ex.Message, True)
             End Try
         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)
 
@@ -63,6 +63,5 @@
             End If
         End Sub
     End Class
-
 End Namespace
 

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
@@ -177,12 +182,12 @@ Namespace Config
 #Region "SQL"
             Private Sub LoadFromSQL()
                 Try
-                    App.Runtime.ConnectionsFileLoaded = False
+                    App.Runtime.IsConnectionsFileLoaded = 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,7 @@ 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)
+                    Me.confVersion = Convert.ToDouble(sqlRd.Item("confVersion"), CultureInfo.InvariantCulture)
 
                     Dim rootNode As TreeNode
                     rootNode = New TreeNode(sqlRd.Item("Name"))
@@ -235,7 +237,7 @@ Namespace Config
 
                     ' SECTION 3. Populate the TreeView with the DOM nodes.
                     AddNodesFromSQL(rootNode)
-                    'AddNodeFromXML(xDom.DocumentElement, Me._RootTreeNode)
+                    'AddNodeFromXml(xDom.DocumentElement, Me._RootTreeNode)
 
                     rootNode.Expand()
 
@@ -261,12 +263,12 @@ Namespace Config
                     AddNodeToTree(rootNode)
                     SetSelectedNode(selNode)
 
-                    App.Runtime.ConnectionsFileLoaded = True
+                    App.Runtime.IsConnectionsFileLoaded = True
                     'App.Runtime.Windows.treeForm.InitialRefresh()
 
                     sqlCon.Close()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLoadFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -312,7 +314,7 @@ Namespace Config
                         If Tree.Node.GetNodeTypeFromString(sqlRd.Item("Type")) = Tree.Node.Type.Connection Then
                             Dim conI As Connection.Info = GetConnectionInfoFromSQL()
                             conI.TreeNode = tNode
-                            'conI.Parent = prevCont 'NEW
+                            'conI.Parent = _previousContainer 'NEW
 
                             Me._ConnectionList.Add(conI)
 
@@ -353,7 +355,7 @@ Namespace Config
                             '        contI.Parent = tNode.Parent.Tag
                             '    End If
                             'End If
-                            'prevCont = contI 'NEW
+                            '_previousContainer = contI 'NEW
                             contI.TreeNode = tNode
 
                             contI.Name = sqlRd.Item("Name")
@@ -412,7 +414,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodesFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -537,9 +539,9 @@ Namespace Config
                         End If
 
                         If Me.confVersion >= 2.2 Then
-                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Item("RDGatewayUsageMethod"))
                             conI.RDGatewayHostname = .Item("RDGatewayHostname")
-                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials"))
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Item("RDGatewayUseConnectionCredentials"))
                             conI.RDGatewayUsername = .Item("RDGatewayUsername")
                             conI.RDGatewayPassword = Security.Crypt.Decrypt(.Item("RDGatewayPassword"), pW)
                             conI.RDGatewayDomain = .Item("RDGatewayDomain")
@@ -550,6 +552,18 @@ Namespace Config
                             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 confVersion >= 2.4 Then
+                            conI.UseCredSsp = .Item("UseCredSsp")
+                            conI.Inherit.UseCredSsp = .Item("InheritUseCredSsp")
+                        End If
+
                         If SQLUpdate = True Then
                             conI.PleaseConnect = .Item("Connected")
                         End If
@@ -557,7 +571,7 @@ Namespace Config
 
                     Return conI
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetConnectionInfoFromSQL failed (Config.Connections.Load)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strGetConnectionInfoFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Return Nothing
@@ -614,7 +628,7 @@ Namespace Config
 
             Private Sub LoadFromXML(Optional ByVal cons As String = "")
                 Try
-                    App.Runtime.ConnectionsFileLoaded = False
+                    App.Runtime.IsConnectionsFileLoaded = False
 
                     ' SECTION 1. Create a DOM Document and load the XML data into it.
                     Me.xDom = New XmlDocument()
@@ -625,22 +639,21 @@ 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)
+                        Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value.Replace(",", "."), CultureInfo.InvariantCulture)
                     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!")
+                        MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strOldConffile)
                     End If
 
                     ' SECTION 2. Initialize the treeview control.
                     Dim rootNode As TreeNode
 
-                    Try
-                        rootNode = New TreeNode(xDom.DocumentElement.Attributes("Name").Value)
-                    Catch ex As Exception
+                    Dim rootNodeName As String = ""
+                    If xDom.DocumentElement.HasAttribute("Name") Then rootNodeName = xDom.DocumentElement.Attributes("Name").Value.Trim()
+                    If Not String.IsNullOrEmpty(rootNodeName) Then
+                        rootNode = New TreeNode(rootNodeName)
+                    Else
                         rootNode = New TreeNode(xDom.DocumentElement.Name)
-                    End Try
+                    End If
 
                     Dim rInfo As New Root.Info(Root.Info.RootType.Connection)
                     rInfo.Name = rootNode.Text
@@ -653,7 +666,7 @@ Namespace Config
                             If Authenticate(xDom.DocumentElement.Attributes("Protected").Value, False, rInfo) = False Then
                                 My.Settings.LoadConsFromCustomLocation = False
                                 My.Settings.CustomConsPath = ""
-                                rootNode.Remove()
+                                _RootTreeNode.Remove()
                                 Exit Sub
                             End If
                         End If
@@ -668,7 +681,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!")
+                        MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strCannotImportNormalSessionFile)
 
                         Exit Sub
                     End If
@@ -703,94 +716,96 @@ Namespace Config
 
                     Me._RootTreeNode.EnsureVisible()
 
-                    App.Runtime.ConnectionsFileLoaded = True
+
+                    App.Runtime.IsConnectionsFileLoaded = True
                     App.Runtime.Windows.treeForm.InitialRefresh()
                 Catch ex As Exception
-                    App.Runtime.ConnectionsFileLoaded = False
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadFromXML failed" & vbNewLine & ex.Message, True)
+                    App.Runtime.IsConnectionsFileLoaded = False
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strLoadFromXmlFailed & vbNewLine & ex.Message & vbNewLine & ex.StackTrace, True)
+                    Throw
                 End Try
             End Sub
 
-            Private prevCont As Container.Info
-            Private Sub AddNodeFromXML(ByRef inXmlNode As XmlNode, ByRef inTreeNode As TreeNode)
+            Private _previousContainer As Container.Info
+            Private Sub AddNodeFromXml(ByRef parentXmlNode As XmlNode, ByRef parentTreeNode As TreeNode)
                 Try
-                    Dim i As Integer
-
-                    Dim xNode As XmlNode
-                    Dim xNodeList As XmlNodeList
-                    Dim tNode As TreeNode
-
                     ' Loop through the XML nodes until the leaf is reached.
                     ' Add the nodes to the TreeView during the looping process.
-                    If inXmlNode.HasChildNodes() Then
-                        xNodeList = inXmlNode.ChildNodes
-                        For i = 0 To xNodeList.Count - 1
-                            xNode = xNodeList(i)
-                            inTreeNode.Nodes.Add(New TreeNode(xNode.Attributes("Name").Value))
-                            tNode = inTreeNode.Nodes(i)
+                    If parentXmlNode.HasChildNodes() Then
+                        For Each xmlNode As XmlNode In parentXmlNode.ChildNodes
+                            Dim treeNode As TreeNode = New TreeNode(xmlNode.Attributes("Name").Value)
+                            parentTreeNode.Nodes.Add(TreeNode)
 
-                            If Tree.Node.GetNodeTypeFromString(xNode.Attributes("Type").Value) = Tree.Node.Type.Connection Then 'connection info
-                                Dim conI As Connection.Info = GetConnectionInfoFromXml(xNode)
-                                conI.TreeNode = tNode
-                                conI.Parent = prevCont 'NEW
+                            If Tree.Node.GetNodeTypeFromString(xmlNode.Attributes("Type").Value) = Tree.Node.Type.Connection Then 'connection info
+                                Dim connectionInfo As Connection.Info = GetConnectionInfoFromXml(xmlNode)
+                                connectionInfo.TreeNode = treeNode
+                                connectionInfo.Parent = _previousContainer 'NEW
 
-                                Me._ConnectionList.Add(conI)
+                                ConnectionList.Add(connectionInfo)
 
-                                tNode.Tag = conI
-                                tNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
-                                tNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
-                            ElseIf Tree.Node.GetNodeTypeFromString(xNode.Attributes("Type").Value) = Tree.Node.Type.Container Then  'container info
-                                Dim contI As New Container.Info
-                                If tNode.Parent IsNot Nothing Then
-                                    If Tree.Node.GetNodeType(tNode.Parent) = Tree.Node.Type.Container Then
-                                        contI.Parent = tNode.Parent.Tag
+                                treeNode.Tag = connectionInfo
+                                treeNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                                treeNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                            ElseIf Tree.Node.GetNodeTypeFromString(xmlNode.Attributes("Type").Value) = Tree.Node.Type.Container Then  'container info
+                                Dim containerInfo As New Container.Info
+                                If treeNode.Parent IsNot Nothing Then
+                                    If Tree.Node.GetNodeType(treeNode.Parent) = Tree.Node.Type.Container Then
+                                        containerInfo.Parent = treeNode.Parent.Tag
                                     End If
                                 End If
-                                prevCont = contI 'NEW
-                                contI.TreeNode = tNode
+                                _previousContainer = containerInfo 'NEW
+                                containerInfo.TreeNode = treeNode
 
-                                contI.Name = xNode.Attributes("Name").Value
+                                containerInfo.Name = xmlNode.Attributes("Name").Value
 
-                                If Me.confVersion > 0.7 Then '0.8
-                                    If xNode.Attributes("Expanded").Value = "True" Then
-                                        contI.IsExpanded = True
+                                If confVersion >= 0.8 Then
+                                    If xmlNode.Attributes("Expanded").Value = "True" Then
+                                        containerInfo.IsExpanded = True
                                     Else
-                                        contI.IsExpanded = False
+                                        containerInfo.IsExpanded = False
                                     End If
                                 End If
 
-                                Dim conI As Connection.Info
-                                If Me.confVersion > 0.8 Then '0.9
-                                    conI = GetConnectionInfoFromXml(xNode)
+                                Dim connectionInfo As Connection.Info
+                                If confVersion >= 0.9 Then
+                                    connectionInfo = GetConnectionInfoFromXml(xmlNode)
                                 Else
-                                    conI = New Connection.Info
+                                    connectionInfo = New Connection.Info
                                 End If
 
-                                conI.Parent = contI
-                                conI.IsContainer = True
-                                contI.ConnectionInfo = conI
+                                connectionInfo.Parent = containerInfo
+                                connectionInfo.IsContainer = True
+                                containerInfo.ConnectionInfo = connectionInfo
 
-                                Me._ContainerList.Add(contI)
+                                ContainerList.Add(containerInfo)
 
-                                tNode.Tag = contI
-                                tNode.ImageIndex = Images.Enums.TreeImage.Container
-                                tNode.SelectedImageIndex = Images.Enums.TreeImage.Container
+                                treeNode.Tag = containerInfo
+                                treeNode.ImageIndex = Images.Enums.TreeImage.Container
+                                treeNode.SelectedImageIndex = Images.Enums.TreeImage.Container
                             End If
 
-                            AddNodeFromXML(xNode, tNode)
+                            AddNodeFromXml(xmlNode, treeNode)
                         Next
                     Else
-                        inTreeNode.Text = inXmlNode.Attributes("Name").Value.Trim
+                        Dim nodeName As String = ""
+                        Dim nameAttribute As XmlAttribute = parentXmlNode.Attributes("Name")
+                        If Not IsNothing(nameAttribute) Then nodeName = nameAttribute.Value.Trim()
+                        If Not String.IsNullOrEmpty(nodeName) Then
+                            parentTreeNode.Text = nodeName
+                        Else
+                            parentTreeNode.Text = parentXmlNode.Name
+                        End If
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeFromXML failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodeFromXmlFailed & vbNewLine & ex.Message & ex.StackTrace, True)
+                    Throw
                 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
@@ -886,6 +901,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
@@ -921,7 +938,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.Language.strGeneral
                         End If
 
                         If Me.confVersion > 1.4 Then '1.5
@@ -929,7 +946,7 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.5 Then '1.6
-                            conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value)
+                            conI.ICAEncryption = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.ICA.EncryptionStrength), .Attributes("ICAEncryptionStrength").Value)
                             conI.Inherit.ICAEncryption = .Attributes("InheritICAEncryptionStrength").Value
 
                             conI.PreExtApp = .Attributes("PreExtApp").Value
@@ -939,16 +956,16 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.6 Then '1.7
-                            conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value)
-                            conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value)
-                            conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value)
-                            conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value)
+                            conI.VNCCompression = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Compression), .Attributes("VNCCompression").Value)
+                            conI.VNCEncoding = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Encoding), .Attributes("VNCEncoding").Value)
+                            conI.VNCAuthMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.AuthMode), .Attributes("VNCAuthMode").Value)
+                            conI.VNCProxyType = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.ProxyType), .Attributes("VNCProxyType").Value)
                             conI.VNCProxyIP = .Attributes("VNCProxyIP").Value
                             conI.VNCProxyPort = .Attributes("VNCProxyPort").Value
                             conI.VNCProxyUsername = .Attributes("VNCProxyUsername").Value
                             conI.VNCProxyPassword = Security.Crypt.Decrypt(.Attributes("VNCProxyPassword").Value, pW)
-                            conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value)
-                            conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value)
+                            conI.VNCColors = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.Colors), .Attributes("VNCColors").Value)
+                            conI.VNCSmartSizeMode = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.VNC.SmartSizeMode), .Attributes("VNCSmartSizeMode").Value)
                             conI.VNCViewOnly = .Attributes("VNCViewOnly").Value
 
                             conI.Inherit.VNCCompression = .Attributes("InheritVNCCompression").Value
@@ -965,13 +982,13 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 1.7 Then '1.8
-                            conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value)
+                            conI.RDPAuthenticationLevel = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.AuthenticationLevel), .Attributes("RDPAuthenticationLevel").Value)
 
                             conI.Inherit.RDPAuthenticationLevel = .Attributes("InheritRDPAuthenticationLevel").Value
                         End If
 
                         If Me.confVersion > 1.8 Then '1.9
-                            conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value)
+                            conI.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.HTTPBase.RenderingEngine), .Attributes("RenderingEngine").Value)
                             conI.MacAddress = .Attributes("MacAddress").Value
 
                             conI.Inherit.RenderingEngine = .Attributes("InheritRenderingEngine").Value
@@ -989,28 +1006,45 @@ Namespace Config
                         End If
 
                         If Me.confVersion > 2.1 Then '2.2
-                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
+                            ' Get settings
+                            conI.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod), .Attributes("RDGatewayUsageMethod").Value)
                             conI.RDGatewayHostname = .Attributes("RDGatewayHostname").Value
-                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemote.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value)
+                            conI.RDGatewayUseConnectionCredentials = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.RDP.RDGatewayUseConnectionCredentials), .Attributes("RDGatewayUseConnectionCredentials").Value)
                             conI.RDGatewayUsername = .Attributes("RDGatewayUsername").Value
                             conI.RDGatewayPassword = Security.Crypt.Decrypt(.Attributes("RDGatewayPassword").Value, pW)
                             conI.RDGatewayDomain = .Attributes("RDGatewayDomain").Value
+
+                            ' Get inheritance settings
                             conI.Inherit.RDGatewayUsageMethod = .Attributes("InheritRDGatewayUsageMethod").Value
                             conI.Inherit.RDGatewayHostname = .Attributes("InheritRDGatewayHostname").Value
+                            conI.Inherit.RDGatewayUseConnectionCredentials = .Attributes("InheritRDGatewayUseConnectionCredentials").Value
                             conI.Inherit.RDGatewayUsername = .Attributes("InheritRDGatewayUsername").Value
                             conI.Inherit.RDGatewayPassword = .Attributes("InheritRDGatewayPassword").Value
                             conI.Inherit.RDGatewayDomain = .Attributes("InheritRDGatewayDomain").Value
                         End If
-                    End With
 
-                    Return conI
+                        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
+
+                        If confVersion >= 2.4 Then
+                            conI.UseCredSsp = .Attributes("UseCredSsp").Value
+                            conI.Inherit.UseCredSsp = .Attributes("InheritUseCredSsp").Value
+                        End If
+                    End With
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetConnectionInfoFromXml failed" & vbNewLine & ex.Message, True)
-                    Return Nothing
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Language.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.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()
@@ -67,11 +84,11 @@ Namespace Config
                         If My.Settings.UseCustomPuttyPath Then
                             Connection.Protocol.PuttyBase.PuttyPath = My.Settings.CustomPuttyPath
                         Else
-                            Connection.Protocol.PuttyBase.PuttyPath = My.Application.Info.DirectoryPath & "\Putty.exe"
+                            Connection.Protocol.PuttyBase.PuttyPath = My.Application.Info.DirectoryPath & "\PuTTYNG.exe"
                         End If
 
                         If My.Settings.ShowSystemTrayIcon Then
-                            App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon()
+                            App.Runtime.NotificationAreaIcon = New Tools.Controls.NotificationAreaIcon()
                         End If
 
                         If My.Settings.AutoSaveEveryMinutes > 0 Then
@@ -84,6 +101,10 @@ Namespace Config
                         Me.LoadPanelsFromXML()
                         Me.LoadExternalAppsFromXML()
 
+                        If My.Settings.AlwaysShowPanelTabs Then
+                            frmMain.pnlDock.DocumentStyle = DocumentStyle.DockingWindow
+                        End If
+
                         If My.Settings.ResetToolbars = False Then
                             LoadToolbarsFromSettings()
                         Else
@@ -100,8 +121,8 @@ Namespace Config
                 With MainForm
                     ToolStripPanelFromString("top").Join(.tsQuickConnect, New Point(300, 0))
                     .tsQuickConnect.Visible = True
-                    ToolStripPanelFromString("bottom").Join(.tsExtAppsToolbar, New Point(3, 0))
-                    .tsExtAppsToolbar.Visible = False
+                    ToolStripPanelFromString("bottom").Join(.tsExternalTools, New Point(3, 0))
+                    .tsExternalTools.Visible = False
                 End With
             End Sub
 
@@ -126,8 +147,8 @@ Namespace Config
 
             Private Sub AddDynamicPanels()
                 With MainForm
-                    ToolStripPanelFromString(My.Settings.ExtAppsTBParentDock).Join(.tsExtAppsToolbar, My.Settings.ExtAppsTBLocation)
-                    .tsExtAppsToolbar.Visible = My.Settings.ExtAppsTBVisible
+                    ToolStripPanelFromString(My.Settings.ExtAppsTBParentDock).Join(.tsExternalTools, My.Settings.ExtAppsTBLocation)
+                    .tsExternalTools.Visible = My.Settings.ExtAppsTBVisible
                 End With
             End Sub
 
@@ -159,8 +180,15 @@ Namespace Config
                         Loop
 
                         Startup.CreatePanels()
-                        If File.Exists(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName) And My.Settings.ResetPanels = False Then
-                            .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.SetDefaultLayout()
                         End If
@@ -172,15 +200,21 @@ 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
+                    Dim extA As New Tools.ExternalTool
                     extA.DisplayName = xEl.Attributes("DisplayName").Value
                     extA.FileName = xEl.Attributes("FileName").Value
                     extA.Arguments = xEl.Attributes("Arguments").Value
@@ -193,19 +227,24 @@ Namespace Config
                         extA.TryIntegrate = xEl.Attributes("TryToIntegrate").Value
                     End If
 
-                    ExtApps.Add(extA)
+                    ExternalTools.Add(extA)
                 Next
 
-                MainForm.SwitchToolbarText(My.Settings.ExtAppsTBShowText)
+                MainForm.SwitchToolBarText(My.Settings.ExtAppsTBShowText)
 
                 xDom = Nothing
 
-                frmMain.AddExtAppsToToolbar()
+                frmMain.AddExternalToolsToToolBar()
             End Sub
 #End Region
 
 #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

@@ -63,12 +63,12 @@ Namespace Config
 
                 Public Overrides Function GetPropertyValues(ByVal context As SettingsContext, ByVal props As SettingsPropertyCollection) As SettingsPropertyValueCollection
                     'Create new collection of values
-                    Dim values As SettingsPropertyValueCollection = New SettingsPropertyValueCollection()
+                    Dim values As New SettingsPropertyValueCollection()
 
                     'Iterate through the settings to be retrieved
                     For Each setting As SettingsProperty In props
 
-                        Dim value As SettingsPropertyValue = New SettingsPropertyValue(setting)
+                        Dim value As New SettingsPropertyValue(setting)
                         value.IsDirty = False
                         value.SerializedValue = GetValue(setting)
                         values.Add(value)

mRemoteV1/Config/Config.Settings.Save.vb

@@ -1,36 +1,26 @@
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
 Imports System.Xml
 Imports System.IO
 
 Namespace Config
     Namespace Settings
         Public Class Save
-#Region "Public Properties"
-            Private _MainForm As frmMain
-            Public Property MainForm() As frmMain
-                Get
-                    Return Me._MainForm
-                End Get
-                Set(ByVal value As frmMain)
-                    Me._MainForm = value
-                End Set
-            End Property
-#End Region
-
 #Region "Public Methods"
-            Public Sub New(ByVal MainForm As frmMain)
-                Me._MainForm = MainForm
-            End Sub
-
             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
+                    With frmMain
+                        Dim windowPlacement As New Tools.WindowPlacement(frmMain)
+                        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
@@ -42,11 +32,11 @@ Namespace Config
                         My.Settings.ResetToolbars = False
                         My.Settings.NoReconnect = False
 
-                        My.Settings.ExtAppsTBLocation = .tsExtAppsToolbar.Location
-                        If .tsExtAppsToolbar.Parent IsNot Nothing Then
-                            My.Settings.ExtAppsTBParentDock = .tsExtAppsToolbar.Parent.Dock.ToString
+                        My.Settings.ExtAppsTBLocation = .tsExternalTools.Location
+                        If .tsExternalTools.Parent IsNot Nothing Then
+                            My.Settings.ExtAppsTBParentDock = .tsExternalTools.Parent.Dock.ToString
                         End If
-                        My.Settings.ExtAppsTBVisible = .tsExtAppsToolbar.Visible
+                        My.Settings.ExtAppsTBVisible = .tsExternalTools.Visible
                         My.Settings.ExtAppsTBShowText = .cMenToolbarShowText.Checked
 
                         My.Settings.QuickyTBLocation = .tsQuickConnect.Location
@@ -55,12 +45,7 @@ Namespace Config
                         End If
                         My.Settings.QuickyTBVisible = .tsQuickConnect.Visible
 
-                        If App.Editions.Spanlink.Enabled = False Then
-                            My.Settings.ConDefaultPassword = Security.Crypt.Encrypt(My.Settings.ConDefaultPassword, App.Info.General.EncryptionKey)
-                        Else
-                            My.Settings.LoadConsFromCustomLocation = False
-                            My.Settings.CustomConsPath = ""
-                        End If
+                        My.Settings.ConDefaultPassword = Security.Crypt.Encrypt(My.Settings.ConDefaultPassword, App.Info.General.EncryptionKey)
 
                         My.Settings.Save()
                     End With
@@ -68,7 +53,7 @@ Namespace Config
                     Me.SavePanelsToXML()
                     Me.SaveExternalAppsToXML()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" & vbNewLine & vbNewLine & ex.Message, False)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Saving settings failed" & vbNewLine & vbNewLine & ex.Message, False)
                 End Try
             End Sub
 
@@ -78,9 +63,9 @@ Namespace Config
                         Directory.CreateDirectory(App.Info.Settings.SettingsPath)
                     End If
 
-                    MainForm.pnlDock.SaveAsXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName)
+                    frmMain.pnlDock.SaveAsXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SavePanelsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
                 End Try
             End Sub
 
@@ -90,29 +75,29 @@ Namespace Config
                         Directory.CreateDirectory(App.Info.Settings.SettingsPath)
                     End If
 
-                    Dim xW As New XmlTextWriter(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName, System.Text.Encoding.UTF8)
-                    xW.Formatting = Formatting.Indented
-                    xW.Indentation = 4
+                    Dim xmlTextWriter As New XmlTextWriter(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.ExtAppsFilesName, System.Text.Encoding.UTF8)
+                    xmlTextWriter.Formatting = Formatting.Indented
+                    xmlTextWriter.Indentation = 4
 
-                    xW.WriteStartDocument()
-                    xW.WriteStartElement("Apps")
+                    xmlTextWriter.WriteStartDocument()
+                    xmlTextWriter.WriteStartElement("Apps")
 
-                    For Each extA As Tools.ExternalApp In ExtApps
-                        xW.WriteStartElement("App")
-                        xW.WriteAttributeString("DisplayName", "", extA.DisplayName)
-                        xW.WriteAttributeString("FileName", "", extA.FileName)
-                        xW.WriteAttributeString("Arguments", "", extA.Arguments)
-                        xW.WriteAttributeString("WaitForExit", "", extA.WaitForExit)
-                        xW.WriteAttributeString("TryToIntegrate", "", extA.TryIntegrate)
-                        xW.WriteEndElement()
+                    For Each extA As Tools.ExternalTool In ExternalTools
+                        xmlTextWriter.WriteStartElement("App")
+                        xmlTextWriter.WriteAttributeString("DisplayName", "", extA.DisplayName)
+                        xmlTextWriter.WriteAttributeString("FileName", "", extA.FileName)
+                        xmlTextWriter.WriteAttributeString("Arguments", "", extA.Arguments)
+                        xmlTextWriter.WriteAttributeString("WaitForExit", "", extA.WaitForExit)
+                        xmlTextWriter.WriteAttributeString("TryToIntegrate", "", extA.TryIntegrate)
+                        xmlTextWriter.WriteEndElement()
                     Next
 
-                    xW.WriteEndElement()
-                    xW.WriteEndDocument()
+                    xmlTextWriter.WriteEndElement()
+                    xmlTextWriter.WriteEndDocument()
 
-                    xW.Close()
+                    xmlTextWriter.Close()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "SaveExternalAppsToXML failed" & vbNewLine & vbNewLine & ex.Message, False)
                 End Try
             End Sub
 #End Region

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
@@ -29,7 +29,7 @@ Namespace Connection
                     Return nI
                 End If
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get Icon from String" & vbNewLine & ex.Message)
+                MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't get Icon from String" & vbNewLine & ex.Message)
             End Try
 
             Return Nothing

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
@@ -37,7 +37,7 @@ Namespace Connection
                 Me.Anchor = AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right Or AnchorStyles.Top
                 InitializeComponent()
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new InterfaceControl" & vbNewLine & ex.Message)
+                MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create new InterfaceControl" & vbNewLine & ex.Message)
             End Try
         End Sub
 #End Region

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
@@ -58,7 +58,7 @@ Namespace Connection
                 Try
                     Me._Control.Focus()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't focus Control (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't focus Control (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -77,7 +77,7 @@ Namespace Connection
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't SetProps (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -98,6 +98,7 @@ Namespace Connection
 
             Public Overridable Sub Close()
                 Dim t As New Thread(AddressOf CloseBG)
+                t.SetApartmentState(Threading.ApartmentState.STA)
                 t.IsBackground = True
                 t.Start()
             End Sub
@@ -112,7 +113,7 @@ Namespace Connection
                         Try
                             Me.DisposeControl()
                         Catch ex As Exception
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "Could not dispose control, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                            MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Could not dispose control, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                         End Try
                     End If
 
@@ -126,11 +127,11 @@ Namespace Connection
                                 Me.DisposeInterface()
                             End If
                         Catch ex As Exception
-                            mC.AddMessage(Messages.MessageClass.WarningMsg, "Could not set InterfaceControl.Parent.Tag or Dispose Interface, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                            MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Could not set InterfaceControl.Parent.Tag or Dispose Interface, probably form is already closed (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                         End Try
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't Close InterfaceControl BG (Connection.Protocol.Base)" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 

mRemoteV1/Connection/Connection.Protocol.HTTP.vb

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

mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb

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

mRemoteV1/Connection/Connection.Protocol.HTTPS.vb

@@ -1,7 +1,4 @@
-Imports System.Windows.Forms
-Imports mRemote.App.Runtime
-
-Namespace Connection
+Namespace Connection
     Namespace Protocol
         Public Class HTTPS
             Inherits Connection.Protocol.HTTPBase

mRemoteV1/Connection/Connection.Protocol.ICA.vb

@@ -1,7 +1,7 @@
-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 +18,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaControlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -45,13 +45,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -64,7 +88,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed!" & vbNewLine & ex.Message)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
@@ -110,7 +134,7 @@ Namespace Connection
                         ICA.Domain = _dom
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ICA SetCredentials failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetCredentialsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -135,7 +159,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetResolutionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -143,6 +167,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 +200,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -229,15 +255,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
@@ -12,7 +10,7 @@ Namespace Connection
 #Region "Private Properties"
             Private IntAppProcessStartInfo As New ProcessStartInfo()
             Private Arguments As String
-            Private ExtApp As Tools.ExternalApp
+            Private ExtApp As Tools.ExternalTool
 #End Region
 
 #Region "Public Properties"
@@ -112,12 +110,11 @@ Namespace Connection
 
                     IntAppHandle = IntAppProcess.MainWindowHandle
 
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strIntAppHandle, IntAppHandle.ToString), True)
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strIntAppTitle, IntAppProcess.MainWindowTitle), True)
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIntAppDisposeFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 MyBase.Close()

mRemoteV1/Connection/Connection.Protocol.Protocols.vb

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

mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb

@@ -1,8 +1,11 @@
-Imports mRemote.App.Native
+Imports System.Runtime.InteropServices
+Imports System.ComponentModel
+Imports mRemoteNG.Messages
+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
@@ -14,6 +17,7 @@ Namespace Connection
 #End Region
 
 #Region "Private Properties"
+            Dim _isPuttyNg As Boolean
 #End Region
 
 #Region "Public Properties"
@@ -103,99 +107,111 @@ Namespace Connection
 
             Public Overrides Function Connect() As Boolean
                 Try
-                    PuttyProcess = New Process
+                    _isPuttyNg = IsFilePuttyNg(PuttyPath)
 
+                    PuttyProcess = New Process
                     With PuttyProcess.StartInfo
                         .FileName = _PuttyPath
 
-                        Select Case Me._PuttyProtocol
+                        Select Case _PuttyProtocol
                             Case Putty_Protocol.raw
-                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                                .Arguments = "-load " & """" & PuttyEscapeArgument(InterfaceControl.Info.PuttySession) & """" & " -" & _PuttyProtocol.ToString & " -P " & InterfaceControl.Info.Port & " """ & 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 & """"
+                                .Arguments = "-load " & """" & PuttyEscapeArgument(InterfaceControl.Info.PuttySession) & """" & " -" & _PuttyProtocol.ToString & " -P " & InterfaceControl.Info.Port & " """ & InterfaceControl.Info.Hostname & """"
                             Case Putty_Protocol.ssh
-                                Dim UserArg As String = ""
-                                Dim PassArg As String = ""
+                                Dim userArgument As String = ""
+                                Dim passwordArgument As String = ""
 
                                 If My.Settings.EmptyCredentials = "windows" Then
-                                    UserArg = " -l """ & Environment.UserName & """"
+                                    userArgument = " -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) & """"
+                                    userArgument = " -l """ & My.Settings.DefaultUsername & """"
+                                    passwordArgument = " -pw """ & PuttyEscapeArgument(Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey)) & """"
                                 End If
 
-                                If Me.InterfaceControl.Info.Username <> "" Then
-                                    UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
+                                If InterfaceControl.Info.Username <> "" Then
+                                    userArgument = " -l """ & InterfaceControl.Info.Username & """"
                                 End If
 
-                                If Me.InterfaceControl.Info.Password <> "" Then
-                                    PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
+                                If InterfaceControl.Info.Password <> "" Then
+                                    passwordArgument = " -pw """ & PuttyEscapeArgument(InterfaceControl.Info.Password) & """"
                                 End If
 
-                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
+                                .Arguments = "-load " & """" & PuttyEscapeArgument(InterfaceControl.Info.PuttySession) & """" & " -" & _PuttyProtocol.ToString & " -" & _PuttySSHVersion & userArgument & passwordArgument & " -P " & InterfaceControl.Info.Port & " """ & 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 & """"
+                                .Arguments = "-load " & """" & PuttyEscapeArgument(InterfaceControl.Info.PuttySession) & """" & " -" & _PuttyProtocol.ToString & " -P " & InterfaceControl.Info.Port & " """ & 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 & """"
+                                .Arguments = "-load " & """" & PuttyEscapeArgument(InterfaceControl.Info.PuttySession) & """" & " -" & _PuttyProtocol.ToString & " -P " & InterfaceControl.Info.Port & " """ & InterfaceControl.Info.Hostname & """"
                         End Select
 
+                        If _isPuttyNg Then
+                            .Arguments = .Arguments & " -hwndparent " & InterfaceControl.Handle.ToString()
+                        End If
+
                         'REMOVE IN RELEASE!
-                        'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & .Arguments, True)
+                        'MessageCollector.AddMessage(MessageClass.InformationMsg, "PuTTY Arguments: " & .Arguments, True)
                     End With
 
                     PuttyProcess.EnableRaisingEvents = True
                     AddHandler PuttyProcess.Exited, AddressOf ProcessExited
 
                     PuttyProcess.Start()
-                    PuttyProcess.WaitForInputIdle()
+                    PuttyProcess.WaitForInputIdle(My.Settings.MaxPuttyWaitTime * 1000)
 
-                    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
-                            Exit Do
+                    Dim startTicks As Integer = Environment.TickCount
+                    While PuttyHandle.ToInt32 = 0 And Environment.TickCount < startTicks + (My.Settings.MaxPuttyWaitTime * 1000)
+                        If _isPuttyNg Then
+                            PuttyHandle = FindWindowEx(InterfaceControl.Handle, 0, vbNullString, vbNullString)
+                        Else
+                            PuttyProcess.Refresh()
+                            PuttyHandle = PuttyProcess.MainWindowHandle
                         End If
+                        If PuttyHandle.ToInt32 = 0 Then Thread.Sleep(0)
+                    End While
 
-                        PuttyProcess.Refresh()
+                    If Not _isPuttyNg Then
+                        SetParent(PuttyHandle, InterfaceControl.Handle)
+                    End If
 
-                        Thread.Sleep(500)
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strPuttyStuff, True)
 
-                        TryCount += 1
-                    Loop
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, String.Format(My.Language.strPuttyHandle, PuttyHandle.ToString), True)
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, String.Format(My.Language.strPuttyTitle, PuttyProcess.MainWindowTitle), True)
+                    MessageCollector.AddMessage(MessageClass.InformationMsg, String.Format(My.Language.strPuttyParentHandle, InterfaceControl.Parent.Handle.ToString), True)
 
-                    PuttyHandle = PuttyProcess.MainWindowHandle
-
-
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, "--- PuTTY Stuff ---", 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)
-
-                    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)
+                    MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
 
+            ' Due to the way PuTTY handles command line arguments, backslashes followed by a quotation mark will be removed.
+            ' Since all the strings we send to PuTTY are surrounded by quotation marks, we need to escape any trailing
+            ' backslashes by adding another. See split_into_argv() in WINDOWS\WINUTILS.C of the PuTTY source for more info.
+            Private Shared Function PuttyEscapeArgument(ByVal argument As String) As String
+                If argument.EndsWith("\") Then argument = argument & "\"
+                Return argument
+            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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
             Public Overrides Sub Resize()
                 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)
+                    If frmMain.WindowState = FormWindowState.Minimized Then Return
+
+                    MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), 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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyResizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -205,13 +221,13 @@ Namespace Connection
                         PuttyProcess.Kill()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Killing Putty Process failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyDisposeFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 MyBase.Close()
@@ -222,7 +238,7 @@ Namespace Connection
                     PostMessage(Me.PuttyHandle, WM_SYSCOMMAND, IDM_RECONF, 0)
                     SetForegroundWindow(Me.PuttyHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "ShowSettingsDialog failed (Connection.Protocol.PuttyBase)" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -244,11 +260,21 @@ 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.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strPuttyGetSessionsFailed & vbNewLine & ex.Message, True)
                     Return Nothing
                 End Try
             End Function
 
+            Public Shared Function IsFilePuttyNg(file As String) As Boolean
+                Dim isPuttyNg As Boolean
+                Try
+                    isPuttyNg = FileVersionInfo.GetVersionInfo(file).InternalName.Contains("PuTTYNG")
+                Catch
+                    isPuttyNg = False
+                End Try
+                Return isPuttyNg
+            End Function
+
             Public Shared Sub StartPutty()
                 Try
                     Dim p As Process
@@ -258,9 +284,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyStartFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -279,7 +305,6 @@ Namespace Connection
                 ssh2 = 2
             End Enum
 #End Region
-
         End Class
     End Namespace
 End Namespace

mRemoteV1/Connection/Connection.Protocol.RDP.vb

@@ -3,7 +3,8 @@ Imports System.Threading
 Imports AxMSTSCLib
 Imports EOLWTSCOM
 Imports System.ComponentModel
-Imports mRemote.App.Runtime
+Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -58,11 +59,10 @@ Namespace Connection
                             System.Windows.Forms.Application.DoEvents()
                         Loop
                     Catch comEx As System.Runtime.InteropServices.COMException
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "Couldn't create RDP control, please check mRemote requirements." & vbNewLine & vbNewLine & comEx.Message)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpControlCreationFailed & vbNewLine & vbNewLine & comEx.Message)
                         RDP.Dispose()
                         Return False
                     End Try
- 
 
                     Me.RDPVersion = New Version(RDP.Version)
 
@@ -75,15 +75,15 @@ 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
 
                     RDP.AdvancedSettings2.BitmapPeristence = Me.Info.CacheBitmaps
+                    RDP.AdvancedSettings7.EnableCredSspSupport = Info.UseCredSsp
 
                     Me.SetUseConsoleSession()
                     Me.SetPort()
@@ -96,11 +96,13 @@ Namespace Connection
 
                     Me.SetPerformanceFlags()
 
-                    RDP.ConnectingText = Language.Base.Connecting
+                    RDP.ConnectingText = My.Language.strConnecting
+
+                    Control.Anchor = AnchorStyles.None
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetProps failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -113,7 +115,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed!" & vbNewLine & ex.Message)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpConnectionOpenFailed & vbNewLine & ex.Message)
                 End Try
 
                 Return False
@@ -123,7 +125,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpDisconnectFailed & vbNewLine & ex.Message, True)
                     MyBase.Close()
                 End Try
             End Sub
@@ -132,7 +134,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpToggleFullscreenFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -140,7 +142,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpToggleSmartSizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -150,35 +152,45 @@ Namespace Connection
                         RDP.Focus()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP Focus failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
+
+            Public Overrides Sub Resize()
+                Control.Location = InterfaceControl.Location
+                Control.Size = InterfaceControl.Size
+                MyBase.Resize()
+            End Sub
 #End Region
 
 #Region "Private Methods"
             Private Sub SetRDGateway()
                 Try
                     If RDP.TransportSettings.GatewayIsSupported = 1 Then
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is supported", True)
-                        If Me.Info.RDGatewayUsageMethod <> RDGatewayUsageMethod.Never Then
+                        MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strRdpGatewayIsSupported, True)
+                        If 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
+                            RDP.TransportSettings.GatewayUsageMethod = Info.RDGatewayUsageMethod
+                            RDP.TransportSettings.GatewayHostname = Info.RDGatewayHostname
+                            If Info.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes Then
+                                RDP.TransportSettings.GatewayUsername = Info.Username
+                                RDP.TransportSettings.GatewayPassword = Info.Password
+                                RDP.TransportSettings.GatewayDomain = Info.Domain
+                            ElseIf Info.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard Then
+                                RDP.TransportSettings2.GatewayCredsSource = 1 ' TSC_PROXY_CREDS_MODE_SMARTCARD
+                                RDP.TransportSettings2.GatewayCredSharing = 0
                             Else
-                                RDP.TransportSettings.GatewayUsername = Me.Info.RDGatewayUsername
-                                RDP.TransportSettings.GatewayPassword = Me.Info.RDGatewayPassword
-                                RDP.TransportSettings.GatewayDomain = Me.Info.RDGatewayDomain
+                                RDP.TransportSettings.GatewayUsername = Info.RDGatewayUsername
+                                RDP.TransportSettings.GatewayPassword = Info.RDGatewayPassword
+                                RDP.TransportSettings.GatewayDomain = Info.RDGatewayDomain
+                                RDP.TransportSettings2.GatewayCredSharing = 0
                             End If
                         End If
                     Else
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, "RD Gateway is not supported", True)
+                        MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strRdpGatewayNotSupported, True)
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetRDGateway failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetGatewayFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -186,31 +198,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)
+                            MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strRdpSetConsoleSwitch, "6.0"), True)
                             RDP.AdvancedSettings2.ConnectToServerConsole = True
                         Else
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.1", True)
+                            MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.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)
+                            MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strRdpSetConsoleSwitch, "6.0"), True)
                             RDP.AdvancedSettings2.ConnectToServerConsole = False
                         Else
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.1", True)
+                            MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.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)
+                            MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.strRdpSetConsoleSwitch, "6.0"), True)
                             RDP.AdvancedSettings2.ConnectToServerConsole = Me.Info.UseConsoleSession
                         Else
-                            mC.AddMessage(Messages.MessageClass.InformationMsg, "Setting Console switch for RDC 6.1", True)
+                            MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetConsoleSessionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -253,7 +265,7 @@ Namespace Connection
                         RDP.Domain = _dom
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetCredentials failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetCredentialsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -284,7 +296,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetResolutionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -294,7 +306,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPortFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -307,7 +319,7 @@ Namespace Connection
                         RDP.FullScreen = True
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP SetRedirectKeys failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetRedirectKeysFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -319,7 +331,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetRedirectionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -334,9 +346,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetPerformanceFlagsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -344,7 +364,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetAuthenticationLevelFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -356,7 +376,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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -366,9 +386,12 @@ Namespace Connection
                 MyBase.Event_ErrorOccured(Me, e.errorCode)
             End Sub
 
-            Private Sub RDPEvent_OnDisconnected(ByVal sender As Object, ByVal e As AxMSTSCLib.IMsTscAxEvents_OnDisconnectedEvent)
-                Dim Reason As String = RDP.GetErrorDescription(e.discReason, RDP.ExtendedDisconnectReason)
-                MyBase.Event_Disconnected(Me, e.discReason & vbCrLf & Reason)
+            Private Sub RDPEvent_OnDisconnected(ByVal sender As Object, ByVal e As IMsTscAxEvents_OnDisconnectedEvent)
+                Const UI_ERR_NORMAL_DISCONNECT As Integer = &HB08
+                If Not e.discReason = UI_ERR_NORMAL_DISCONNECT Then
+                    Dim reason As String = RDP.GetErrorDescription(e.discReason, RDP.ExtendedDisconnectReason)
+                    Event_Disconnected(Me, e.discReason & vbCrLf & reason)
+                End If
 
                 If My.Settings.ReconnectOnDisconnect Then
                     ReconnectGroup = New ReconnectGroup
@@ -378,7 +401,7 @@ Namespace Connection
                     ReconnectGroup.Show()
                     tmrReconnect.Enabled = True
                 Else
-                    MyBase.Close()
+                    Close()
                 End If
             End Sub
 
@@ -408,46 +431,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
@@ -488,28 +517,30 @@ Namespace Connection
             End Enum
 
             Public Enum AuthenticationLevel
-                <Description(Language.Base.AlwaysConnectEvenIfAuthFails)> _
+                <LocalizedDescription("strAlwaysConnectEvenIfAuthFails")> _
                 NoAuth = 0
-                <Description(Language.Base.DontConnectWhenAuthFails)> _
+                <LocalizedDescription("strDontConnectWhenAuthFails")> _
                 AuthRequired = 1
-                <Description(Language.Base.WarnIfAuthFails)> _
+                <LocalizedDescription("strWarnIfAuthFails")> _
                 WarnOnFailedAuth = 2
             End Enum
 
             Public Enum RDGatewayUsageMethod
-                <Description("Never")> _
+                <LocalizedDescription("strNever")> _
                 Never = 0 ' TSC_PROXY_MODE_NONE_DIRECT
-                <Description("Always")> _
+                <LocalizedDescription("strAlways")> _
                 Always = 1 ' TSC_PROXY_MODE_DIRECT
-                <Description("Detect")> _
+                <LocalizedDescription("strDetect")> _
                 Detect = 2 ' TSC_PROXY_MODE_DETECT
             End Enum
 
             Public Enum RDGatewayUseConnectionCredentials
-                <Description("Use a different username and password")> _
+                <LocalizedDescription("strUseDifferentUsernameAndPassword")> _
                 No = 0
-                <Description("Use the same username and password")> _
+                <LocalizedDescription("strUseSameUsernameAndPassword")> _
                 Yes = 1
+                <LocalizedDescription("strUseSmartCard")> _
+                SmartCard = 2
             End Enum
 #End Region
 
@@ -557,7 +588,7 @@ Namespace Connection
                             End If
                         Next
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP AddResolutions failed" & vbNewLine & ex.Message, True)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpAddResolutionsFailed & vbNewLine & ex.Message, True)
                     End Try
                 End Sub
 
@@ -584,7 +615,7 @@ Namespace Connection
 
                         Return nRes
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "RDP Add (Resolutions) failed" & vbNewLine & ex.Message, True)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpAddResolutionFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return Nothing
@@ -593,8 +624,8 @@ Namespace Connection
 #End Region
 
             Public Class Versions
-                Public Shared RDC60 As Version = New Version(6, 0, 6000)
-                Public Shared RDC61 As Version = New Version(6, 0, 6001)
+                Public Shared RDC60 As New Version(6, 0, 6000)
+                Public Shared RDC61 As New Version(6, 0, 6001)
             End Class
 
 #Region "Terminal Sessions"
@@ -612,7 +643,7 @@ Namespace Connection
                             Return True
                         End If
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "OpenConnection failed (TerminalSessions)" & vbNewLine & ex.Message, True)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpOpenConnectionFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return False
@@ -623,7 +654,7 @@ Namespace Connection
                         oWTSCOM.WTSCloseServer(ServerHandle)
                         ServerHandle = 0
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "CloseConnection failed (TerminalSessions)" & vbNewLine & ex.Message, True)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpCloseConnectionFailed & vbNewLine & ex.Message, True)
                     End Try
                 End Sub
 
@@ -646,14 +677,14 @@ Namespace Connection
 
                             If SessionUser <> "" Then
                                 If SessionState = 0 Then
-                                    colSessions.Add(SessionID, Language.Base.Active, SessionUser, SessionName)
+                                    colSessions.Add(SessionID, My.Language.strActive, SessionUser, SessionName)
                                 Else
-                                    colSessions.Add(SessionID, Language.Base.Inactive, SessionUser, SessionName)
+                                    colSessions.Add(SessionID, My.Language.strInactive, SessionUser, SessionName)
                                 End If
                             End If
                         Next
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetSessions failed (TerminalSessions)" & vbNewLine & ex.Message, True)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpGetSessionsFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return colSessions
@@ -692,7 +723,7 @@ Namespace Connection
 
                         List.Add(newSes)
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "Add Session failed" & vbNewLine & ex.Message, True)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpAddSessionFailed & vbNewLine & ex.Message, True)
                     End Try
 
                     Return newSes
@@ -751,23 +782,23 @@ Namespace Connection
 #Region "Fatal Errors"
             Public Class FatalErrors
                 Protected Shared _description() As String = { _
-                    0 = "An unknown error has occurred.", _
-                    1 = "Internal error code 1.", _
-                    2 = "An out-of-memory error has occurred.", _
-                    3 = "A window-creation error has occurred.", _
-                    4 = "Internal error code 2.", _
-                    5 = "Internal error code 3. This is not a valid state.", _
-                    6 = "Internal error code 4.", _
-                    7 = "An unrecoverable error has occurred during client connection.", _
-                    100 = "Winsock initialization error." _
+                    0 = My.Language.strRdpErrorUnknown, _
+                    1 = My.Language.strRdpErrorCode1, _
+                    2 = My.Language.strRdpErrorOutOfMemory, _
+                    3 = My.Language.strRdpErrorWindowCreation, _
+                    4 = My.Language.strRdpErrorCode2, _
+                    5 = My.Language.strRdpErrorCode3, _
+                    6 = My.Language.strRdpErrorCode4, _
+                    7 = My.Language.strRdpErrorConnection, _
+                    100 = My.Language.strRdpErrorWinsock _
                 }
 
                 Public Shared Function GetError(ByVal id As String) As String
                     Try
                         Return (_description(id))
                     Catch ex As Exception
-                        mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetError failed (FatalErrors)" & vbNewLine & ex.Message, True)
-                        Return String.Format("An unknown fatal RDP error has occurred.  Error code {0}.", id)
+                        MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strRdpErrorGetFailure & vbNewLine & ex.Message, True)
+                        Return String.Format(My.Language.strRdpErrorUnknown, id)
                     End Try
                 End Function
             End Class

mRemoteV1/Connection/Connection.Protocol.VNC.vb

@@ -1,6 +1,6 @@
-Imports mRemote.App.Runtime
-Imports VncSharp
+Imports mRemoteNG.App.Runtime
 Imports System.ComponentModel
+Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
     Namespace Protocol
@@ -105,14 +105,14 @@ Namespace Connection
                     '    VNC.RestrictPixel = False
                     'End If
 
-                    'VNC.ConnectingText = Language.Base.Connecting & " (SmartCode VNC viewer)"
-                    'VNC.DisconnectedText = Language.Base.Disconnected
+                    'VNC.ConnectingText = My.Language.strInheritConnecting & " (SmartCode VNC viewer)"
+                    'VNC.DisconnectedText = My.Language.strInheritDisconnected
                     'VNC.MessageBoxes = False
                     'VNC.EndInit()
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetProps failed" & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.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
@@ -81,7 +81,7 @@ Namespace Container
             End Set
         End Property
 
-        Private _ConnectionInfo As Connection.Info = New Connection.Info
+        Private _ConnectionInfo As New Connection.Info
         Public Property ConnectionInfo() As Connection.Info
             Get
                 Return Me._ConnectionInfo

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.Language.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.Language.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.Language.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.Language.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.Language.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,18 +17,18 @@ 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.Language.strButtonOK
+        lblDescription.Text = My.Language.strLabelSelectPanel
+        btnNew.Text = My.Language.strButtonNew
+        btnCancel.Text = My.Language.strButtonCancel
+        Text = My.Language.strTitleSelectPanel
     End Sub
 
     Private Sub AddAvailablePanels()
         cbPanels.Items.Clear()
 
-        For i As Integer = 0 To wL.Count - 1
-            cbPanels.Items.Add(wL(i).Text.Replace("&&", "&"))
+        For i As Integer = 0 To WindowList.Count - 1
+            cbPanels.Items.Add(WindowList(i).Text.Replace("&&", "&"))
         Next
 
         If cbPanels.Items.Count > 0 Then
@@ -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.Language.strPanelName & ":", My.Language.strNewPanel, My.Language.strNewPanel)
 
         If pnlName <> "" Then
             AddPanel(pnlName)

mRemoteV1/Forms/frmMain.Designer.vb

@@ -23,31 +23,45 @@ Partial Class frmMain
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container
-        Dim DockPanelSkin3 As WeifenLuo.WinFormsUI.Docking.DockPanelSkin = New WeifenLuo.WinFormsUI.Docking.DockPanelSkin
-        Dim AutoHideStripSkin3 As WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin = New WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin
-        Dim DockPanelGradient7 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
-        Dim TabGradient15 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPaneStripSkin3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin = New WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin
-        Dim DockPaneStripGradient3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient
-        Dim TabGradient16 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPanelGradient8 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
-        Dim TabGradient17 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPaneStripToolWindowGradient3 As WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient
-        Dim TabGradient18 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim TabGradient19 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim DockPanelGradient9 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
-        Dim TabGradient20 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
-        Dim TabGradient21 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelSkin1 As WeifenLuo.WinFormsUI.Docking.DockPanelSkin = New WeifenLuo.WinFormsUI.Docking.DockPanelSkin
+        Dim AutoHideStripSkin1 As WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin = New WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin
+        Dim DockPanelGradient1 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient1 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPaneStripSkin1 As WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin = New WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin
+        Dim DockPaneStripGradient1 As WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient
+        Dim TabGradient2 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelGradient2 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient3 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPaneStripToolWindowGradient1 As WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient = New WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient
+        Dim TabGradient4 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim TabGradient5 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim DockPanelGradient3 As WeifenLuo.WinFormsUI.Docking.DockPanelGradient = New WeifenLuo.WinFormsUI.Docking.DockPanelGradient
+        Dim TabGradient6 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
+        Dim TabGradient7 As WeifenLuo.WinFormsUI.Docking.TabGradient = New WeifenLuo.WinFormsUI.Docking.TabGradient
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
         Me.pnlDock = New WeifenLuo.WinFormsUI.Docking.DockPanel
         Me.msMain = New System.Windows.Forms.MenuStrip
         Me.mMenFile = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileNewConnection = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileNewFolder = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileSep1 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenFileNew = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenFileLoad = New System.Windows.Forms.ToolStripMenuItem
-        Me.mMenFileSep1 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenFileSave = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenFileSaveAs = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenFileSep2 = New System.Windows.Forms.ToolStripSeparator
+        Me.mMenFileImportExport = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromXMLFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromRDPFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromActiveDirectoryToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ImportFromPortScanToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator
+        Me.ExportToXMLFileToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileSep3 = New System.Windows.Forms.ToolStripSeparator
+        Me.mMenFileDelete = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileRename = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileDuplicate = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenFileSep4 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenFileExit = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenView = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewAddConnectionPanel = New System.Windows.Forms.ToolStripMenuItem
@@ -63,6 +77,7 @@ Partial Class frmMain
         Me.mMenViewJumpToConnectionsConfig = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewJumpToSessionsScreenshots = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewJumpToErrorsInfos = New System.Windows.Forms.ToolStripMenuItem
+        Me.mMenViewResetLayout = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewSep2 = New System.Windows.Forms.ToolStripSeparator
         Me.mMenViewQuickConnectToolbar = New System.Windows.Forms.ToolStripMenuItem
         Me.mMenViewExtAppsToolbar = New System.Windows.Forms.ToolStripMenuItem
@@ -92,21 +107,28 @@ Partial Class frmMain
         Me.lblQuickConnect = New System.Windows.Forms.ToolStripLabel
         Me.cmbQuickConnect = New System.Windows.Forms.ToolStripComboBox
         Me.tsContainer = New System.Windows.Forms.ToolStripContainer
+        Me.tsExternalTools = 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.tsExtAppsToolbar = New System.Windows.Forms.ToolStrip
-        Me.cMenExtAppsToolbar = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.cMenToolbarShowText = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton
+        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton
+        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton
+        Me.ToolStripSplitButton1 = New System.Windows.Forms.ToolStripDropDownButton
+        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem
+        Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem
         Me.tmrShowUpdate = New System.Windows.Forms.Timer(Me.components)
         Me.tmrAutoSave = New System.Windows.Forms.Timer(Me.components)
-        Me.mMenViewResetLayout = New System.Windows.Forms.ToolStripMenuItem
         Me.msMain.SuspendLayout()
         Me.tsContainer.ContentPanel.SuspendLayout()
         Me.tsContainer.TopToolStripPanel.SuspendLayout()
         Me.tsContainer.SuspendLayout()
-        Me.tsQuickConnect.SuspendLayout()
         Me.cMenExtAppsToolbar.SuspendLayout()
+        Me.tsQuickConnect.SuspendLayout()
+        Me.ToolStrip1.SuspendLayout()
         Me.SuspendLayout()
         '
         'pnlDock
@@ -116,54 +138,54 @@ Partial Class frmMain
         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.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingSdi
         Me.pnlDock.Location = New System.Drawing.Point(0, 0)
         Me.pnlDock.Name = "pnlDock"
-        Me.pnlDock.Size = New System.Drawing.Size(842, 449)
-        DockPanelGradient7.EndColor = System.Drawing.SystemColors.ControlLight
-        DockPanelGradient7.StartColor = System.Drawing.SystemColors.ControlLight
-        AutoHideStripSkin3.DockStripGradient = DockPanelGradient7
-        TabGradient15.EndColor = System.Drawing.SystemColors.Control
-        TabGradient15.StartColor = System.Drawing.SystemColors.Control
-        TabGradient15.TextColor = System.Drawing.SystemColors.ControlDarkDark
-        AutoHideStripSkin3.TabGradient = TabGradient15
-        DockPanelSkin3.AutoHideStripSkin = AutoHideStripSkin3
-        TabGradient16.EndColor = System.Drawing.SystemColors.ControlLightLight
-        TabGradient16.StartColor = System.Drawing.SystemColors.ControlLightLight
-        TabGradient16.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripGradient3.ActiveTabGradient = TabGradient16
-        DockPanelGradient8.EndColor = System.Drawing.SystemColors.Control
-        DockPanelGradient8.StartColor = System.Drawing.SystemColors.Control
-        DockPaneStripGradient3.DockStripGradient = DockPanelGradient8
-        TabGradient17.EndColor = System.Drawing.SystemColors.ControlLight
-        TabGradient17.StartColor = System.Drawing.SystemColors.ControlLight
-        TabGradient17.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripGradient3.InactiveTabGradient = TabGradient17
-        DockPaneStripSkin3.DocumentGradient = DockPaneStripGradient3
-        TabGradient18.EndColor = System.Drawing.SystemColors.ActiveCaption
-        TabGradient18.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
-        TabGradient18.StartColor = System.Drawing.SystemColors.GradientActiveCaption
-        TabGradient18.TextColor = System.Drawing.SystemColors.ActiveCaptionText
-        DockPaneStripToolWindowGradient3.ActiveCaptionGradient = TabGradient18
-        TabGradient19.EndColor = System.Drawing.SystemColors.Control
-        TabGradient19.StartColor = System.Drawing.SystemColors.Control
-        TabGradient19.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripToolWindowGradient3.ActiveTabGradient = TabGradient19
-        DockPanelGradient9.EndColor = System.Drawing.SystemColors.ControlLight
-        DockPanelGradient9.StartColor = System.Drawing.SystemColors.ControlLight
-        DockPaneStripToolWindowGradient3.DockStripGradient = DockPanelGradient9
-        TabGradient20.EndColor = System.Drawing.SystemColors.GradientInactiveCaption
-        TabGradient20.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
-        TabGradient20.StartColor = System.Drawing.SystemColors.GradientInactiveCaption
-        TabGradient20.TextColor = System.Drawing.SystemColors.ControlText
-        DockPaneStripToolWindowGradient3.InactiveCaptionGradient = TabGradient20
-        TabGradient21.EndColor = System.Drawing.Color.Transparent
-        TabGradient21.StartColor = System.Drawing.Color.Transparent
-        TabGradient21.TextColor = System.Drawing.SystemColors.ControlDarkDark
-        DockPaneStripToolWindowGradient3.InactiveTabGradient = TabGradient21
-        DockPaneStripSkin3.ToolWindowGradient = DockPaneStripToolWindowGradient3
-        DockPanelSkin3.DockPaneStripSkin = DockPaneStripSkin3
-        Me.pnlDock.Skin = DockPanelSkin3
+        Me.pnlDock.Size = New System.Drawing.Size(842, 424)
+        DockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight
+        DockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight
+        AutoHideStripSkin1.DockStripGradient = DockPanelGradient1
+        TabGradient1.EndColor = System.Drawing.SystemColors.Control
+        TabGradient1.StartColor = System.Drawing.SystemColors.Control
+        TabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark
+        AutoHideStripSkin1.TabGradient = TabGradient1
+        DockPanelSkin1.AutoHideStripSkin = AutoHideStripSkin1
+        TabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight
+        TabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight
+        TabGradient2.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripGradient1.ActiveTabGradient = TabGradient2
+        DockPanelGradient2.EndColor = System.Drawing.SystemColors.Control
+        DockPanelGradient2.StartColor = System.Drawing.SystemColors.Control
+        DockPaneStripGradient1.DockStripGradient = DockPanelGradient2
+        TabGradient3.EndColor = System.Drawing.SystemColors.ControlLight
+        TabGradient3.StartColor = System.Drawing.SystemColors.ControlLight
+        TabGradient3.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripGradient1.InactiveTabGradient = TabGradient3
+        DockPaneStripSkin1.DocumentGradient = DockPaneStripGradient1
+        TabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption
+        TabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
+        TabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption
+        TabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText
+        DockPaneStripToolWindowGradient1.ActiveCaptionGradient = TabGradient4
+        TabGradient5.EndColor = System.Drawing.SystemColors.Control
+        TabGradient5.StartColor = System.Drawing.SystemColors.Control
+        TabGradient5.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripToolWindowGradient1.ActiveTabGradient = TabGradient5
+        DockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight
+        DockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight
+        DockPaneStripToolWindowGradient1.DockStripGradient = DockPanelGradient3
+        TabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption
+        TabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical
+        TabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption
+        TabGradient6.TextColor = System.Drawing.SystemColors.ControlText
+        DockPaneStripToolWindowGradient1.InactiveCaptionGradient = TabGradient6
+        TabGradient7.EndColor = System.Drawing.Color.Transparent
+        TabGradient7.StartColor = System.Drawing.Color.Transparent
+        TabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark
+        DockPaneStripToolWindowGradient1.InactiveTabGradient = TabGradient7
+        DockPaneStripSkin1.ToolWindowGradient = DockPaneStripToolWindowGradient1
+        DockPanelSkin1.DockPaneStripSkin = DockPaneStripSkin1
+        Me.pnlDock.Skin = DockPanelSkin1
         Me.pnlDock.TabIndex = 13
         '
         'msMain
@@ -182,60 +204,151 @@ Partial Class frmMain
         '
         'mMenFile
         '
-        Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileNew, Me.mMenFileLoad, Me.mMenFileSep1, Me.mMenFileSave, Me.mMenFileSaveAs, Me.mMenFileSep2, Me.mMenFileExit})
+        Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileNewConnection, Me.mMenFileNewFolder, Me.mMenFileSep1, Me.mMenFileNew, Me.mMenFileLoad, Me.mMenFileSave, Me.mMenFileSaveAs, Me.mMenFileSep2, Me.mMenFileImportExport, Me.mMenFileSep3, Me.mMenFileDelete, Me.mMenFileRename, Me.mMenFileDuplicate, Me.mMenFileSep4, Me.mMenFileExit})
         Me.mMenFile.Name = "mMenFile"
         Me.mMenFile.Size = New System.Drawing.Size(37, 20)
         Me.mMenFile.Text = "&File"
         '
-        'mMenFileNew
+        'mMenFileNewConnection
         '
-        Me.mMenFileNew.Image = Global.mRemote.My.Resources.Resources.Connections_New
-        Me.mMenFileNew.Name = "mMenFileNew"
-        Me.mMenFileNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
-        Me.mMenFileNew.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileNew.Text = "New Connections"
+        Me.mMenFileNewConnection.Image = Global.mRemoteNG.My.Resources.Resources.Connection_Add
+        Me.mMenFileNewConnection.Name = "mMenFileNewConnection"
+        Me.mMenFileNewConnection.ShortcutKeys = CType((System.Windows.Forms.Keys.Shift Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys)
+        Me.mMenFileNewConnection.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileNewConnection.Text = "New Connection"
         '
-        'mMenFileLoad
+        'mMenFileNewFolder
         '
-        Me.mMenFileLoad.Image = Global.mRemote.My.Resources.Resources.Connections_Load
-        Me.mMenFileLoad.Name = "mMenFileLoad"
-        Me.mMenFileLoad.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
-        Me.mMenFileLoad.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileLoad.Text = "Open Connections"
+        Me.mMenFileNewFolder.Image = Global.mRemoteNG.My.Resources.Resources.Folder_Add
+        Me.mMenFileNewFolder.Name = "mMenFileNewFolder"
+        Me.mMenFileNewFolder.ShortcutKeys = System.Windows.Forms.Keys.F7
+        Me.mMenFileNewFolder.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileNewFolder.Text = "New Folder"
         '
         'mMenFileSep1
         '
         Me.mMenFileSep1.Name = "mMenFileSep1"
-        Me.mMenFileSep1.Size = New System.Drawing.Size(253, 6)
+        Me.mMenFileSep1.Size = New System.Drawing.Size(331, 6)
+        '
+        'mMenFileNew
+        '
+        Me.mMenFileNew.Image = Global.mRemoteNG.My.Resources.Resources.Connections_New
+        Me.mMenFileNew.Name = "mMenFileNew"
+        Me.mMenFileNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
+        Me.mMenFileNew.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileNew.Text = "New Connection File"
+        '
+        'mMenFileLoad
+        '
+        Me.mMenFileLoad.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Load
+        Me.mMenFileLoad.Name = "mMenFileLoad"
+        Me.mMenFileLoad.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
+        Me.mMenFileLoad.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileLoad.Text = "Open Connection File..."
         '
         'mMenFileSave
         '
-        Me.mMenFileSave.Image = Global.mRemote.My.Resources.Resources.Connections_Save
+        Me.mMenFileSave.Image = Global.mRemoteNG.My.Resources.Resources.Connections_Save
         Me.mMenFileSave.Name = "mMenFileSave"
         Me.mMenFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenFileSave.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileSave.Text = "Save Connections"
+        Me.mMenFileSave.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileSave.Text = "Save Connection File"
         '
         'mMenFileSaveAs
         '
-        Me.mMenFileSaveAs.Image = Global.mRemote.My.Resources.Resources.Connections_SaveAs
+        Me.mMenFileSaveAs.Image = Global.mRemoteNG.My.Resources.Resources.Connections_SaveAs
         Me.mMenFileSaveAs.Name = "mMenFileSaveAs"
         Me.mMenFileSaveAs.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _
                     Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
-        Me.mMenFileSaveAs.Size = New System.Drawing.Size(256, 22)
-        Me.mMenFileSaveAs.Text = "Save Connections As"
+        Me.mMenFileSaveAs.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileSaveAs.Text = "Save Connection File As..."
         '
         'mMenFileSep2
         '
         Me.mMenFileSep2.Name = "mMenFileSep2"
-        Me.mMenFileSep2.Size = New System.Drawing.Size(253, 6)
+        Me.mMenFileSep2.Size = New System.Drawing.Size(331, 6)
+        '
+        'mMenFileImportExport
+        '
+        Me.mMenFileImportExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ImportFromXMLFileToolStripMenuItem, Me.ImportFromRDPFileToolStripMenuItem, Me.ImportFromActiveDirectoryToolStripMenuItem, Me.ImportFromPortScanToolStripMenuItem, Me.ToolStripSeparator6, Me.ExportToXMLFileToolStripMenuItem})
+        Me.mMenFileImportExport.Name = "mMenFileImportExport"
+        Me.mMenFileImportExport.Size = New System.Drawing.Size(334, 22)
+        Me.mMenFileImportExport.Text = "Import/Export Folder"
+        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
@@ -247,14 +360,14 @@ Partial Class frmMain
         '
         'mMenViewAddConnectionPanel
         '
-        Me.mMenViewAddConnectionPanel.Image = Global.mRemote.My.Resources.Resources.Panel_Add
+        Me.mMenViewAddConnectionPanel.Image = Global.mRemoteNG.My.Resources.Resources.Panel_Add
         Me.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"
         Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewAddConnectionPanel.Text = "Add Connection Panel"
         '
         'mMenViewConnectionPanels
         '
-        Me.mMenViewConnectionPanels.Image = Global.mRemote.My.Resources.Resources.Panels
+        Me.mMenViewConnectionPanels.Image = Global.mRemoteNG.My.Resources.Resources.Panels
         Me.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"
         Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(228, 22)
         Me.mMenViewConnectionPanels.Text = "Connection Panels"
@@ -268,7 +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"
@@ -295,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"
@@ -315,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"
@@ -325,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
@@ -333,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
@@ -341,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"
@@ -351,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"
@@ -370,7 +489,7 @@ Partial Class frmMain
         '
         'mMenViewFullscreen
         '
-        Me.mMenViewFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
+        Me.mMenViewFullscreen.Image = Global.mRemoteNG.My.Resources.Resources.Fullscreen
         Me.mMenViewFullscreen.Name = "mMenViewFullscreen"
         Me.mMenViewFullscreen.ShortcutKeys = System.Windows.Forms.Keys.F11
         Me.mMenViewFullscreen.Size = New System.Drawing.Size(228, 22)
@@ -385,17 +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
         '
@@ -406,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"
@@ -418,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"
@@ -460,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"
@@ -473,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"
@@ -485,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"
@@ -504,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"
@@ -525,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
         '
@@ -538,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, 449)
+        Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 424)
         Me.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill
         '
         'tsContainer.LeftToolStripPanel
@@ -558,46 +678,18 @@ 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.tsExternalTools)
+        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(39, 49)
-        Me.tsExtAppsToolbar.Name = "tsExtAppsToolbar"
-        Me.tsExtAppsToolbar.Size = New System.Drawing.Size(111, 25)
-        Me.tsExtAppsToolbar.TabIndex = 17
+        Me.tsExternalTools.ContextMenuStrip = Me.cMenExtAppsToolbar
+        Me.tsExternalTools.Dock = System.Windows.Forms.DockStyle.None
+        Me.tsExternalTools.Location = New System.Drawing.Point(39, 49)
+        Me.tsExternalTools.Name = "tsExtAppsToolbar"
+        Me.tsExternalTools.Size = New System.Drawing.Size(111, 25)
+        Me.tsExternalTools.TabIndex = 17
         '
         'cMenExtAppsToolbar
         '
@@ -613,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
@@ -622,21 +799,16 @@ Partial Class frmMain
         '
         Me.tmrAutoSave.Interval = 10000
         '
-        'mMenViewResetLayout
-        '
-        Me.mMenViewResetLayout.Name = "mMenViewResetLayout"
-        Me.mMenViewResetLayout.Size = New System.Drawing.Size(228, 22)
-        Me.mMenViewResetLayout.Text = "Reset Layout"
-        '
         'frmMain
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(842, 523)
         Me.Controls.Add(Me.tsContainer)
-        Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
+        Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon
         Me.MainMenuStrip = Me.msMain
         Me.Name = "frmMain"
+        Me.Opacity = 0
         Me.Text = "mRemoteNG"
         Me.msMain.ResumeLayout(False)
         Me.msMain.PerformLayout()
@@ -645,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
@@ -660,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
@@ -687,7 +860,7 @@ Partial Class frmMain
     Friend WithEvents tmrShowUpdate As System.Windows.Forms.Timer
     Friend WithEvents mMenToolsExternalApps As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents tmrAutoSave As System.Windows.Forms.Timer
-    Friend WithEvents tsExtAppsToolbar As System.Windows.Forms.ToolStrip
+    Friend WithEvents tsExternalTools As System.Windows.Forms.ToolStrip
     Friend WithEvents mMenViewExtAppsToolbar As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents cMenExtAppsToolbar As System.Windows.Forms.ContextMenuStrip
     Friend WithEvents cMenToolbarShowText As System.Windows.Forms.ToolStripMenuItem
@@ -713,5 +886,27 @@ Partial Class frmMain
     Friend WithEvents mMenInfoForum As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenToolsUpdate As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenViewResetLayout As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileDuplicate As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileSep2 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents mMenFileNewConnection As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileNewFolder As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileImportExport As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromXMLFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromRDPFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromActiveDirectoryToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ImportFromPortScanToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripSeparator6 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents ExportToXMLFileToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileSep3 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents mMenFileDelete As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileRename As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents mMenFileSep4 As System.Windows.Forms.ToolStripSeparator
+    Friend WithEvents ToolStrip1 As System.Windows.Forms.ToolStrip
+    Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
+    Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton
+    Friend WithEvents ToolStripButton3 As System.Windows.Forms.ToolStripButton
+    Friend WithEvents ToolStripSplitButton1 As System.Windows.Forms.ToolStripDropDownButton
+    Friend WithEvents ToolStripMenuItem1 As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents ToolStripMenuItem2 As System.Windows.Forms.ToolStripMenuItem
 
 End Class

mRemoteV1/Forms/frmMain.resx

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

mRemoteV1/Forms/frmMain.vb

@@ -1,37 +1,59 @@
-Imports mRemote.App.Runtime
+Imports WeifenLuo.WinFormsUI.Docking
+Imports mRemoteNG.App.Runtime
 Imports System.Reflection
+Imports System.Runtime.InteropServices
 Imports Crownwood
-Imports mRemote.App.Native
+Imports mRemoteNG.App.Native
 Imports PSTaskDialog
 
 Public Class frmMain
-    Public prevWindowsState As FormWindowState
+    Private _previousWindowState As FormWindowState
+    Public Property PreviousWindowState As FormWindowState
+        Get
+            Return _previousWindowState
+        End Get
+        Set(value As FormWindowState)
+            _previousWindowState = value
+        End Set
+    End Property
+    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
+        Startup.CheckCompatibility()
 
-        ApplyLanguage()
+        Startup.CreateLogger()
+
+        ' Create gui config load and save objects
+        Dim SettingsLoad As New Config.Settings.Load(Me)
+
+        ' Load GUI Configuration
+        SettingsLoad.Load()
 
         Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now)
 
         Startup.ParseCommandLineArgs()
 
+        ApplyLanguage()
 
-        sL = New Config.Settings.Load(Me)
-        sS = New Config.Settings.Save(Me)
+        fpChainedWindowHandle = SetClipboardViewer(Me.Handle)
 
-        Startup.CreateLogger()
-
-        sL.Load()
-
-        mC = New Messages.Collector(Windows.errorsForm)
+        MessageCollector = New Messages.Collector(Windows.errorsForm)
 
         Connection.Protocol.RDP.Resolutions.AddResolutions()
         Connection.Protocol.PuttyBase.BorderSize = New Size(SystemInformation.FrameBorderSize.Width, SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height) 'Size.Subtract(Me.Size, Me.ClientSize)
 
-        wL = New UI.Window.List
+        WindowList = New UI.Window.List
 
         Startup.GetConnectionIcons()
         Startup.GetPuttySessions()
@@ -40,88 +62,133 @@ Public Class frmMain
 
         Tree.Node.TreeView = Windows.treeForm.tvConnections
 
-        'insert new edition code here
-        Dim edSpanlink As New App.Editions.Spanlink
-
         'LoadCredentials()
         LoadConnections()
+        If Not IsConnectionsFileLoaded Then
+            Application.Exit()
+            Return
+        End If
 
         If My.Settings.StartupComponentsCheck Then
             Windows.Show(UI.Window.Type.ComponentsCheck)
         End If
 
+#If Not PORTABLE Then
         If Not My.Settings.CheckForUpdatesAsked Then
-            Windows.Show(UI.Window.Type.Options)
-            Windows.optionsForm.ShowUpdatesTab()
-            My.Settings.CheckForUpdatesAsked = True
+            Dim CommandButtons() As String = {My.Language.strAskUpdatesCommandRecommended, My.Language.strAskUpdatesCommandCustom, My.Language.strAskUpdatesCommandAskLater}
+            cTaskDialog.ShowTaskDialogBox(Me, My.Application.Info.ProductName, My.Language.strAskUpdatesMainInstruction, String.Format(My.Language.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()
         Startup.AnnouncementCheck()
+#Else
+        mMenInfoAnnouncements.Visible = False
+        mMenToolsUpdate.Visible = False
+        mMenInfoSep2.Visible = False
+#End If
+
         Startup.CreateSQLUpdateHandlerAndStartTimer()
 
         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.Language.strMenuFile
+        mMenFileNew.Text = My.Language.strMenuNewConnectionFile
+        mMenFileNewConnection.Text = My.Language.strNewConnection
+        mMenFileNewFolder.Text = My.Language.strNewFolder
+        mMenFileLoad.Text = My.Language.strMenuOpenConnectionFile
+        mMenFileSave.Text = My.Language.strMenuSaveConnectionFile
+        mMenFileSaveAs.Text = My.Language.strMenuSaveConnectionFileAs
+        mMenFileImportExport.Text = My.Language.strImportExport
+        ImportFromActiveDirectoryToolStripMenuItem.Text = My.Language.strImportAD
+        ImportFromPortScanToolStripMenuItem.Text = My.Language.strImportPortScan
+        ImportFromRDPFileToolStripMenuItem.Text = My.Language.strImportRDPFiles
+        ImportFromXMLFileToolStripMenuItem.Text = My.Language.strImportmRemoteXML
+        ExportToXMLFileToolStripMenuItem.Text = My.Language.strExportmRemoteXML
+        mMenFileExit.Text = My.Language.strMenuExit
+
+        mMenView.Text = My.Language.strMenuView
+        mMenViewAddConnectionPanel.Text = My.Language.strMenuAddConnectionPanel
+        mMenViewConnectionPanels.Text = My.Language.strMenuConnectionPanels
+        mMenViewConnections.Text = My.Language.strMenuConnections
+        mMenViewConfig.Text = My.Language.strMenuConfig
+        mMenViewSessions.Text = My.Language.strMenuSessions
+        mMenViewErrorsAndInfos.Text = My.Language.strMenuNotifications
+        mMenViewScreenshotManager.Text = My.Language.strMenuScreenshotManager
+        mMenViewJumpTo.Text = My.Language.strMenuJumpTo
+        mMenViewJumpToConnectionsConfig.Text = My.Language.strMenuConnectionsAndConfig
+        mMenViewJumpToSessionsScreenshots.Text = My.Language.strMenuSessionsAndScreenshots
+        mMenViewJumpToErrorsInfos.Text = My.Language.strMenuNotifications
+        mMenViewResetLayout.Text = My.Language.strMenuResetLayout
+        mMenViewQuickConnectToolbar.Text = My.Language.strMenuQuickConnectToolbar
+        mMenViewExtAppsToolbar.Text = My.Language.strMenuExternalToolsToolbar
+        mMenViewFullscreen.Text = My.Language.strMenuFullScreen
+
+        mMenTools.Text = My.Language.strMenuTools
+        mMenToolsSSHTransfer.Text = My.Language.strMenuSSHFileTransfer
+        mMenToolsExternalApps.Text = My.Language.strMenuExternalTools
+        mMenToolsPortScan.Text = My.Language.strMenuPortScan
+        mMenToolsComponentsCheck.Text = My.Language.strComponentsCheck
+        mMenToolsUpdate.Text = My.Language.strMenuCheckForUpdates
+        mMenToolsOptions.Text = My.Language.strMenuOptions
+
+        mMenInfo.Text = My.Language.strMenuHelp
+        mMenInfoHelp.Text = My.Language.strMenuHelpContents
+        mMenInfoForum.Text = My.Language.strMenuSupportForum
+        mMenInfoBugReport.Text = My.Language.strMenuReportBug
+        mMenInfoDonate.Text = My.Language.strMenuDonate
+        mMenInfoWebsite.Text = My.Language.strMenuWebsite
+        mMenInfoAbout.Text = My.Language.strMenuAbout
+        mMenInfoAnnouncements.Text = My.Language.strMenuAnnouncements
+
+        lblQuickConnect.Text = My.Language.strLabelConnect
+        btnQuickyPlay.Text = My.Language.strMenuConnect
+        mMenQuickyCon.Text = My.Language.strMenuConnections
+
+        cMenToolbarShowText.Text = My.Language.strMenuShowText
+
+        ToolStripButton1.Text = My.Language.strConnect
+        ToolStripButton2.Text = My.Language.strScreenshot
+        ToolStripButton3.Text = My.Language.strRefresh
+
+        ToolStripSplitButton1.Text = My.Language.strSpecialKeys
+        ToolStripMenuItem1.Text = My.Language.strKeysCtrlAltDel
+        ToolStripMenuItem2.Text = My.Language.strKeysCtrlEsc
     End Sub
 
     Private Sub frmMain_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
-        If My.Settings.ConfirmExit And wL.Count > 0 Then
-            Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.AssemblyName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
-            If cTaskDialog.VerificationChecked Then
-                My.Settings.ConfirmExit = False
-            End If
-            If Result = DialogResult.No Then
-                e.Cancel = True
-                Exit Sub
+        If WindowList IsNot Nothing Then
+            If My.Settings.ConfirmExit And WindowList.Count > 0 Then
+                Dim result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.ProductName, My.Language.strConfirmExitMainInstruction, "", "", "", My.Language.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
         End If
 
-        For Each Window As UI.Window.Base In wL
-            Window.Close()
-        Next
+        Shutdown.BeforeQuit()
 
-        App.Runtime.Shutdown.BeforeQuit()
+        _IsClosing = True
+
+        If WindowList IsNot Nothing Then
+            For Each window As UI.Window.Base In WindowList
+                window.Close()
+            Next
+        End If
 
         Debug.Print("[END] - " & Now)
     End Sub
@@ -148,50 +215,46 @@ Public Class frmMain
     End Sub
 
     Private Sub tmrAutoSave_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tmrAutoSave.Tick
-        mC.AddMessage(Messages.MessageClass.InformationMsg, "Doing AutoSave", True)
+        MessageCollector.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
-        SwitchToolbarText(Not cMenToolbarShowText.Checked)
+        SwitchToolBarText(Not cMenToolbarShowText.Checked)
     End Sub
 
-    Public Sub AddExtAppsToToolbar()
+    Public Sub AddExternalToolsToToolBar()
         Try
-            'clean up
-            tsExtAppsToolbar.Items.Clear()
+            For Each item As ToolStripItem In tsExternalTools.Items
+                item.Dispose()
+            Next
+            tsExternalTools.Items.Clear()
 
-            'add ext apps
-            For Each extA As Tools.ExternalApp In ExtApps
-                Dim nItem As New ToolStripButton
-                nItem.Text = extA.DisplayName
-                nItem.Image = extA.Image
+            Dim button As ToolStripButton
+            For Each tool As Tools.ExternalTool In ExternalTools
+                button = tsExternalTools.Items.Add(tool.DisplayName, tool.Image, AddressOf tsExtAppEntry_Click)
 
                 If cMenToolbarShowText.Checked = True Then
-                    nItem.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
+                    button.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
                 Else
-                    If nItem.Image IsNot Nothing Then
-                        nItem.DisplayStyle = ToolStripItemDisplayStyle.Image
+                    If button.Image IsNot Nothing Then
+                        button.DisplayStyle = ToolStripItemDisplayStyle.Image
                     Else
-                        nItem.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
+                        button.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
                     End If
                 End If
 
-                nItem.Tag = extA
-
-                AddHandler nItem.Click, AddressOf tsExtAppEntry_Click
-
-                tsExtAppsToolbar.Items.Add(nItem)
+                button.Tag = tool
             Next
         Catch ex As Exception
-            mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddExtAppsToToolbar failed (frmMain)" & vbNewLine & ex.Message, True)
+            MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Language.strErrorAddExternalToolsToToolBarFailed, ex.Message), True)
         End Try
     End Sub
 
     Private Sub tsExtAppEntry_Click(ByVal sender As System.Object, ByVal e As System.EventArgs)
-        Dim extA As Tools.ExternalApp = sender.Tag
+        Dim extA As Tools.ExternalTool = sender.Tag
 
         If Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.Connection Then
             extA.Start(Tree.Node.SelectedNode.Tag)
@@ -200,9 +263,9 @@ Public Class frmMain
         End If
     End Sub
 
-    Public Sub SwitchToolbarText(ByVal Show As Boolean)
-        For Each tItem As ToolStripButton In tsExtAppsToolbar.Items
-            If Show = True Then
+    Public Sub SwitchToolBarText(ByVal show As Boolean)
+        For Each tItem As ToolStripButton In tsExternalTools.Items
+            If show = True Then
                 tItem.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
             Else
                 If tItem.Image IsNot Nothing Then
@@ -213,19 +276,71 @@ Public Class frmMain
             End If
         Next
 
-        cMenToolbarShowText.Checked = Show
+        cMenToolbarShowText.Checked = show
     End Sub
 #End Region
 
 #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.Language.strMenuDelete
+                mMenFileRename.Text = My.Language.strMenuRenameFolder
+                mMenFileDuplicate.Text = My.Language.strMenuDuplicate
+            Case Tree.Node.Type.Container
+                mMenFileImportExport.Enabled = True
+                mMenFileDelete.Enabled = True
+                mMenFileRename.Enabled = True
+                mMenFileDuplicate.Enabled = True
+                mMenFileDelete.Text = My.Language.strMenuDeleteFolder
+                mMenFileRename.Text = My.Language.strMenuRenameFolder
+                mMenFileDuplicate.Text = My.Language.strMenuDuplicateFolder
+            Case Tree.Node.Type.Connection
+                mMenFileImportExport.Enabled = False
+                mMenFileDelete.Enabled = True
+                mMenFileRename.Enabled = True
+                mMenFileDuplicate.Enabled = True
+                mMenFileDelete.Text = My.Language.strMenuDeleteConnection
+                mMenFileRename.Text = My.Language.strMenuRenameConnection
+                mMenFileDuplicate.Text = My.Language.strMenuDuplicateConnection
+            Case Else
+                mMenFileImportExport.Enabled = False
+                mMenFileDelete.Enabled = False
+                mMenFileRename.Enabled = False
+                mMenFileDuplicate.Enabled = False
+                mMenFileDelete.Text = My.Language.strMenuDelete
+                mMenFileRename.Text = My.Language.strMenuRename
+                mMenFileDuplicate.Text = My.Language.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)
+        If App.Runtime.IsConnectionsFileLoaded Then
+            Select Case MsgBox(My.Language.strSaveConnectionsFileBeforeOpeningAnother, MsgBoxStyle.YesNoCancel Or MsgBoxStyle.Question)
                 Case MsgBoxResult.Yes
                     App.Runtime.SaveConnections()
                 Case MsgBoxResult.Cancel
@@ -241,12 +356,27 @@ Public Class frmMain
     End Sub
 
     Private Sub mMenFileSaveAs_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenFileSaveAs.Click
-        App.Runtime.Windows.Show(UI.Window.Type.SaveAs)
+        SaveConnectionsAs()
     End Sub
 
     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"
@@ -257,17 +387,23 @@ Public Class frmMain
         Me.mMenViewSessions.Checked = Not Windows.sessionsForm.IsHidden
         Me.mMenViewScreenshotManager.Checked = Not Windows.screenshotForm.IsHidden
 
-        Me.mMenViewExtAppsToolbar.Checked = tsExtAppsToolbar.Visible
+        Me.mMenViewExtAppsToolbar.Checked = tsExternalTools.Visible
         Me.mMenViewQuickConnectToolbar.Checked = tsQuickConnect.Visible
 
         Me.mMenViewConnectionPanels.DropDownItems.Clear()
 
-        For i As Integer = 0 To wL.Count - 1
-            Dim tItem As New ToolStripMenuItem(wL(i).Text, wL(i).Icon.ToBitmap, AddressOf ConnectionPanelMenuItem_Click)
-            tItem.Tag = wL(i)
+        For i As Integer = 0 To WindowList.Count - 1
+            Dim tItem As New ToolStripMenuItem(WindowList(i).Text, WindowList(i).Icon.ToBitmap, AddressOf ConnectionPanelMenuItem_Click)
+            tItem.Tag = WindowList(i)
 
             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)
@@ -346,7 +482,7 @@ Public Class frmMain
     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
+        If MsgBox(My.Language.strConfirmResetLayout, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
             App.Runtime.Startup.SetDefaultLayout()
         End If
     End Sub
@@ -357,10 +493,10 @@ Public Class frmMain
 
     Private Sub mMenViewExtAppsToolbar_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewExtAppsToolbar.Click
         If mMenViewExtAppsToolbar.Checked = False Then
-            tsExtAppsToolbar.Visible = True
+            tsExternalTools.Visible = True
             mMenViewExtAppsToolbar.Checked = True
         Else
-            tsExtAppsToolbar.Visible = False
+            tsExternalTools.Visible = False
             mMenViewExtAppsToolbar.Checked = False
         End If
     End Sub
@@ -429,7 +565,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
@@ -438,29 +574,29 @@ Public Class frmMain
                 End If
             Next
         Catch ex As Exception
-            mC.AddMessage(Messages.MessageClass.ErrorMsg, "CreateButtons (frmMain) failed" & vbNewLine & ex.Message, True)
+            MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "CreateButtons (frmMain) failed" & vbNewLine & ex.Message, True)
         End Try
     End Sub
 
     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)
+            MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "QuickyProtocolButton_Click (frmMain) failed" & vbNewLine & ex.Message, True)
         End Try
     End Sub
 
@@ -551,13 +687,13 @@ Public Class frmMain
                 AddHandler tMenItem.MouseDown, AddressOf ConMenItem_MouseDown
             Next
         Catch ex As Exception
-            mC.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True)
+            MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "AddNodeToMenu failed" & vbNewLine & ex.Message, True)
         End Try
     End Sub
 
     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
@@ -568,37 +704,65 @@ Public Class frmMain
     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
-                If App.Runtime.SysTrayIcon Is Nothing Then
-                    App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon()
+                If App.Runtime.NotificationAreaIcon Is Nothing Then
+                    App.Runtime.NotificationAreaIcon = New Tools.Controls.NotificationAreaIcon()
                 End If
                 Me.Hide()
             End If
         Else
-            prevWindowsState = Me.WindowState
+            PreviousWindowState = Me.WindowState
         End If
     End Sub
 
-    Private bWmGetTextFlag As Boolean = False
-    Private bWmWindowPosChangedFlag As Boolean = False
+    Private _inMouseActivate As Boolean = False
+    Private _inSizeMove As Boolean = False
 
     Protected Overloads Overrides Sub WndProc(ByRef m As Message)
         Try
+#If Config = "Debug" Then
             'Debug.Print(m.Msg)
+#End If
 
-            Select m.Msg
-                Case WM_GETTEXT
-                    bWmGetTextFlag = True
-                Case WM_WINDOWPOSCHANGED
-                    If bWmGetTextFlag Then
-                        ActivateConnection()
-                    End If
-
-                    bWmGetTextFlag = False
-                    bWmWindowPosChangedFlag = True
+            Select Case m.Msg
+                Case WM_MOUSEACTIVATE
+                    _inMouseActivate = True
                 Case WM_ACTIVATEAPP
-                    If bWmWindowPosChangedFlag Then
-                        ActivateConnection()
+                    _inMouseActivate = False
+                Case WM_ACTIVATE
+                    ' Ingore this message if it wasn't triggered by a click
+                    If Not LOWORD(m.WParam) = WA_CLICKACTIVE Then Exit Select
+
+                    Dim control As Control = FromChildHandle(WindowFromPoint(MousePosition))
+                    If Not IsNothing(control) Then
+                        ' Let ComboBoxes get focus but don't simulate a mouse event
+                        If TypeOf control Is ComboBox Then Exit Select
+
+                        If control.CanSelect Or TypeOf control Is MenuStrip Or TypeOf control Is ToolStrip Or TypeOf control Is Magic.Controls.InertButton Then
+                            ' Simulate a mouse event since one wasn't generated by Windows
+                            Dim clientMousePosition As Point = control.PointToClient(MousePosition)
+                            SendMessage(control.Handle, WM_LBUTTONDOWN, MK_LBUTTON, MAKELPARAM(clientMousePosition.X, clientMousePosition.Y))
+
+                            control.Focus()
+                            Exit Select
+                        End If
                     End If
+
+                    ' This handles activations from clicks that did not start a size/move operation
+                    ActivateConnection()
+                Case WM_ENTERSIZEMOVE
+                    _inSizeMove = True
+                Case WM_EXITSIZEMOVE
+                    _inSizeMove = False
+
+                    ' This handles activations from clicks that started a size/move operation
+                    ActivateConnection()
+                Case WM_WINDOWPOSCHANGED
+                    ' Ignore this message if the window wasn't activated
+                    Dim windowPos As WINDOWPOS = Marshal.PtrToStructure(m.LParam, GetType(WINDOWPOS))
+                    If (Not (windowPos.flags And SWP_NOACTIVATE) = 0) Then Exit Select
+
+                    ' This handles all other activations
+                    If Not _inMouseActivate And Not _inSizeMove Then ActivateConnection()
                 Case WM_SYSCOMMAND
                     For i As Integer = 0 To SysMenSubItems.Length - 1
                         If SysMenSubItems(i) = m.WParam Then
@@ -606,9 +770,13 @@ Public Class frmMain
                             Exit For
                         End If
                     Next
-                Case Else
-                    bWmGetTextFlag = False
-                    bWmWindowPosChangedFlag = False
+                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
             End Select
         Catch ex As Exception
         End Try
@@ -631,6 +799,32 @@ Public Class frmMain
     Private Sub pnlDock_ActiveDocumentChanged(ByVal sender As Object, ByVal e As System.EventArgs) Handles pnlDock.ActiveDocumentChanged
         ActivateConnection()
     End Sub
+
+    Public Sub ShowHidePanelTabs(Optional closingDocument As DockContent = Nothing)
+        Dim newDocumentStyle As DocumentStyle = pnlDock.DocumentStyle
+
+        If My.Settings.AlwaysShowPanelTabs Then
+            newDocumentStyle = DocumentStyle.DockingWindow ' Show the panel tabs
+        Else
+            Dim nonConnectionPanelCount As Integer = 0
+            For Each document As DockContent In pnlDock.Documents
+                If (closingDocument Is Nothing OrElse document IsNot closingDocument) And Not TypeOf document Is UI.Window.Connection Then
+                    nonConnectionPanelCount = nonConnectionPanelCount + 1
+                End If
+            Next
+
+            If nonConnectionPanelCount = 0 Then
+                newDocumentStyle = DocumentStyle.DockingSdi ' Hide the panel tabs
+            Else
+                newDocumentStyle = DocumentStyle.DockingWindow ' Show the panel tabs
+            End If
+        End If
+
+        If Not pnlDock.DocumentStyle = newDocumentStyle Then
+            pnlDock.DocumentStyle = newDocumentStyle
+            pnlDock.Size = New Size(1, 1)
+        End If
+    End Sub
 #End Region
 
 #Region "Screen Stuff"
@@ -640,21 +834,21 @@ Public Class frmMain
     End Sub
 
     Private SysMenSubItems(50) As Integer
-    Private Sub ResetSysMenuItems()
-        SysMenu.Reset()
+    Private Shared Sub ResetSysMenuItems()
+        SystemMenu.Reset()
     End Sub
 
     Private Sub AddSysMenuItems()
-        SysMenu = New Tools.SystemMenu(Me.Handle)
-        Dim popMen As IntPtr = SysMenu.CreatePopupMenuItem()
+        SystemMenu = New Tools.SystemMenu(Me.Handle)
+        Dim popMen As IntPtr = SystemMenu.CreatePopupMenuItem()
 
         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)
+            SystemMenu.AppendMenuItem(popMen, Tools.SystemMenu.Flags.MF_STRING, SysMenSubItems(i), My.Language.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, 1, Tools.SystemMenu.Flags.MF_BYPOSITION Or Tools.SystemMenu.Flags.MF_SEPARATOR, IntPtr.Zero, Nothing)
+        SystemMenu.InsertMenuItem(SystemMenu.SystemMenuHandle, 0, Tools.SystemMenu.Flags.MF_POPUP Or Tools.SystemMenu.Flags.MF_BYPOSITION, popMen, My.Language.strSendTo)
+        SystemMenu.InsertMenuItem(SystemMenu.SystemMenuHandle, 1, Tools.SystemMenu.Flags.MF_BYPOSITION Or Tools.SystemMenu.Flags.MF_SEPARATOR, IntPtr.Zero, Nothing)
     End Sub
 #End Region
 End Class

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
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
+        IgAAAk1TRnQBSQFMAgEBBwEAARABAQEQAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIB4AAeIB7wH0Af8BqAHJAdcB/wFvAaQBtgH/AVIBhgGcAf8BPQFkAYoB/wE4
+        AV8BhwH/ATgBaQGVAf8BSwGOAasB/wGPAbcBzQH/Ad0B6gHxAf8MAANXAbcDnwH/A5oB/wOWAf8DkQH/
+        A40B/wOJAf8DhAH/A4AB/wNaAf8DVgH/A1IB/wNPAf8DSwH/A0gB/wNXAbcYAAMNARIDVgG2A1YBtgMN
+        ARFgAAGtAc8B3wH/AUoBkQGtAf8BTwGjAb8B/wFrAcAB1AH/AZUB2QHmAf8BgQHbAfAB/wFDAcYB7AH/
+        ARcBqgHdAf8BCQGSAccB/wEVAYABrAH/ASwBZAGSAf8BnQG/AdEB/wgAA6gB/wPpAf8D0wH/A9IB/wPR
+        Af8D0AH/A84B/wPNAf8DzQH/A8sB/wPLAf8DygH/A8kB/wPIAf8D4gH/A0gB/xgAA14B2QPkAf8D4wH/
+        A1gBwWAAAU0BhAGbAf8BNwG9AecB/wFaAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUMBygHw
+        Af8BEQG2Ae0B/wEAAacB6AH/AQABoQHhAf8BAAGWAdIB/wEwAVEBbQH/CAADrQH/A9YB/wO6Af8DuAH/
+        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DTAH/CAADCwEPA1QBrQM6
+        AWEDPwFuA3MB+AHiAeEB3wH/AeEB4AHfAf8DXwHzAzwBZwM8AWYDUwGtAwsBD1AAAVABhwGeAf8BNgHE
+        AfAB/wFcAdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUMBygHwAf8BEQG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wExAVIBbwH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOw
+        Af8DrwH/A60B/wOrAf8DqQH/A6gB/wPKAf8DUAH/CAADWgHFBP8CnAGbAf4CmwGaAf4C5wHmAf8B1gHV
+        AdMB/wHXAdYB1AH/AeMB4gHgAf8BkAGPAY0B/gKpAagB/QHpAegB5gH/A1gBwVAAAVIBiQGgAf8BNgHE
+        Ae8B/wFbAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/AUQBygHwAf8BEQG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wEzAVUBcQH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0
+        Af8DsgH/A7AB/wOtAf8DrAH/A6wB/wPPAf8DVAH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/
+        AckByAHGAf8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeVQAAFUAYwBogH/
+        ATgBxgHwAf8BXQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wFEAcoB8AH/AREBtgHtAf8BAAGo
+        AegB/wEAAaIB4gH/AQABmwHbAf8BNQFYAYAB/wgAA1oBvQPaAf8DyAH/A8AB/wO/Af8DvQH/A7oB/wO4
+        Af8DtwH/A7UB/wOzAf8DsAH/A68B/wOzAf8DwgH/A1oBvQgAA04BlQH2AfUB9AH/AeYB5QHkAf8BvwG+
+        Ab0B/wLrAeoB/wHUAdMB0gH/AdYB1QHUAf8B4gLhAf8CtAGzAf8B1wHWAdQB/wHiAeEB3wH/A0oBjVAA
+        AVcBjwGlAf8BOQHGAfAB/wFdAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUMBygHwAf8BEQG2
+        Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wE3AVsBgwH/CAADWgG9A+MB/wPnAf8D4QH/A+AB/wPg
+        Af8D3wH/A98B/wPeAf8D3QH/A90B/wPcAf8D2wH/A+AB/wPQAf8DWgG9AwsBDwNVAbUDZAHnAeQB4wHi
+        Af8B0QHQAc8B/wLwAe8B/wOuAf8DZAHxA2cB8gKsAasB/wLoAecB/wLLAcoB/wHgAd8B3QH/A2EB5ANV
+        AbUDCwEPSAABWAGSAagB/wE5AcUB8AH/AV4B1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0Af8BQwHK
+        AfAB/wERAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/ATkBXgGGAf8IAAMpAT8DzgH/A+wB/wPe
+        Af8D2AH/A9IB/wPMAf8DyAH/A8cB/wPIAf8DywH/A9AB/wPdAf8D6AH/A6QB/wMrAUIDPwFtAuQB4wH/
+        AdgB1gHVAf8B0gHRAdAB/wHFAcQBwwH/Ae0B7AHrAf8DVwG6CAADXAHNAegB5wHmAf8BtgG1AbQB/wHW
+        AdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmSAABWwGVAasB/wE5AcUB8AH/AV4B1AHyAf8BjQHjAfQB/wGi
+        AesB9gH/AYMB3wH0Af8BRAHLAfAB/wERAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/ATwBYQGI
+        Af8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wFCAa0BRgH/AVQBqgFCAf8BTgGvAUYB/wE0AaUBQAH/
+        AawBxQGsAf8DwgH/A9EB/wPTAf8DWgG9BAADQgF2AewB6wHoAf8B2gHZAdcB/wHUAdMB0QH/AcYBxQHE
+        Af8B3gLcAf8DRgF+CAADUAGaAd0B3AHbAf8ByAHGAcUB/wLiAeEB/wLhAd8B/wHuAe0B7AH/Az8Bb0gA
+        AV0BmAGuAf8BOQHFAfAB/wFeAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUQBygHwAf8BEQG2
+        Ae0B/wEAAagB6QH/AQABoQHhAf8BAAGcAdoB/wE+AWMBigH/DAADKQE/A9EB/wPzAf8BxwHeAcoB/wFC
+        AckBhQH/AbMB3AGkAf8B5wHHAVoB/wHcAb8BUQH/AVQBzAGPAf8BLQGtAUYB/wG4AdABuAH/A/EB/wOv
+        Af8DKwFCBAADLwFKA2AB6wN6AfwB3gHdAdwB/wHLAsoB/wHmAuUB/wNhAeEDMgFQAzgBXANgAesC7gHs
+        Af8BzALLAf8B5wHmAeUB/wN6AfwDYAHrAywBQ0gAAWABmwGwAf8BOAHGAfAB/wFeAdQB8gH/AY0B4wH0
+        Af8BogHrAfYB/wGDAd8B9AH/AUQBygHwAf8BEQG2Ae0B/wEAAagB6AH/AQABoQHhAf8BAAGcAdoB/wFB
+        AWcBjgH/EAADWgG9A8QB/wFUAc4BiwH/AZkB5AGrAf8BsAHFATsB/wHqAbUBJgH/AeEBogEXAf8BpQGd
+        AR4B/wGCAcUBjwH/AScBmgE0Af8DoAH/A1oBvRAAA14BzgHhAeAB3gH/AdkB1wHWAf8BuAK3Af8B4QHg
+        Ad8B/wOoAf0DqQH9AvYB9QH/AsABvwH/AeoB6QHoAf8C8wHyAf8DXAHJUAABYwGfAbMB/wE4AcYB8AH/
+        AVwB1AHxAf8BjAHjAfQB/wGiAesB9gH/AYMB3wH0Af8BRAHKAfAB/wERAbYB7QH/AQABpwHoAf8BAAGh
+        AeEB/wEAAZsB2gH/AUMBagGQAf8YAAFgAXwBawH8AaIB6QGVAf8B1gHPAUcB/wHiAbMBJQH/AdEBuwEt
+        Af8BwgGuASAB/wGCAb0BSgH/ASsBcQFWAfwYAANMAZEB4wHiAeAB/wLeAdwB/wHhAeAB3wH/AcwCywH/
+        AcQBwwHCAf8CzwHOAf8C3gHdAf8C8AHvAf8C8AHvAf8C9gH1Af8DSAGHUAABZAGhAbUB/wFeAdUB9AH/
+        AZoB6AH3Af8BtQHzAfoB/wHCAfgB/AH/AcMB+AH9Af8BwQH3Af0B/wGvAfAB+wH/AY8B4gH3Af8BXQHQ
+        AfAB/wExAbgB5QH/AUYBbQGTAf8YAAFiAXwBbAH8AaIB8AGfAf8B2AHtAa8B/wHeAcUBRgH/AbQB4gFD
+        Af8BPgHnARcB/wFJAdcBSQH/ATABcwFdAfwUAAMBAQIDXwHjAeUB5AHhAf8C7gHtAf8C7gHtAf8C6wHq
+        Af8B4wHiAeEB/wLoAecB/wLqAekB/wLzAfIB/wL1AfQB/wH6AfkB+AH/A1wB31AAAWcBowG4Af8BxQH5
+        Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/
+        AcUB+QH9Af8BxQH5Af0B/wFIAXABlQH/GAADYQHcAcgB9wHUAf8B2AH2AcoB/wHnAeMBqQH/AdsBzwFK
+        Af8BrwHcAUYB/wGdAeoBqwH/A18B4BgAA0ABbwN/Af4DZAHnA18B8wHoAecB5gH/AecB5gHlAf8C7QHs
+        Af8C+wH6Af8DZwHyA2QB5wN/Af4DPQFoUAABtwHXAeEB/wGMAb0BzAH/AZ0BzwHbAf8BrQHfAegB/wG5
+        AewB8wH/AcIB9QH6Af8BwgH1AfoB/wG4AesB8QH/AakB2gHjAf8BlAHEAdEB/wFuAagBuAH/AakBxQHR
+        Af8YAAMtAUUBXQF4AW8B+gHbAfgB6QH/AecB8gHYAf8B7QHlAbMB/wHfAdkBpgH/AV8BhwFfAfsDMgFQ
+        IAADDwEUAwoBDgNTAaoB7wHuAe0B/wL0AfMB/wNSAaQDCAELAxEBF1gAAv4C/wHjAfEB9AH/AbkB1wHh
+        Af8BlQG+AcwB/wFuAagBuwH/AWEBmwGwAf8BXQGYAa0B/wFmAaEBswH/AYwBsgHCAf8BsQHNAdcB/wHf
+        AesB7wH/A/4B/xwAAy4BRwNeAdkBZgF8AWoB/AFmAXsBZgH8A14B3QMyAVAsAAMvAUoDXQHwA2IB7wMs
+        AUNkAAMRARcDVgGzAVMBVAFTAay0AAMEAQUDEAEVAx8BLQMpAT8DLwFJAy4BSAMoAT0DHgErAw8BFAMD
+        AQQQAAO3Af8BnAGoAZ4B/wEAAVUBMAH/ARoBkgFSAf8BAAFZATAB/wECAUYBoAH/AQABRAGeAf8BAAFB
+        AZsB/wEAAT8BmQH/AQABPQGXAf8BAAE6AZQB/wEAATkBkwH/A0oB/wNKAf8cAANBAXIBTAJfAfMBWQJc
+        Ac8BSwJMAZADIwEzXAADBQEHAx8BLAI+AT0BagJSAVABowFbAlkBxAFdAloB0wFdAloB0wFbAlkBwwFS
+        AlEBoQM8AWYDHAEoAwQBBgwAAxUBHQNRAaIBHwGVAVYB/wGCAb4BqgH/AS4BpQGCAf8BDwGXAUgB/wES
+        AZkBTQH/ARYBmQFRAf8BGgGdAVYB/wFUAaoB0gH/AVIBqAHRAf8BAAE7AZUB/yAAAyEBMAErATQBagH8
+        AYYBrQHhAf8BXAGoAdwB/wE9AZIByQH/AQ4BUAGrAf8BVQJWAbEDHwEtUwABAQMSARgDPgFrAV0CWQHX
+        AVgCKwH8AawBKwECAf8B4QFLAR8B/wHkAV0BMwH/AdMBSQEXAf8BowFAATgB/QFhAl4B2gI+AT0BagMP
+        ARQIAAMYASIBUAFSAVABpANWAbMBSwGsAZ8B/wFSAbcBngH/AVwBuwGsAf8BXAG7Aa4B/wFdAbsBsAH/
+        AYABvAGzAf8BFQGaAVkB/wEyAZUBxwH/AVUBqwHTAf8BAAE+AZgB/yAAAVQCVgGrAUsBnQHRAf8BmQG8
+        AesB/wFPAaAB4wH/AZYBuQHqAf8BlAG4AeoB/wE+AZMBygH/AisBZgH8A0MBeFAAAxsBJgNZAdIBGwEF
+        AQAB/wGKAToBIgH/AcoBhgFEAf8B9gG8AZwB/wH5AcwBtwH/AeMBoAFWAf8BsQFVATsB/wFXATEBEgH/
+        AV4CWAHdAxwBKAgAAVUBVgFVAbEDVgGzA1YBswE6AaQBkQH/AU0BtgGbAf8BRgGyAZsB/wFIAbIBngH/
+        AUoBswGhAf8BhQG/AbYB/wEcAZ4BggH/ATcBmQHJAf8BWQGtAdQB/wEAAUIBnAH/HAADHwEtASsBSQFu
+        AfwBnQG/AewB/wFHAZwB4gH/ATkBkwHfAf8BNgGRAd8B/wE9AZQB4AH/AZUBuAHqAf8BhgGtAeEB/wEn
+        AYMBuwH/AUsCTAGQBAADnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOd
+        Af8DnQH/A50B/wOdAf8DnQH/CAABUwJPAaUBMgEXAQAB/wFXAUIBLQH/AY8BVAE/Af8BrAGIAUkB/wHC
+        AaMBiAH/AcEBpQGOAf8BswGYAYEB/wGRAVQBPgH/AVIBOQEkAf8BQQEaAQAB/wFWAlUBsQgAAwgBCwNV
+        AbIDVgGzAVQBsgGoAf8BWwG9AacB/wGHAcEBtQH/AYYBwQG2Af8BhwHBAbcB/wGIAcEBuQH/ASIBogGI
+        Af8BPAGcAcsB/wFdAbAB1QH/AQEBRQGfAf8QAAMrAUIDSAGEAVUCVwG3AUwCXwHzAVQBpAHXAf8BoQHC
+        Ae0B/wGfAcAB7QH/AZ0BvwHtAf8BUgGjAeQB/wE4AZIB3wH/ATYBkAHeAf8BWQGnAeYB/wGSAbYB6AH/
+        ASEBXQG3Af8DNwFaA50B/wG6Ar0B/wHmAuwB/wHmAu0B/wHnAu0B/wHoAu4B/wHpAu8B/wHpAu8B/wHq
+        Au8B/wHqAvAB/wHrAvAB/wHrAvEB/wHsAvEB/wHsAvEB/wG9Ar8B/wOdAf8EAAM5AV8BUwEzARgB/wHD
+        AbEBogH/AbYBnAGDAf8BpgFXASoB/wGoAVUBJwH/AcMBpAGHAf8B2AHGAbAB/wG9AakBiwH/AV0BPQEd
+        Af8BOgEaAQAB/wEwAQwBAAH/ATcBEAEAAf8DMwFTCAADBgEIA1UBsgEtAaABigH/AZMByQG6Af8BPQGv
+        AZcB/wEiAaIBgwH/ASMBowGHAf8BJQGkAYsB/wEkAaoBkgH/ATIBwgHtAf8BgQG0AdcB/wEGAUkBowH/
+        DAADTAGTAUIBlwHPAf8BWQGoAdkB/wGNAbQB4gH/AaMBxAHtAf8BpwHHAe4B/wFCAZcBzQH/ARIBUwGy
+        Af8BPQGTAckB/wGfAcAB7QH/AVYBlgGjAf8BngGWASYB/wFaAZQBkQH/AY0BswHpAf8BVwGlAdgB/wFa
+        Al4B2AQAA1wB6gHbAuIB/wHNAs8B/wPLAf8DzAH/A84B/wPPAf8D0AH/A9IB/wPTAf8D1QH/AdcC2AH/
+        AecC7AH/A20B9wQAAyIBMQFWAlUBsQFFARkBAAH/AaoBhQE9Af8BsgFQAQ4B/wGtAS0BAAH/AboBSgEC
+        Af8B6gHVAb8B/wH9AfwB+gH/AdYBvgGmAf8BkAE9AQoB/wFAAQ4BAAH/AUEBHgEAAf8BOgEaAQAB/wNX
+        AcUDHAEnCAADBAEGARMBlAFVAf8BTAG5AZ4B/wEnAaYBiQH/AVcBsQHVAf8BUwGtAdQB/wFPAasB0gH/
+        AT0BugHkAf8BAAGZAUcB/wEFAY4BNgH/AQgBTgGaAf8MAAFIAmIB9gGuAc0B8AH/AbABzwHwAf8BmAG/
+        AewB/wFcAa4B5wH/AaoBygHvAf8BGwFZAbgB/wQAARMBVAGzAf8BogHDAe0B/wGoAZcBDwH/AcQBtQE4
+        Af8BrAGXAQQB/wE5AZMB3wH/AZgBuwHrAf8BAAFCAZ8B/wQAA1wB6gHZAuEB/wHLAswB/wPHAf8DyAH/
+        A8oB/wPLAf8DzQH/A84B/wPQAf8D0QH/AdMC1AH/AeUC6wH/A20B9wQAAy4BRwNZAewBQAEOAQAB/wGZ
+        AS0BAAH/AbgBRQEAAf8BwgFBAQAB/wHJAVMBAQH/AeYBvwGUAf8B7AHUAbYB/wHNAZwBQAH/AagBSgEK
+        Af8BmQFLAR8B/wGjAYwBUAH/AV0BRAEtAf8CUQE/AfcBNQI0AVUMAAE2AY4BxAH/ATABrAGLAf8BLQGq
+        AY8B/wFcAbUB2AH/AVgBsgHWAf8BVQGvAdUB/wFRAawB0wH/AQIBkAFAAf8BNwGoAYQB/wEAAVYBMQH/
+        AxQBGwgAAVoCYAHeAagByQHtAf8BhAGnAe0B/wE2AUgB7QH/AUgBjgHpAf8BrQHNAfAB/wFLAZ0B0gH/
+        ARwBWgG5Af8BRQGZAc4B/wGlAcUB7gH/AZUBmgFHAf8BrQGXAQQB/wGdAZcBKwH/AUQBmwHiAf8BmAG7
+        AeoB/wFIAmIB9gQAA1wB6gHXAt8B/wHHAskB/wPCAf8DxAH/A8UB/wPIAf8DyQH/A8oB/wPMAf8DzQH/
+        AdAC0QH/AeMC6gH/A20B9wQAAzkBXwJAASUB/QFSARkBAAH/Aa4BNwEAAf8BwAE/AQAB/wHnAZYBJAH/
+        AegBsgFYAf8B5AGxAVgB/wHSAYkBFwH/Ab0BRAEAAf8BqAEyAQAB/wG4AY0BOwH/AdQBwwGyAf8BmAGE
+        AUwB/wE5ARsBAAH/AT4CPQFqDAABPAGRAckB/wGkAcwB5AH/AYcBuwHbAf8BHQGhAVgB/wEXAZwBUgH/
+        ARIBmgFOAf8BDQGWAUgB/wEpAaMBgQH/AYQBwAGrAf8BIAGWAVcB/wNRAaIDFQEdBAADUQGcAZIBuQHl
+        Af8BTAFSAfYB/wGBAYQB9QH/Ah4B8AH/AZABuwHrAf8BrgHNAfAB/wGsAcwB8AH/AaoBygHwAf8BhQGy
+        AekB/wE8AakBwQH/ASIBswGNAf8BNAGoAbYB/wFOAaEB5AH/AZcBugHoAf8DXQHtBAADXAHqAdYC3wH/
+        AcMCxQH/A8AB/wPAAf8DwgH/A8MB/wPEAf8DxQH/A8gB/wPJAf8DzQH/AeAC6AH/A20B9wQAAzcBWgJN
+        ASgB+gGDASQBAAH/AcsBTgEAAf8B5QGLARsB/wH+AbYBUAL/AeMBwgH/AfQBvAGFAf8B1gFVAQcB/wHF
+        AUwBAAH/AboBQQEAAf8BrwFVARcB/wGuAYgBOwH/AZQBVAE7Af8BOgEcAQAB/wM8AWYMAAFBAZUBzQH/
+        AagBzwHlAf8BjAG/Ad0B/wEjAaUBgQH/AY0BxQG4Af8BiQHDAbQB/wGGAcEBsQH/AYQBvwGvAf8BVQG5
+        AZ8B/wFMAa0BoAH/A1YBswFQAVIBUAGkAxgBIgMjATMBKwFjAXkB/AGSAaQB9QH/ATcBOAH2Af8BLwGG
+        AfQB/wEZAaYB+wH/AToBqwHyAf8BXAGvAecB/wFZAa0B5wH/AVYBqgHmAf8BHQG2AYAB/wE+AcgBlwH/
+        ARkBtwFYAf8BWwGsAecB/wGPAbUB4wH/AVoCXgHVBAADYAHWAccCzQH/AdsC5AH/AdsC5AH/AdsC5QH/
+        AdwC5QH/AdwC5QH/Ad0C5gH/Ad0C5gH/Ad4C5wH/Ad8C6AH/AeAC6AH/Ac0C0wH/A18B4wQAAyYBOQFg
+        AloB3gGOASwBAAH/AewBngExAf8B/gG/AYUC/wHMAaEC/wHfAbsB/wH+AcIBXQH/AeIBjgEnAf8B0wGE
+        ARgB/wHKAVcBCgH/AbUBTgEIAf8BlwE/AQUB/wGBATwBFwH/A1kB7AMuAUgMAAFFAZgB0AH/AasB0QHn
+        Af8BkAHCAd8B/wEqAakBiAH/AZEByQG7Af8BVAG6AaUB/wFQAbgBoQH/AUwBtgGeAf8BUAG4AZ0B/wE7
+        AaUBkgH/A1YBswNWAbMBVQFWAVUBsQQAA0kBhwGGAa8B4QH/AbkB1wHzAf8BEAGmAf4B/wFKAb8C/wEJ
+        AaMC/wFEAb4B8AH/ARgBzgH7Af8BOAG+AfEB/wEwAbMBoAH/ARkBtwFXAf8BJQGzAZAB/wGnAcgB7gH/
+        AVUBpQHWAf8BTwJRAZwEAAMsAUMDWwHIA50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wNeAd0DMQFOBAADCQEMA0sBjgHAAUwBCwL/AbwBXQH/AfoBzgGnAf8B+AHbAb4C/wHiAcYC/wG+
+        AYYB/wH0AawBUwH/AewBwgGaAf8B4gG1AYsB/wG4AVMBEQH/AZ0BQgEKAf8BiAFCAR4B/wNPAaUDEAEV
+        DAABSQGbAdMB/wGuAdQB6AH/AasB0wHoAf8BNwGxAZAB/wGbAc4BwAH/AZkBzQG9Af8BlgHLAbsB/wGV
+        AcoBuQH/AYABvwGoAf8BVQGzAakB/wNWAbMDVQGyAwgBCwQAAwQBBgNRAZ8BhQGuAeEB/wE4AbIB+QH/
+        AQkBowL/AR4BqQH7Af8BDgHTAf4B/wFKAeIC/wEJAdUC/wFdAbAB6AH/AVoBrQHnAf8BqQHKAe8B/wGl
+        AcUB7QH/ASsBVQFwAfwDIQEwRAADEwEaAmQBUwHxAdgBngFQAf8B5wHTAcAB/wH8AfUB7gL/AfgB6wL/
+        AeUBwgH/AfYBuQGCAf8B8gHSAbgB/wHuAdIBtgH/AcIBhgEsAf8BpwFUASUB/wJNASkB+gMdASkQAAFM
+        AZ0B1QH/AUoBmwHTAf8BRwGaAdIB/wEnAaEBjAH/ASIBnwGKAf8BHwGdAYUB/wEbAZkBgAH/ATQBpQGS
+        Af8BXQG4AbEB/wEuAaEBiwH/A1UBsgMGAQgQAANCAXUBXwJiAfYBjgG2AeMB/wG5AdcB8wH/ATsB1QH7
+        Af8BCAHVAv8BHwHRAfsB/wGzAdIB8gH/AbEB0AHxAf8BkgG4AeIB/wFAAZUBzAH/A0oBikwAAzUBVwGp
+        AUABEgH/AcoBuAGoBv8B/gH8Av8B9gHiAf8B+wHFAaAB/wHkAbkBlQH/AdsBrAFbAf8BwwGOAToB/wGT
+        AUIBFgH/AT4CPQFqMAABUwJUAawDVgGzA1YBswMEAQYYAAMWAR4DVAGuAVQBowHcAf8BkQG4AeQB/wGo
+        AcoB7AH/AaUBxwHsAf8BjQG1AeIB/wFGAZoB0gH/AVoCXwHbAzEBTlQAAzIBUQJkAVkB7AHQAbIBlQH/
+        AewB4AHZAf8B5gHVAcQB/wHTAbABlAH/AdMBpgFVAf8BywGPATMB/wFnAWUBWQHyAToCOQFgNAABUwJU
+        AawDVgGzAwQBBiQAAysBQgNMAZABWwJdAdIBWQJcAc8DTgGZAy0BRWAAAxEBFwNEAXoCWgFXAcUCZQFe
+        AeUCYQFYAeYCXAFZAckCSAFHAYMDFQEdEAABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEB
+        FgAD/wEAAeABBwIAAfwBPwIAAcABAwIAAfwBPwIAAcABAwIAAcABAwIAAcABAwIAAcABAwIAAcABAwIA
+        AcABAwIAAcABAwIAAcABAwIAAcABAwYAAcABAwIAAQEBgAIAAcABAwGAAgEBgAIAAcABAwGAAQEEAAHA
+        AQMBwAEDAcABAwIAAcABAwHwAQ8BwAEDAgABwAEDAfABDwGAAQMCAAHAAQMB8AEPAcABAwIAAcABAwHw
+        AQ8B8AEPAgABwAEDAfgBHwH8AT8CAAHjBf8B4AEHAYABAQH8AR8C/wHAAQMBgAEHAfgBBwL/AYABAwEA
+        AQcB+AEDAv8BwAEDAQABBwHwAQECAAHAAQMBAAEHAYADAAGAAQEBgAEHAgABgAEBAgABwAEHAQEBAAGA
+        AQECAAHgAQMCAAGAAQECAAHgAQECAAGAAQECAAHgAwABgAEBAgAB4AEAAYABAAGAAQECAAHgAQABgAEA
+        Av8BgAEBAeABAQHgAQEC/wHAAQMB/wHDAfABAwL/AeABBwH/AccB/AEPAv8B8AEPCw==
+</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.Language.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.Language.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.Language.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.Language.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.Language.strTitlePassword
         CType(Me.pbLock, System.ComponentModel.ISupportInitialize).EndInit()
         Me.pnlImage.ResumeLayout(False)
         Me.pnlImage.PerformLayout()

mRemoteV1/Forms/frmPassword.vb

@@ -29,12 +29,12 @@
 
 
 
-    Public Sub New(Optional ByVal UserAndPass As Boolean = False, Optional ByVal Title As String = "Security")
+    Public Sub New(Optional ByVal UserAndPass As Boolean = False, Optional ByVal title As String = "Security")
         ' This call is required by the Windows Form Designer.
         InitializeComponent()
 
         ' Add any initialization after the InitializeComponent() call.
-        Me.Text = Title
+        Me.Text = title
 
         If UserAndPass = True Then
             _UserAndPass = True
@@ -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.Language.strLabelPassword
+        lblVerify.Text = My.Language.strLabelVerify
+        btnOK.Text = My.Language.strButtonOK
+        btnCancel.Text = My.Language.strButtonCancel
+        lblStatus.Text = "Status"
+        Text = My.Language.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

@@ -30,6 +30,7 @@ CREATE TABLE [dbo].[tblCons] (
 	[PuttySession] [varchar] (128) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[Port] [int] NOT NULL ,
 	[ConnectToConsole] [bit] NOT NULL ,
+	[UseCredSsp] [bit] NOT NULL ,
 	[RenderingEngine] [varchar] (10) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
 	[ICAEncryptionStrength] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
 	[RDPAuthenticationLevel] [varchar] (32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL ,
@@ -37,6 +38,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 ,
@@ -72,6 +75,8 @@ CREATE TABLE [dbo].[tblCons] (
 	[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 ,
@@ -87,6 +92,7 @@ CREATE TABLE [dbo].[tblCons] (
 	[InheritRedirectSound] [bit] NOT NULL ,
 	[InheritResolution] [bit] NOT NULL ,
 	[InheritUseConsoleSession] [bit] NOT NULL ,
+	[InheritUseCredSsp] [bit] NOT NULL ,
 	[InheritRenderingEngine] [bit] NOT NULL ,
 	[InheritICAEncryptionStrength] [bit] NOT NULL ,
 	[InheritRDPAuthenticationLevel] [bit] NOT NULL ,

mRemoteV1/Language/Language.Base.vb

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

mRemoteV1/Language/Language.DE.vb

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

mRemoteV1/Language/Language.EN.vb

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

mRemoteV1/Language/Language.en-US.resx

@@ -117,7 +117,25 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="TabController.DrawGrid" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
+  <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="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="strRDP32768Colors" xml:space="preserve">
+    <value>32768 Colors (15-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>
 </root>

mRemoteV1/Language/Language.es-AR.resx

@@ -0,0 +1,390 @@
+<?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 xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <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="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="strActive" xml:space="preserve">
+    <value>Activo</value>
+  </data>
+  <data name="strActivity" xml:space="preserve">
+    <value>Actividad</value>
+  </data>
+  <data name="strButtonDefaultProperties" xml:space="preserve">
+    <value>Propiedades por defecto</value>
+  </data>
+  <data name="strButtonDisconnect" xml:space="preserve">
+    <value>Desconectar</value>
+  </data>
+  <data name="strButtonIcon" xml:space="preserve">
+    <value>Icono</value>
+  </data>
+  <data name="strButtonLaunchPutty" xml:space="preserve">
+    <value>Ejecutar PuTTY</value>
+  </data>
+  <data name="strButtonOK" xml:space="preserve">
+    <value>&amp; OK</value>
+  </data>
+  <data name="strButtonProperties" xml:space="preserve">
+    <value>Propiedades</value>
+  </data>
+  <data name="strButtonScan" xml:space="preserve">
+    <value>&amp; Scanear</value>
+  </data>
+  <data name="strButtonStop" xml:space="preserve">
+    <value>&amp; Parar</value>
+  </data>
+  <data name="strButtonTestProxy" xml:space="preserve">
+    <value>Probar Proxy</value>
+  </data>
+  <data name="strCategoryCredentials" xml:space="preserve">
+    <value>Credenciales</value>
+  </data>
+  <data name="strCategoryMiscellaneous" xml:space="preserve">
+    <value>Varios</value>
+  </data>
+  <data name="strCcAlwaysShowScreen" xml:space="preserve">
+    <value>Siempre mostrar esta pantalla al inicio</value>
+  </data>
+  <data name="strCcNotInstalledProperly" xml:space="preserve">
+    <value>no está correctamente instalado</value>
+  </data>
+  <data name="strCcPuttyOK" xml:space="preserve">
+    <value>El ejecutable de PuTTY se encontró y debería estar listo para usarse.</value>
+  </data>
+  <data name="strCcRDPOK" xml:space="preserve">
+    <value>Todos los componentes RDP se encontraron y parecen estar registrados correctamente. Versión de escritorio remoto {0}</value>
+  </data>
+  <data name="strCcVNCOK" xml:space="preserve">
+    <value>Todos los componentes de VNC se encontraron y parecen estar registrados correctamente.
+VncSharpNG Control {0}</value>
+  </data>
+  <data name="strCheckboxAutomaticReconnect" xml:space="preserve">
+    <value>Intentar reconectar automáticamente cuando se desconecte (solo para RDP &amp;&amp; ICA)</value>
+  </data>
+  <data name="strCheckboxDomain" xml:space="preserve">
+    <value>Dominio</value>
+  </data>
+  <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
+    <value>No mostrar este mensaje de nuevo.</value>
+  </data>
+  <data name="strCheckboxInheritance" xml:space="preserve">
+    <value>Herencia</value>
+  </data>
+  <data name="strCheckboxPassword" xml:space="preserve">
+    <value>Contraseña</value>
+  </data>
+  <data name="strCheckboxProxyAuthentication" xml:space="preserve">
+    <value>Este servidor proxy requiere autenticación</value>
+  </data>
+  <data name="strCheckboxPuttyPath" xml:space="preserve">
+    <value>Usar ruta de Putty personalizada:</value>
+  </data>
+  <data name="strCheckboxReconnectWhenReady" xml:space="preserve">
+    <value>Vuelva a conectarse cuando esté listo</value>
+  </data>
+  <data name="strCheckboxUpdateUseProxy" xml:space="preserve">
+    <value>Usar un servidor proxy para conectarse</value>
+  </data>
+  <data name="strCheckboxUsername" xml:space="preserve">
+    <value>Usuario</value>
+  </data>
+  <data name="strCheckboxWaitForExit" xml:space="preserve">
+    <value>Esperar a Salir</value>
+  </data>
+  <data name="strCheckForUpdate" xml:space="preserve">
+    <value>Pruebe nuevamente</value>
+  </data>
+  <data name="strCheckForUpdatesOnStartup" xml:space="preserve">
+    <value>Comprobar las actualizaciones y anuncios en el inicio</value>
+  </data>
+  <data name="strCheckNow" xml:space="preserve">
+    <value>Compruebe ahora</value>
+  </data>
+  <data name="strCheckProperInstallationOfComponentsAtStartup" xml:space="preserve">
+    <value>Verifique la correcta instalación de los componentes en el inicio</value>
+  </data>
+  <data name="strChoosePanelBeforeConnecting" xml:space="preserve">
+    <value>Elija el panel antes de conectarse</value>
+  </data>
+  <data name="strClosedPorts" xml:space="preserve">
+    <value>Puertos Cerrados</value>
+  </data>
+  <data name="strCollapseAllFolders" xml:space="preserve">
+    <value>Contraer todas las carpetas</value>
+  </data>
+  <data name="strComponentsCheck" xml:space="preserve">
+    <value>Comprobación de componentes</value>
+  </data>
+  <data name="strConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
+    <value>btnIcon_Click falló!</value>
+  </data>
+  <data name="strConfirmCloseConnectionMainInstruction" xml:space="preserve">
+    <value>¿Desea cerrar la conexión, "{0}"?</value>
+  </data>
+  <data name="strConfirmCloseConnectionPanelMainInstruction" xml:space="preserve">
+    <value>¿Está seguro que desea cerrar el panel, "{0}"? Cualquier conexión que contenga el panel también estará cerrada.</value>
+  </data>
+  <data name="strConfirmDeleteNodeFolder" xml:space="preserve">
+    <value>¿Está seguro que desea eliminar la carpeta vacía, "{0}"?</value>
+  </data>
+  <data name="strConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
+    <value>¿Está seguro que desea eliminar la carpeta "{0}"? También se eliminará cualquier carpetas o conexiones que contiene.</value>
+  </data>
+  <data name="strConfirmExit" xml:space="preserve">
+    <value>Confirmar salida si hay conexiones abiertas</value>
+  </data>
+  <data name="strConfirmExitMainInstruction" xml:space="preserve">
+    <value>¿Desea cerrar todas las conexiones abiertas?</value>
+  </data>
+  <data name="strConfirmResetLayout" xml:space="preserve">
+    <value>¿Estás seguro que deseas restablecer los paneles a su diseño predeterminado?</value>
+  </data>
+  <data name="strConnect" xml:space="preserve">
+    <value>Conectar</value>
+  </data>
+  <data name="strConnecting" xml:space="preserve">
+    <value>Conectando...</value>
+  </data>
+  <data name="strConnectionEventConnected" xml:space="preserve">
+    <value>Evento de protocolo conectado</value>
+  </data>
+  <data name="strConnectionEventConnectionFailed" xml:space="preserve">
+    <value>¡Error de conexión!</value>
+  </data>
+  <data name="strConnectionOpenFailed" xml:space="preserve">
+    <value>No se pudo abrir la conexión!</value>
+  </data>
+  <data name="strConnectionOpenFailedNoHostname" xml:space="preserve">
+    <value>No se puede abrir la conexión: ningún nombre de host especificado!</value>
+  </data>
+  <data name="strConnectionRdpErrorDetail" xml:space="preserve">
+    <value>Error de RDP.
+Código de Error: {0} 
+Descripción del Error: {1}</value>
+  </data>
+  <data name="strConnections" xml:space="preserve">
+    <value>Conexiones</value>
+  </data>
+  <data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
+    <value>No se ha podido establecer el puerto predeterminado!</value>
+  </data>
+  <data name="strConnectionsFileBackupFailed" xml:space="preserve">
+    <value>No se pudo crear copia de seguridad del archivo de conexiones!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeImported" xml:space="preserve">
+    <value>No se pudo importar archivo de conexiones!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeLoaded" xml:space="preserve">
+    <value>No se pudo cargar el archivo de conexiones "{0}"!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeSaved" xml:space="preserve">
+    <value>No se pudo guardar el archivo de conexiones!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotSaveAs" xml:space="preserve">
+    <value>No se pudo guardar archivo de conexiones como "{0}"!</value>
+  </data>
+  <data name="strConnectToConsoleSession" xml:space="preserve">
+    <value>Conectar con la sesión de consola</value>
+  </data>
+  <data name="strConnectWithOptions" xml:space="preserve">
+    <value>Conectar (con opciones)</value>
+  </data>
+  <data name="strConnenctionClosedByUser" xml:space="preserve">
+    <value>Conexión a {0} {1} vía cerrada por usuario {2}.</value>
+  </data>
+  <data name="strConnenctionClosedByUserDetail" xml:space="preserve">
+    <value>Conexión a {0} {1} vía cerrada por usuario {2}.  (Descripción: "{3}"; Campo de usuario: "{4}")</value>
+  </data>
+  <data name="strConnenctionCloseEvent" xml:space="preserve">
+    <value>Evento de conexión cerrada</value>
+  </data>
+  <data name="strConnenctionCloseEventFailed" xml:space="preserve">
+    <value>Evento de cerrar conexión falló!</value>
+  </data>
+  <data name="strCouldNotCreateNewConnectionsFile" xml:space="preserve">
+    <value>No se pudo crear el nuevo archivo de conexiones!</value>
+  </data>
+  <data name="strCurrentVersion" xml:space="preserve">
+    <value>Versión instalada</value>
+  </data>
+  <data name="strDetect" xml:space="preserve">
+    <value>Detectar</value>
+  </data>
+  <data name="strDontConnectWhenAuthFails" xml:space="preserve">
+    <value>No conectar si falla la autenticación</value>
+  </data>
+  <data name="strDownloadAndInstall" xml:space="preserve">
+    <value>Descargar e instalar</value>
+  </data>
+  <data name="strDuplicate" xml:space="preserve">
+    <value>Duplicar</value>
+  </data>
+  <data name="strEmptyPasswordContinue" xml:space="preserve">
+    <value>¿Desea continuar sin contraseña?</value>
+  </data>
+  <data name="strEmptyUsernamePasswordDomainFields" xml:space="preserve">
+    <value>Si desea Nombre de usuario, password o dominio vacio use:</value>
+  </data>
+  <data name="strEnc128Bit" xml:space="preserve">
+    <value>128-bit</value>
+  </data>
+  <data name="strEnc128BitLogonOnly" xml:space="preserve">
+    <value>128-bit (iniciar sesión)</value>
+  </data>
+  <data name="strEncBasic" xml:space="preserve">
+    <value>Básica</value>
+  </data>
+  <data name="strEncryptCompleteConnectionFile" xml:space="preserve">
+    <value>Encriptar completamente el archivo de conexiones</value>
+  </data>
+  <data name="strEndIP" xml:space="preserve">
+    <value>Último IP</value>
+  </data>
+  <data name="strEndPort" xml:space="preserve">
+    <value>Último puerto</value>
+  </data>
+  <data name="strErrorAddExternalToolsToToolBarFailed" xml:space="preserve">
+    <value>BarraAgregarHerramientasExternas (frmMain) falló. {0}</value>
+  </data>
+  <data name="strErrorBadDatabaseVersion" xml:space="preserve">
+    <value>La versión de la base de datos {0} no es compatible con esta versión de {1}.</value>
+  </data>
+  <data name="strErrorCloneNodeFailed" xml:space="preserve">
+    <value>ClonarModulo (Tree.Node) falló. {0}</value>
+  </data>
+  <data name="strErrorCode" xml:space="preserve">
+    <value>Código de Error {0}.</value>
+  </data>
+  <data name="strErrorConnectionListSaveFailed" xml:space="preserve">
+    <value>La lista de conexiones no pudo ser guardada.</value>
+  </data>
+  <data name="strErrorDecryptionFailed" xml:space="preserve">
+    <value>La decriptación falló. {0}</value>
+  </data>
+  <data name="strErrorEncryptionFailed" xml:space="preserve">
+    <value>La encriptación falló. {0}</value>
+  </data>
+  <data name="strErrorFipsPolicyIncompatible" xml:space="preserve">
+    <value>La configuración de seguridad de Windows, "criptografía de sistema: usar FIPS algoritmos compatibles para codificación, algoritmos hash y firma", está habilitada. Esta configuración no es compatible con {0}.  Consulte el artículo de soporte técnico de Microsoft en http://support.microsoft.com/kb/811833 para obtener más información.  {0} se cerrará.</value>
+  </data>
+  <data name="strErrors" xml:space="preserve">
+    <value>Errores</value>
+  </data>
+  <data name="strErrorVerifyDatabaseVersionFailed" xml:space="preserve">
+    <value>VerificarVersionBasedeDatos (Config.Connections.Save) falló. {0}</value>
+  </data>
+</root>

mRemoteV1/Language/Language.pl.resx

@@ -0,0 +1,851 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="strAbout" xml:space="preserve">
+    <value>O programie</value>
+  </data>
+  <data name="strAddConnection" xml:space="preserve">
+    <value>Nowe połączenie</value>
+  </data>
+  <data name="strAddFolder" xml:space="preserve">
+    <value>Nowy folder</value>
+  </data>
+  <data name="strAlways" xml:space="preserve">
+    <value>Zawsze</value>
+  </data>
+  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+    <value>Zapytaj mnie znów później</value>
+  </data>
+  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+    <value>Ustawienia automatycznej aktualizacji</value>
+  </data>
+  <data name="strAutoSaveEvery" xml:space="preserve">
+    <value>Automatyczny zapis co:</value>
+  </data>
+  <data name="strAutoSaveMins" xml:space="preserve">
+    <value>Minuty (0 oznacza wyłączony)</value>
+  </data>
+  <data name="strAvailableVersion" xml:space="preserve">
+    <value>Aktualna wersja</value>
+  </data>
+  <data name="strButtonBrowse" xml:space="preserve">
+    <value>&amp;Wybierz...</value>
+  </data>
+  <data name="strButtonCancel" xml:space="preserve">
+    <value>&amp;Anuluj</value>
+  </data>
+  <data name="strButtonChange" xml:space="preserve">
+    <value>Zmiana</value>
+  </data>
+  <data name="strButtonClose" xml:space="preserve">
+    <value>&amp;Zamknij</value>
+  </data>
+  <data name="strButtonDefaultInheritance" xml:space="preserve">
+    <value>Dziedziczenie domyślne</value>
+  </data>
+  <data name="strButtonDefaultProperties" xml:space="preserve">
+    <value>Ustawienia domyślne</value>
+  </data>
+  <data name="strButtonDisconnect" xml:space="preserve">
+    <value>Rozłącz</value>
+  </data>
+  <data name="strButtonIcon" xml:space="preserve">
+    <value>Ikona</value>
+  </data>
+  <data name="strButtonInheritance" xml:space="preserve">
+    <value>Dziedziczenie</value>
+  </data>
+  <data name="strButtonLaunchPutty" xml:space="preserve">
+    <value>Uruchom PuTTY</value>
+  </data>
+  <data name="strButtonNew" xml:space="preserve">
+    <value>&amp;Nowy</value>
+  </data>
+  <data name="strButtonProperties" xml:space="preserve">
+    <value>Ustawienia</value>
+  </data>
+  <data name="strButtonScan" xml:space="preserve">
+    <value>&amp;Skanuj</value>
+  </data>
+  <data name="strCategoryAppearance" xml:space="preserve">
+    <value>Wygląd</value>
+  </data>
+  <data name="strCategoryConnection" xml:space="preserve">
+    <value>Połączenie</value>
+  </data>
+  <data name="strCategoryDisplay" xml:space="preserve">
+    <value>Wyświetl</value>
+  </data>
+  <data name="strCategoryGateway" xml:space="preserve">
+    <value>Brama</value>
+  </data>
+  <data name="strCategoryGeneral" xml:space="preserve">
+    <value>Ogólny</value>
+  </data>
+  <data name="strCategoryProtocol" xml:space="preserve">
+    <value>Protokół</value>
+  </data>
+  <data name="strCcCheckAgain" xml:space="preserve">
+    <value>Odświerz</value>
+  </data>
+  <data name="strCheckboxDomain" xml:space="preserve">
+    <value>Domena</value>
+  </data>
+  <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
+    <value>Nie pokazuj więcej tej informacji.</value>
+  </data>
+  <data name="strCheckboxInheritance" xml:space="preserve">
+    <value>Dziedziczenie</value>
+  </data>
+  <data name="strCheckboxPassword" xml:space="preserve">
+    <value>Hasło</value>
+  </data>
+  <data name="strCheckboxUsername" xml:space="preserve">
+    <value>Użytkownik</value>
+  </data>
+  <data name="strCheckForUpdate" xml:space="preserve">
+    <value>Sprawdź ponownie</value>
+  </data>
+  <data name="strCheckNow" xml:space="preserve">
+    <value>Sprawdź teraz</value>
+  </data>
+  <data name="strChoosePanelBeforeConnecting" xml:space="preserve">
+    <value>Przed połączeniem wybierz panel</value>
+  </data>
+  <data name="strClosedPorts" xml:space="preserve">
+    <value>Porty zamknięte</value>
+  </data>
+  <data name="strCollapseAllFolders" xml:space="preserve">
+    <value>Zwiń wszystkie foldery</value>
+  </data>
+  <data name="strColumnFilename" xml:space="preserve">
+    <value>Nazwa pliku</value>
+  </data>
+  <data name="strColumnMessage" xml:space="preserve">
+    <value>Wiadomość</value>
+  </data>
+  <data name="strColumnUsername" xml:space="preserve">
+    <value>Użytkownik</value>
+  </data>
+  <data name="strConfirmDeleteNodeConnection" xml:space="preserve">
+    <value>Czy jesteś pewien, że chcesz usunąć połączenie, "{0}"?</value>
+  </data>
+  <data name="strConfirmDeleteNodeFolder" xml:space="preserve">
+    <value>Czy jesteś pewien, że chcesz usunąć pusty folder, "{0}"?</value>
+  </data>
+  <data name="strConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
+    <value>Czy jesteś pewien, że chcesz usunąć folder, "{0}"? Wszystkie foldery oraz połączenia które zawiera także zostaną usunięte.</value>
+  </data>
+  <data name="strConfirmExitMainInstruction" xml:space="preserve">
+    <value>Czy chcesz zamknąć wszystkie otwarte połączenia?</value>
+  </data>
+  <data name="strConfirmResetLayout" xml:space="preserve">
+    <value>Czy jesteś pewien, że chcesz powrócić z ustawieniami paneli do ich domyślego wyglądu?</value>
+  </data>
+  <data name="strConnect" xml:space="preserve">
+    <value>Połącz</value>
+  </data>
+  <data name="strConnectInFullscreen" xml:space="preserve">
+    <value>Połącz w trybie pełnego ekranu</value>
+  </data>
+  <data name="strConnecting" xml:space="preserve">
+    <value>Łączenie...</value>
+  </data>
+  <data name="strConnectionRdpErrorDetail" xml:space="preserve">
+    <value>Błąd RDP!
+Kod błędu: {0}
+Opis błędu: {1}</value>
+  </data>
+  <data name="strConnections" xml:space="preserve">
+    <value>Połączenia</value>
+  </data>
+  <data name="strCurrentVersion" xml:space="preserve">
+    <value>Zainstalowana wersja</value>
+  </data>
+  <data name="strDetect" xml:space="preserve">
+    <value>Wykryj</value>
+  </data>
+  <data name="strDownloadAndInstall" xml:space="preserve">
+    <value>Ściągnij i zainstaluj</value>
+  </data>
+  <data name="strDuplicate" xml:space="preserve">
+    <value>Duplikuj</value>
+  </data>
+  <data name="strEndIP" xml:space="preserve">
+    <value>Końcowe IP</value>
+  </data>
+  <data name="strEndPort" xml:space="preserve">
+    <value>Port końcowy</value>
+  </data>
+  <data name="strErrorCode" xml:space="preserve">
+    <value>Kod błędu {0}.</value>
+  </data>
+  <data name="strErrors" xml:space="preserve">
+    <value>Błędy</value>
+  </data>
+  <data name="strExpandAllFolders" xml:space="preserve">
+    <value>Rozwiń wszystkie foldery</value>
+  </data>
+  <data name="strExport" xml:space="preserve">
+    <value>Eksport</value>
+  </data>
+  <data name="strFAMFAMFAMAttribution" xml:space="preserve">
+    <value>Zawiera ikony ze strony [FAMFAMFAM]</value>
+  </data>
+  <data name="strFilterAll" xml:space="preserve">
+    <value>Wszystkie pliki (*.*)</value>
+  </data>
+  <data name="strFilterApplication" xml:space="preserve">
+    <value>Pliki programów (*.exe)</value>
+  </data>
+  <data name="strFiltermRemoteCSV" xml:space="preserve">
+    <value>Pliki CSV mRemote (*.csv)</value>
+  </data>
+  <data name="strFiltermRemoteXML" xml:space="preserve">
+    <value>Pliki XML mRemote (*.xml)</value>
+  </data>
+  <data name="strFilterRDP" xml:space="preserve">
+    <value>Pliki RDP (*.rdp)</value>
+  </data>
+  <data name="strFiltervRD2008CSV" xml:space="preserve">
+    <value>Pliki CSV visionapp Remote Desktop 2008 (*.csv)</value>
+  </data>
+  <data name="strFree" xml:space="preserve">
+    <value>Wolne</value>
+  </data>
+  <data name="strFullscreen" xml:space="preserve">
+    <value>Pełen ekran</value>
+  </data>
+  <data name="strGeneral" xml:space="preserve">
+    <value>Ogólne</value>
+  </data>
+  <data name="strGroupboxAutomaticReconnect" xml:space="preserve">
+    <value>Połącz automatycznie</value>
+  </data>
+  <data name="strGroupboxConnection" xml:space="preserve">
+    <value>Połączenie</value>
+  </data>
+  <data name="strGroupboxFiles" xml:space="preserve">
+    <value>Pliki</value>
+  </data>
+  <data name="strImportAD" xml:space="preserve">
+    <value>Importów z Active Directory</value>
+  </data>
+  <data name="strImportExport" xml:space="preserve">
+    <value>Importuj/Eksportuj</value>
+  </data>
+  <data name="strInactive" xml:space="preserve">
+    <value>Bezczynny</value>
+  </data>
+  <data name="strInformations" xml:space="preserve">
+    <value>Informacje</value>
+  </data>
+  <data name="strInheritNewConnection" xml:space="preserve">
+    <value>mRemoteNG jest w najnowszej wersji</value>
+  </data>
+  <data name="strIntAppConnectionFailed" xml:space="preserve">
+    <value>Połączenie nieudane</value>
+  </data>
+  <data name="strLabelChangeLog" xml:space="preserve">
+    <value>Historia wersji:</value>
+  </data>
+  <data name="strLabelConnect" xml:space="preserve">
+    <value>&amp;Połącz</value>
+  </data>
+  <data name="strLabelDisplayName" xml:space="preserve">
+    <value>Widoczna nazwa</value>
+  </data>
+  <data name="strLabelDomain" xml:space="preserve">
+    <value>Domena:</value>
+  </data>
+  <data name="strLabelFilename" xml:space="preserve">
+    <value>Nazwa pliku:</value>
+  </data>
+  <data name="strLabelOptions" xml:space="preserve">
+    <value>Opcje:</value>
+  </data>
+  <data name="strLabelPassword" xml:space="preserve">
+    <value>Hasło:</value>
+  </data>
+  <data name="strLabelPortableEdition" xml:space="preserve">
+    <value>Wersja przenośna.</value>
+  </data>
+  <data name="strLabelProtocol" xml:space="preserve">
+    <value>Protokół</value>
+  </data>
+  <data name="strLabelReleasedUnderGPL" xml:space="preserve">
+    <value>Wydane na licencji GNU General Public License (GPL)</value>
+  </data>
+  <data name="strLabelServerStatus" xml:space="preserve">
+    <value>Status serwera:</value>
+  </data>
+  <data name="strLabelSQLDatabaseName" xml:space="preserve">
+    <value>Baza danych:</value>
+  </data>
+  <data name="strLabelSQLServerDatabaseName" xml:space="preserve">
+    <value>Baza danych:</value>
+  </data>
+  <data name="strLabelUsername" xml:space="preserve">
+    <value>Użytkownik:</value>
+  </data>
+  <data name="strLabelVerify" xml:space="preserve">
+    <value>Sprawdź:</value>
+  </data>
+  <data name="strLanguage" xml:space="preserve">
+    <value>Język</value>
+  </data>
+  <data name="strLanguageDefault" xml:space="preserve">
+    <value>(Wykryj automatycznie)</value>
+  </data>
+  <data name="strLocalFile" xml:space="preserve">
+    <value>Plik lokalny</value>
+  </data>
+  <data name="strLogOff" xml:space="preserve">
+    <value>Wyloguj</value>
+  </data>
+  <data name="strMagicLibraryAttribution" xml:space="preserve">
+    <value>Program korzysta z bibliotek "Magic library" [Crownwood Software]</value>
+  </data>
+  <data name="strMenuAbout" xml:space="preserve">
+    <value>O programie</value>
+  </data>
+  <data name="strMenuCheckForUpdates" xml:space="preserve">
+    <value>Sprawdź aktualizacje</value>
+  </data>
+  <data name="strMenuConfig" xml:space="preserve">
+    <value>Konfiguracja</value>
+  </data>
+  <data name="strMenuConnect" xml:space="preserve">
+    <value>Połącz</value>
+  </data>
+  <data name="strMenuConnectionPanels" xml:space="preserve">
+    <value>Panele połączeń</value>
+  </data>
+  <data name="strMenuConnections" xml:space="preserve">
+    <value>Połączenia</value>
+  </data>
+  <data name="strMenuConnectionsAndConfig" xml:space="preserve">
+    <value>Połączenia i konfiguracja</value>
+  </data>
+  <data name="strMenuCopy" xml:space="preserve">
+    <value>Kopiuj</value>
+  </data>
+  <data name="strMenuDelete" xml:space="preserve">
+    <value>Usuń...</value>
+  </data>
+  <data name="strMenuDeleteConnection" xml:space="preserve">
+    <value>Usuń połączenie...</value>
+  </data>
+  <data name="strMenuDeleteFolder" xml:space="preserve">
+    <value>Usuń folder...</value>
+  </data>
+  <data name="strMenuDisconnect" xml:space="preserve">
+    <value>Rozłącz</value>
+  </data>
+  <data name="strMenuDonate" xml:space="preserve">
+    <value>Darowizna</value>
+  </data>
+  <data name="strMenuDuplicate" xml:space="preserve">
+    <value>Duplikuj</value>
+  </data>
+  <data name="strMenuDuplicateConnection" xml:space="preserve">
+    <value>Duplikuj połączenie</value>
+  </data>
+  <data name="strMenuDuplicateFolder" xml:space="preserve">
+    <value>Duplikuj folder</value>
+  </data>
+  <data name="strMenuDuplicateTab" xml:space="preserve">
+    <value>Duplikuj zakładkę</value>
+  </data>
+  <data name="strMenuExit" xml:space="preserve">
+    <value>Wyjście</value>
+  </data>
+  <data name="strMenuExternalTools" xml:space="preserve">
+    <value>Narzędzia zewnętrzne</value>
+  </data>
+  <data name="strMenuExternalToolsToolbar" xml:space="preserve">
+    <value>Pasek narzędzi zewnętrznych</value>
+  </data>
+  <data name="strMenuFile" xml:space="preserve">
+    <value>&amp;Plik</value>
+  </data>
+  <data name="strMenuFullScreen" xml:space="preserve">
+    <value>Pełen ekran</value>
+  </data>
+  <data name="strMenuFullScreenRDP" xml:space="preserve">
+    <value>Pełen ekran (RDP)</value>
+  </data>
+  <data name="strMenuHelp" xml:space="preserve">
+    <value>&amp;Pomoc</value>
+  </data>
+  <data name="strMenuHelpContents" xml:space="preserve">
+    <value>Pomoc mRemoteNG</value>
+  </data>
+  <data name="strMenuJumpTo" xml:space="preserve">
+    <value>Idz do</value>
+  </data>
+  <data name="strMenuOptions" xml:space="preserve">
+    <value>Opcje</value>
+  </data>
+  <data name="strMenuPaste" xml:space="preserve">
+    <value>Wklej</value>
+  </data>
+  <data name="strMenuPortScan" xml:space="preserve">
+    <value>Skaner portów</value>
+  </data>
+  <data name="strMenuRename" xml:space="preserve">
+    <value>Zmień nazwę</value>
+  </data>
+  <data name="strMenuRenameConnection" xml:space="preserve">
+    <value>Zmień nazwę połączenia</value>
+  </data>
+  <data name="strMenuRenameFolder" xml:space="preserve">
+    <value>Zmień nazwę folderu</value>
+  </data>
+  <data name="strMenuSaveConnectionFile" xml:space="preserve">
+    <value>Zapisz plik połączeń</value>
+  </data>
+  <data name="strMenuSaveConnectionFileAs" xml:space="preserve">
+    <value>Zapisz plik połączeń jako ...</value>
+  </data>
+  <data name="strMenuScreenshot" xml:space="preserve">
+    <value>Zrzut ekranu</value>
+  </data>
+  <data name="strMenuScreenshotManager" xml:space="preserve">
+    <value>Menager zrzutów ekranów</value>
+  </data>
+  <data name="strMenuSessions" xml:space="preserve">
+    <value>Sesje</value>
+  </data>
+  <data name="strMenuSessionsAndScreenshots" xml:space="preserve">
+    <value>Sesje i zrzuty ekranów</value>
+  </data>
+  <data name="strMenuShowText" xml:space="preserve">
+    <value>Pokarz tekst</value>
+  </data>
+  <data name="strMenuSSHFileTransfer" xml:space="preserve">
+    <value>Transfer plików poprzez SSH</value>
+  </data>
+  <data name="strMenuStartChat" xml:space="preserve">
+    <value>Zacznij Chat (VNC)</value>
+  </data>
+  <data name="strMenuSupportForum" xml:space="preserve">
+    <value>Forum pomocy</value>
+  </data>
+  <data name="strMenuTools" xml:space="preserve">
+    <value>&amp;Narzędzia</value>
+  </data>
+  <data name="strMenuView" xml:space="preserve">
+    <value>&amp;Widok</value>
+  </data>
+  <data name="strMenuWebsite" xml:space="preserve">
+    <value>Strona WWW</value>
+  </data>
+  <data name="strMoveDown" xml:space="preserve">
+    <value>Idź w dół</value>
+  </data>
+  <data name="strMoveUp" xml:space="preserve">
+    <value>Idź w górę</value>
+  </data>
+  <data name="strNever" xml:space="preserve">
+    <value>Nigdy</value>
+  </data>
+  <data name="strNewConnection" xml:space="preserve">
+    <value>Nowe połączenie</value>
+  </data>
+  <data name="strNewFolder" xml:space="preserve">
+    <value>Nowy folder</value>
+  </data>
+  <data name="strNewPanel" xml:space="preserve">
+    <value>Nowy panel</value>
+  </data>
+  <data name="strNewRoot" xml:space="preserve">
+    <value>Nowe drzewo</value>
+  </data>
+  <data name="strNewTitle" xml:space="preserve">
+    <value>Nowy tytuł</value>
+  </data>
+  <data name="strNo" xml:space="preserve">
+    <value>Nie</value>
+  </data>
+  <data name="strNoCompression" xml:space="preserve">
+    <value>Bez kompresji</value>
+  </data>
+  <data name="strNoUpdateAvailable" xml:space="preserve">
+    <value>Brak aktualizacji</value>
+  </data>
+  <data name="strOpenPorts" xml:space="preserve">
+    <value>Porty otwarte</value>
+  </data>
+  <data name="strPanelName" xml:space="preserve">
+    <value>Nazwa panelu</value>
+  </data>
+  <data name="strPropertyDescriptionDomain" xml:space="preserve">
+    <value>Podaj domenę.</value>
+  </data>
+  <data name="strPropertyDescriptionUsername" xml:space="preserve">
+    <value>Nazwa użytkownika.</value>
+  </data>
+  <data name="strPropertyNameAll" xml:space="preserve">
+    <value>Wszystkie</value>
+  </data>
+  <data name="strPropertyNameColors" xml:space="preserve">
+    <value>Kolory</value>
+  </data>
+  <data name="strPropertyNameCompression" xml:space="preserve">
+    <value>Kompresja</value>
+  </data>
+  <data name="strPropertyNameDescription" xml:space="preserve">
+    <value>Opis</value>
+  </data>
+  <data name="strPropertyNameDisplayThemes" xml:space="preserve">
+    <value>Wyświetlaj motywy</value>
+  </data>
+  <data name="strPropertyNameDisplayWallpaper" xml:space="preserve">
+    <value>Wyświetl tapetę</value>
+  </data>
+  <data name="strPropertyNameDomain" xml:space="preserve">
+    <value>Domena</value>
+  </data>
+  <data name="strPropertyNameEnableFontSmoothing" xml:space="preserve">
+    <value>Wygładzenie czcionki</value>
+  </data>
+  <data name="strPropertyNameEncoding" xml:space="preserve">
+    <value>Kodowanie</value>
+  </data>
+  <data name="strPropertyNameIcon" xml:space="preserve">
+    <value>Ikona</value>
+  </data>
+  <data name="strPropertyNameMACAddress" xml:space="preserve">
+    <value>Adres MAC</value>
+  </data>
+  <data name="strPropertyNameName" xml:space="preserve">
+    <value>Nazwa</value>
+  </data>
+  <data name="strPropertyNamePassword" xml:space="preserve">
+    <value>Hasło</value>
+  </data>
+  <data name="strPropertyNameProtocol" xml:space="preserve">
+    <value>Protokół</value>
+  </data>
+  <data name="strPropertyNamePuttySession" xml:space="preserve">
+    <value>Sesja PuTTY</value>
+  </data>
+  <data name="strPropertyNameRDGatewayUsageMethod" xml:space="preserve">
+    <value>Użyj bramy</value>
+  </data>
+  <data name="strPropertyNameRDGatewayUsername" xml:space="preserve">
+    <value>Użytkownik bramy</value>
+  </data>
+  <data name="strPropertyNameRedirectDrives" xml:space="preserve">
+    <value>Dyski</value>
+  </data>
+  <data name="strPropertyNameRedirectPorts" xml:space="preserve">
+    <value>Porty</value>
+  </data>
+  <data name="strPropertyNameRedirectPrinters" xml:space="preserve">
+    <value>Drukarki</value>
+  </data>
+  <data name="strPropertyNameRedirectSounds" xml:space="preserve">
+    <value>Dźwięki</value>
+  </data>
+  <data name="strPropertyNameResolution" xml:space="preserve">
+    <value>Rozdzielczość</value>
+  </data>
+  <data name="strPropertyNameUsername" xml:space="preserve">
+    <value>Użytkownik</value>
+  </data>
+  <data name="strPropertyNameViewOnly" xml:space="preserve">
+    <value>Tylko podgląd</value>
+  </data>
+  <data name="strPropertyNameVNCProxyAddress" xml:space="preserve">
+    <value>Adres proxy</value>
+  </data>
+  <data name="strPropertyNameVNCProxyPassword" xml:space="preserve">
+    <value>Hasło proxy</value>
+  </data>
+  <data name="strPropertyNameVNCProxyPort" xml:space="preserve">
+    <value>Port proxy</value>
+  </data>
+  <data name="strPropertyNameVNCProxyType" xml:space="preserve">
+    <value>Typ proxy</value>
+  </data>
+  <data name="strPropertyNameVNCProxyUsername" xml:space="preserve">
+    <value>Użytkownik proxy</value>
+  </data>
+  <data name="strProxyTestFailed" xml:space="preserve">
+    <value>Test proxy nie powiódł się!</value>
+  </data>
+  <data name="strProxyTestSucceeded" xml:space="preserve">
+    <value>Test proxy powiódł się!</value>
+  </data>
+  <data name="strPuttyConnectionFailed" xml:space="preserve">
+    <value>Nieudane połączenie!</value>
+  </data>
+  <data name="strPuttySettings" xml:space="preserve">
+    <value>Ustawienia PuTTY</value>
+  </data>
+  <data name="strQuickConnect" xml:space="preserve">
+    <value>Szybkie połączenie</value>
+  </data>
+  <data name="strRDP16777216Colors" xml:space="preserve">
+    <value>16777216 Kolorów (24-bir)</value>
+  </data>
+  <data name="strRDP256Colors" xml:space="preserve">
+    <value>256 Kolorów (8-bit)</value>
+  </data>
+  <data name="strRDP32768Colors" xml:space="preserve">
+    <value>32768 Kolorów (15-bit)</value>
+  </data>
+  <data name="strRDP4294967296Colors" xml:space="preserve">
+    <value>16777216 Kolorów (32-bit)</value>
+  </data>
+  <data name="strRDP65536Colors" xml:space="preserve">
+    <value>65536 Kolorów (16-bit)</value>
+  </data>
+  <data name="strRDPDisableCursorblinking" xml:space="preserve">
+    <value>Wyłącz miganie kursora</value>
+  </data>
+  <data name="strRDPDisableCursorShadow" xml:space="preserve">
+    <value>Wyłącz cień kursora</value>
+  </data>
+  <data name="strRDPDisableMenuAnimations" xml:space="preserve">
+    <value>Wyłącz animacje menu</value>
+  </data>
+  <data name="strRDPDisableThemes" xml:space="preserve">
+    <value>Wyłącz tematy</value>
+  </data>
+  <data name="strRDPDisableWallpaper" xml:space="preserve">
+    <value>Wyłącz tapetę</value>
+  </data>
+  <data name="strRDPSmartSize" xml:space="preserve">
+    <value>Mądry rozmiar</value>
+  </data>
+  <data name="strRefresh" xml:space="preserve">
+    <value>Odświerz</value>
+  </data>
+  <data name="strRemoteFile" xml:space="preserve">
+    <value>Plik zdalny</value>
+  </data>
+  <data name="strRemoveAll" xml:space="preserve">
+    <value>Usuń wszystkie</value>
+  </data>
+  <data name="strRename" xml:space="preserve">
+    <value>Zmień nazwę</value>
+  </data>
+  <data name="strSave" xml:space="preserve">
+    <value>Zapisz</value>
+  </data>
+  <data name="strSaveAll" xml:space="preserve">
+    <value>Zapisz wszystkie</value>
+  </data>
+  <data name="strScreenshot" xml:space="preserve">
+    <value>Zrzut ekranu</value>
+  </data>
+  <data name="strScreenshots" xml:space="preserve">
+    <value>Zrzuty ekranów</value>
+  </data>
+  <data name="strSendTo" xml:space="preserve">
+    <value>Wyślij do...</value>
+  </data>
+  <data name="strSort" xml:space="preserve">
+    <value>Sortuj</value>
+  </data>
+  <data name="strSortAsc" xml:space="preserve">
+    <value>Rosnąco (A-Z)</value>
+  </data>
+  <data name="strSortDesc" xml:space="preserve">
+    <value>Malejąco (Z-A)</value>
+  </data>
+  <data name="strSpecialKeys" xml:space="preserve">
+    <value>Znaki specjalne</value>
+  </data>
+  <data name="strSQLServer" xml:space="preserve">
+    <value>Serwer SQL:</value>
+  </data>
+  <data name="strSsh1" xml:space="preserve">
+    <value>SSH wersja 1</value>
+  </data>
+  <data name="strSsh2" xml:space="preserve">
+    <value>SSH wersja 2</value>
+  </data>
+  <data name="strStartIP" xml:space="preserve">
+    <value>Początkowe IP</value>
+  </data>
+  <data name="strStartPort" xml:space="preserve">
+    <value>Port początkowy</value>
+  </data>
+  <data name="strTabAdvanced" xml:space="preserve">
+    <value>Zaawansowane</value>
+  </data>
+  <data name="strTabAppearance" xml:space="preserve">
+    <value>Wygląd</value>
+  </data>
+  <data name="strTabUpdates" xml:space="preserve">
+    <value>Aktualizacje</value>
+  </data>
+  <data name="strTitleError" xml:space="preserve">
+    <value>Błąd ({0})</value>
+  </data>
+  <data name="strTitleInformation" xml:space="preserve">
+    <value>Informacja ({0})</value>
+  </data>
+  <data name="strTitlePassword" xml:space="preserve">
+    <value>Hasło</value>
+  </data>
+  <data name="strTitleSelectPanel" xml:space="preserve">
+    <value>Wybierz panel</value>
+  </data>
+  <data name="strTitleWarning" xml:space="preserve">
+    <value>Ostrzeżenie ({0})</value>
+  </data>
+  <data name="strType" xml:space="preserve">
+    <value>Typ</value>
+  </data>
+  <data name="strUpdateCheckFailed" xml:space="preserve">
+    <value>Sprawdzanie aktualizacji nie powiodło się!</value>
+  </data>
+  <data name="strUpdateFrequencyCustom" xml:space="preserve">
+    <value>Co {0} dni</value>
+  </data>
+  <data name="strUpdateFrequencyDaily" xml:space="preserve">
+    <value>Codziennie</value>
+  </data>
+  <data name="strUpdateFrequencyMonthly" xml:space="preserve">
+    <value>Miesięcznie</value>
+  </data>
+  <data name="strUpdateFrequencyWeekly" xml:space="preserve">
+    <value>Tygodniowo</value>
+  </data>
+  <data name="strUseDifferentUsernameAndPassword" xml:space="preserve">
+    <value>Użyj innego loginu użytkownika i hasła</value>
+  </data>
+  <data name="strUser" xml:space="preserve">
+    <value>Użytkownik</value>
+  </data>
+  <data name="strVersion" xml:space="preserve">
+    <value>Wersja</value>
+  </data>
+  <data name="strWarnings" xml:space="preserve">
+    <value>Ostrzeżenia</value>
+  </data>
+  <data name="strYes" xml:space="preserve">
+    <value>Tak</value>
+  </data>
+</root>

mRemoteV1/Messages/Messages.Collector.vb

@@ -81,9 +81,8 @@ Namespace Messages
             If My.Settings.SwitchToMCOnError And nMsg.MsgClass = Messages.MessageClass.ErrorMsg Then
                 Debug.Print("Error: " & nMsg.MsgText)
 
-                If My.Settings.WriteLogFile Then
-                    App.Runtime.log.Error(nMsg.MsgText)
-                End If
+                ' Always log error messages
+                App.Runtime.Log.Error(nMsg.MsgText)
 
                 If OnlyLog Then
                     Exit Sub
@@ -100,14 +99,7 @@ Namespace Messages
                 Debug.Print("Report: " & nMsg.MsgText)
 
                 If My.Settings.WriteLogFile Then
-                    App.Runtime.log.Info(nMsg.MsgText)
-                End If
-
-                If App.Editions.Spanlink.Enabled Then
-                    App.Runtime.Report(Tools.Misc.LeadingZero(Now.Year) & "-" & Tools.Misc.LeadingZero(Now.Month) & "-" & _
-                                       Tools.Misc.LeadingZero(Now.Day) & " " & Tools.Misc.LeadingZero(Now.Hour) & ":" & _
-                                       Tools.Misc.LeadingZero(Now.Minute) & ":" & Tools.Misc.LeadingZero(Now.Second) & _
-                                       " " & nMsg.MsgText)
+                    App.Runtime.Log.Info(nMsg.MsgText)
                 End If
 
                 Exit Sub
@@ -138,11 +130,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.Language.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.Language.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.Language.strTitleError, Msg.MsgDate), MessageBoxButtons.OK, MessageBoxIcon.Error)
             End Select
         End Sub
 

mRemoteV1/My Project/Application.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.1433
+'     Runtime Version:4.0.30319.239
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -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

@@ -1,4 +1,5 @@
-Imports System
+Imports System.Resources
+
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 
@@ -12,10 +13,10 @@ 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-2013 Riley McArdle")> 
 <Assembly: AssemblyTrademark("")> 
 
-<Assembly: ComVisible(False)>
+<Assembly: ComVisible(False)> 
 
 'The following GUID is for the ID of the typelib if this project is exposed to COM
 <Assembly: Guid("A99669B2-FAEB-11DE-995A-826C56D89593")> 
@@ -31,5 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.63")> 
-<Assembly: AssemblyFileVersion("1.63")> 
+<Assembly: AssemblyVersion("1.70.*")>
+
+<Assembly: NeutralResourcesLanguageAttribute("en")> 

mRemoteV1/My Project/DataSources/mRemote.Language.Base.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="Base" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>mRemote.Language.Base, mRemote, Version=1.44.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

mRemoteV1/My Project/DataSources/mRemote.Language.EN.datasource

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
--->
-<GenericObjectDataSource DisplayName="EN" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>mRemote.Language.EN, mRemote, Version=1.44.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>

mRemoteV1/My Project/Resources.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.4927
+'     Runtime Version:4.0.30319.239
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("mRemote.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("mRemoteNG.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
@@ -753,141 +753,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Looks up a localized string similar to About.
-        '''</summary>
-        Friend ReadOnly Property strAbout() As String
-            Get
-                Return ResourceManager.GetString("strAbout", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Change Log:.
-        '''</summary>
-        Friend ReadOnly Property strChangeLogLabel() As String
-            Get
-                Return ResourceManager.GetString("strChangeLogLabel", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Do you want to close all open connections?.
-        '''</summary>
-        Friend ReadOnly Property strConfirmExitMainInstruction() As String
-            Get
-                Return ResourceManager.GetString("strConfirmExitMainInstruction", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Are you sure you want to reset the panels to their default layout?.
-        '''</summary>
-        Friend ReadOnly Property strConfirmResetLayout() As String
-            Get
-                Return ResourceManager.GetString("strConfirmResetLayout", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Do not show this message again..
-        '''</summary>
-        Friend ReadOnly Property strDoNotShowThisMessageAgain() As String
-            Get
-                Return ResourceManager.GetString("strDoNotShowThisMessageAgain", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Includes icons by [FAMFAMFAM].
-        '''</summary>
-        Friend ReadOnly Property strFAMFAMFAMAttribution() As String
-            Get
-                Return ResourceManager.GetString("strFAMFAMFAMAttribution", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to http://www.famfamfam.com/.
-        '''</summary>
-        Friend ReadOnly Property strFAMFAMFAMAttributionURL() As String
-            Get
-                Return ResourceManager.GetString("strFAMFAMFAMAttributionURL", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Uses the Magic library by [Crownwood Software].
-        '''</summary>
-        Friend ReadOnly Property strMagicLibraryAttribution() As String
-            Get
-                Return ResourceManager.GetString("strMagicLibraryAttribution", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to http://www.dotnetmagic.com/.
-        '''</summary>
-        Friend ReadOnly Property strMagicLibraryAttributionURL() As String
-            Get
-                Return ResourceManager.GetString("strMagicLibraryAttributionURL", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Portable Edition.
-        '''</summary>
-        Friend ReadOnly Property strPortableEdition() As String
-            Get
-                Return ResourceManager.GetString("strPortableEdition", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Released under the GNU General Public License (GPL).
-        '''</summary>
-        Friend ReadOnly Property strReleasedUnderGPL() As String
-            Get
-                Return ResourceManager.GetString("strReleasedUnderGPL", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Every {0} days.
-        '''</summary>
-        Friend ReadOnly Property strUpdateFrequencyCustom() As String
-            Get
-                Return ResourceManager.GetString("strUpdateFrequencyCustom", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Daily.
-        '''</summary>
-        Friend ReadOnly Property strUpdateFrequencyDaily() As String
-            Get
-                Return ResourceManager.GetString("strUpdateFrequencyDaily", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Monthly.
-        '''</summary>
-        Friend ReadOnly Property strUpdateFrequencyMonthly() As String
-            Get
-                Return ResourceManager.GetString("strUpdateFrequencyMonthly", resourceCulture)
-            End Get
-        End Property
-        
-        '''<summary>
-        '''  Looks up a localized string similar to Weekly.
-        '''</summary>
-        Friend ReadOnly Property strUpdateFrequencyWeekly() As String
-            Get
-                Return ResourceManager.GetString("strUpdateFrequencyWeekly", resourceCulture)
-            End Get
-        End Property
-        
         Friend ReadOnly Property Tab_Icon() As System.Drawing.Icon
             Get
                 Dim obj As Object = ResourceManager.GetObject("Tab_Icon", resourceCulture)

mRemoteV1/My Project/Resources.resx

@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="_Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images\Error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -445,49 +445,4 @@
   <data name="News" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Images_FamFamFam\News.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="strUpdateFrequencyCustom" xml:space="preserve">
-    <value>Every {0} days</value>
-  </data>
-  <data name="strUpdateFrequencyDaily" xml:space="preserve">
-    <value>Daily</value>
-  </data>
-  <data name="strUpdateFrequencyMonthly" xml:space="preserve">
-    <value>Monthly</value>
-  </data>
-  <data name="strUpdateFrequencyWeekly" xml:space="preserve">
-    <value>Weekly</value>
-  </data>
-  <data name="strFAMFAMFAMAttribution" xml:space="preserve">
-    <value>Includes icons by [FAMFAMFAM]</value>
-  </data>
-  <data name="strFAMFAMFAMAttributionURL" xml:space="preserve">
-    <value>http://www.famfamfam.com/</value>
-  </data>
-  <data name="strMagicLibraryAttribution" xml:space="preserve">
-    <value>Uses the Magic library by [Crownwood Software]</value>
-  </data>
-  <data name="strMagicLibraryAttributionURL" xml:space="preserve">
-    <value>http://www.dotnetmagic.com/</value>
-  </data>
-  <data name="strAbout" xml:space="preserve">
-    <value>About</value>
-  </data>
-  <data name="strChangeLogLabel" xml:space="preserve">
-    <value>Change Log:</value>
-  </data>
-  <data name="strReleasedUnderGPL" xml:space="preserve">
-    <value>Released under the GNU General Public License (GPL)</value>
-  </data>
-  <data name="strConfirmResetLayout" xml:space="preserve">
-    <value>Are you sure you want to reset the panels to their default layout?</value>
-  </data>
-  <data name="strConfirmExitMainInstruction" xml:space="preserve">
-    <value>Do you want to close all open connections?</value>
-  </data>
-  <data name="strDoNotShowThisMessageAgain" xml:space="preserve">
-    <value>Do not show this message again.</value>
-  </data>
-  <data name="strPortableEdition" xml:space="preserve">
-    <value>Portable Edition</value>
-  </data>
-</root>
+</root>

mRemoteV1/My Project/Settings.settings

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

mRemoteV1/Notes/Help.txt

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

mRemoteV1/Notes/Misc.txt

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

mRemoteV1/Notes/MultiLang.txt

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