Update CHANGELOG.TXT for 1.71 RC3.

Fix the wrong connections file opening on startup under certain conditions.
Improve error reporting when loading connections files.
Remove warning message when mRemoteNG is started for the first time about new connections file being created.

.gitignore

@@ -1,7 +1,7 @@
-Release
-mRemoteV1/bin
-mRemoteV1/obj
-mRemoteV1/publish
+Release/
+mRemoteV1/bin/
+mRemoteV1/obj/
+mRemoteV1/publish/
 *.pfx
 *.suo
 *.vbproj.user
@@ -17,3 +17,10 @@ _Re[Ss]harper.*
 *.user*
 *.pidb
 *.gpState
+_UpgradeReport_Files/
+Backup/
+UpgradeLog.XML
+*.orig
+*.sdf
+*.opensdf
+*.ipch

BUILD.CMD

@@ -1,16 +1,36 @@
 @echo off
 
-SET VERSIONTAG=RC3
+setlocal enabledelayedexpansion
 
-SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
-SET DEVENV="devenv.exe"
-SET MAKENSIS="%ProgramFiles(x86)%\NSIS\Unicode\makensis.exe"
-SET RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+set VERSIONTAG=
 
-call %VCVARSALL% x86 > NUL 2>&1
+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 "Astrospark Technologies, LLC" /sha1 "1cbd910dbd6e77f26506e7f600736972f700673f" /tr http://timestamp.comodoca.com/rfc3161
 
-rmdir /s /q "%~dp0\mRemoteV1\bin" > NUL 2>&1
-rmdir /s /q "%~dp0\mRemoteV1\obj" > NUL 2>&1
+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" > nul 2>&1
+rmdir /s /q "%~dp0\mRemoteV1\obj" > nul 2>&1
+
+if exist "%~dp0\mRemoteV1\bin" goto ERROR_RMDIR
+if exist "%~dp0\mRemoteV1\obj" goto ERROR_RMDIR
+goto NOERROR_RMDIR
+
+:ERROR_RMDIR
+echo.
+echo Could not clean output directories.
+echo.
+echo Build process failed.
+echo.
+goto END
+
+:NOERROR_RMDIR
 
 echo Building release version...
 %DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
@@ -18,34 +38,112 @@ echo Building release version...
 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\el\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\en-US\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\es\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\es-AR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\fr\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\hu\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\it\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\nb-NO\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\nl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pt\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\pt-BR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\ru\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\uk\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\zh-CN\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\zh-TW\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\AxInterop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\AxInterop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.EOLWTSCOM.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.ShDocVw.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\Interop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release\mRemoteNG.exe" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\de\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\el\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\en-US\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\es\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\es-AR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\fr\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\hu\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\it\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\nb-NO\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\nl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pl\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pt\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\pt-BR\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\ru\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\uk\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\zh-CN\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\zh-TW\mRemoteNG.resources.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\AxInterop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.EOLWTSCOM.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.MSTSCLib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.ShDocVw.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\Interop.WFICALib.dll" ^
+	"%~dp0\mRemoteV1\bin\Release Portable\mRemoteNG.exe" ^
+
+
+rem Do not remove the two blank lines above this line.
+
+mkdir "%~dp0\Release" > nul 2>&1
 
 echo Getting product version...
-%MAKENSIS% "%~dp0\Installer\GetVersion.nsi"
-"%~dp0\Release\GetVersion.exe"
-call "%~dp0\Release\Version.cmd"
+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%
 
 echo Creating installer package...
 if defined VERSIONTAG (
 	%MAKENSIS% /DPRODUCT_VERSION_TAG=%VERSIONTAG% "%~dp0\Installer\mRemote.nsi"
 
+	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"
 
+	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
+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
+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.
+
+:END
+pause

CHANGELOG.TXT

@@ -1,4 +1,223 @@
-1.67 (2011-05-28):
+1.71 (2013-10-29):
+  Fixed issue MR-574 - Crash when retrieving RDP session list if eolwtscom.dll is not registered
+  Fixed issue MR-578 - Connections file is reset
+  Fixed log file not showing operating system version on Windows XP and Windows Server 2003.
+  Fixed the wrong connections file opening on startup under certain conditions.
+  Fixed checking for updates even when disabled.
+  Improved error reporting when loading connections files.
+  Removed warning message when mRemoteNG is started for the first time about new connections file being created.
+
+1.71 Release Candidate 2 (2013-10-16):
+  Fixed issue MR-560 - Cannot Auto-Update With Open Connections: Unable to find an entry point named 'TaskDialogIndirect' in DLL 'ComCtl32'
+  Fixed issue MR-565 - Double Folder keep heritage on the initial Folder
+  Fixed issue MR-566 - Typo in German UI Automatic Update Settings
+  Fixed duplicated folders possibly being named "New Connection" instead of the original folder's name.
+
+1.71 Release Candidate 1 (2013-10-01):
+  Fixed issue MR-495 - Having a negative range in port scan creates memory exhaustion.
+  Fixed issue MR-514 - Window Proxy test failed without close button
+  Fixed issue MR-521 - Right-Clicking in "Sessions" panel crashes mRemoteNG
+  Fixed issue MR-525 - Could not start on windows 7 64bit
+  Fixed issue MR-535 - SQL error saving Connections
+  Fixed issue MR-538 - RDP loses connection when hiding config or connections pane
+  Fixed issue MR-542 - Wrapped putty has security flaw
+  Made minor improvements to the port scan functionality.
+  Fixed possible cross-thread operation exception when loading connections from SQL.
+  Fixed PuTTY Saved Sessions not showing after loading a new connections file.
+  Updated PuTTY to version 0.63.
+  Updated translations.
+  Added Chinese (Traditional) translation.
+  Added partial Greek and Hungarian translations.
+
+1.71 Beta 5 (2013-06-09):
+  Fixed issue MR-491 - Could not start RDP Connection
+  Fixed issue MR-499 - TS Gateway is not working in latest release 1.71
+  Fixed typo in SQL queries.
+
+1.71 Beta 4 (2013-05-28):
+  Added feature MR-435 - Add digital signature check to updater
+  Fixed issue MR-255 - The version of the RDP AX client should be updated to 7
+  Fixed issue MR-392 - Sessions Panel - context menu entries need to be context aware
+  Fixed issue MR-422 - Gives error Object reference not set to an instance of an object.
+  Fixed issue MR-424 - Import of a few Linux SSH2 hosts discovered via the port scan tool results in a UE
+  Fixed issue MR-439 - MRemoteNG 1.70 does not start
+  Fixed issue MR-440 - RDP import with non-standard port
+  Fixed issue MR-443 - Instructions for eolwtscom.dll registration for Portable version are inaccurate
+  Fixed issue MR-446 - Putty saved sessions show in connection panel
+  Fixed issue MR-459 - Maximized -> Minimized -> Restored results in mangled active display
+  Fixed issue MR-463 - Add support for LoadBalanceInfo to RDP
+  Fixed issue MR-470 - Quick Connect to Linux server uses invalid credentials
+  Fixed issue MR-471 - PuTTY Saved Sessions disappears from connection list
+  Fixed issue MR-487 - Initiate connections on MouseUp event
+  Added PuTTY Session Settings command to the Config panel for PuTTY Saved Sessions.
+  Updated translations.
+  Added Norwegian (Bokmal) and Portuguese (Brazil) translations.
+  Added Spanish translation to the installer.
+  Fixed an exception or crash when choosing unnamed colors for themes.
+  Fixed possible error "Control does not support transparent background colors" when modifying themes.
+  Fixed changes to the active theme not being saved reliably.
+  Fixed handling of the plus (+) character in PuTTY session names.
+  Changed Internet Explorer to no longer force IE7 compatibility mode.
+  Changed the "Launch PuTTY" button in the "Options" dialog to open PuTTY from the path the user has currently set, instead of what was previously saved.
+  Improved update and announcement checking.
+  Improved the PuTTY Saved Sessions list to update automatically when any changes are made.
+  Improved loading time of large connection files.
+  Lowered required version of RDC from 6.1 to 6.0.
+  Updated VncSharpNG to 1.3.4896.25007.
+
+1.71 Beta 3 (2013-03-20):
+  Fixed issue MR-397 - Putty disappears from the screen
+  Fixed issue MR-398 - Full Screen mode doesn't correctly make use of available space
+  Fixed issue MR-402 - scrollbar touch moves putty window
+  Fixed issue MR-406 - Items disappear from External Tools toolbar when accessing External Tools panel
+  Fixed issue MR-410 - Unhandled exception when clicking New button under Theme
+  Fixed issue MR-413 - Can't use aplication
+  Fixed new connections having a globe icon.
+  Fixed the category names in the themes tab of the options dialog on Windows XP not showing correctly.
+  Fixed PuTTY saved sessions with spaces or special characters not being listed.
+
+1.71 Beta 2 (2013-03-19):
+  Added feature MR-336 - Customizable background color for the windows/panels
+  Added feature MR-345 - Two separate options for confirming closure of Tabs and Connection Panels
+  Added feature MR-346 - Option to show/hide the description box at the bottom of the Config panel
+  Added feature MR-351 - Import connections from PuTTY
+  Fixed issue MR-354 - Re-ordering tabs doesn't give good, reliable visual feedback
+  Fixed issue MR-375 - Changing a connection's icon using the picture button should immediately update Icon field
+  Fixed issue MR-377 - Several redundant panels can be opened
+  Fixed issue MR-379 - Connection variables not working with external tools
+  Fixed issue MR-381 - Notifications panel - whitespace context menu allows Copy and Delete on nothing
+  Fixed issue MR-401 - Checkbox misaligned
+  The username and domain settings are now hidden for VNC connections since they are not supported.
+  Changed "Automatically get session information" to be disabled by default.
+  RDP connections can now be switched to full screen mode when redirect key combinations is enabled.
+
+1.71 Beta 1 (2013-03-04):
+  Added feature MR-329 - Create Option to disable the "Quick: " prefix
+  Fixed issue MR-67 - Sort does not recursively sort
+  Fixed issue MR-117 - Remote Session Info Window / Tab does not populate
+  Fixed issue MR-121 - Config pane not sorting properties correctly when switching between alphabetical and categorized view
+  Fixed issue MR-130 - Issues duplicating folders
+  Fixed issue MR-142 - Start of mRemoteNG takes about one minute and consumes excessive CPU
+  Fixed issue MR-158 - Password field not accepting Pipe
+  Fixed issue MR-330 - Portable version saves log to user's profile folder
+  Fixed issue MR-333 - Unnecessary prompt for 'close all open connections?'
+  Fixed issue MR-342 - Incorrect view in config pane of new connection after viewing default inheritance
+  Fixed issue MR-352 - Passwords with " (quotation mark) and # (hash key) characters make mRemoteNG to open PuttyNG dialog
+  Fixed issue MR-362 - Rename 'Screenshot Manager' to 'Screenshots' on the View menu to match Panel name
+  Added detection of newer versions of connection files and database schemata. mRemoteNG will now refuse to open them to avoid data loss.
+  Improved appearance and discoverability of the connection search box.
+  If RDC 7.0 or higher is installed, the connection bar is no longer briefly shown when connecting to an RDP connection with redirect key combinations enabled.
+  If RDC 8.0 or higher is installed, RDP connections automatically adjust their size when the window is resized or when toggling full screen mode.
+
+1.70 (2013-03-07):  
+  Fixed issue MR-339 - Connection group collapses with just one click
+  Fixed issue MR-340 - Object reference not set to an instance of an object.
+  Fixed issue MR-344 - Move "Always show panel tabs" option
+  Fixed issue MR-350 - VerifyDatabaseVersion (Config.Connections.Save) failed. Version string portion was too short or too long.
+  Fixed issue MR-355 - Moving sub folders to top level causes property loss
+  Fixed tabs not closing on double-click when the active tab is a PuTTY connection.
+
+1.70 Release Candidate 2 (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.
@@ -22,7 +241,12 @@
   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

CREDITS.TXT

@@ -1,6 +1,8 @@
 Contributors
 ============
 
+Jason Barbier
+Wiktor Beryt
 Lionel Caignec
 Felix Deimel
 Holger Henke
@@ -11,6 +13,15 @@ Andreas Rehm
 David Vidmar
 
 
+Translators
+===========
+
+Eugenio "Ryo567" Mart<72>nez
+Mathieu Pape
+Emanuel Silva
+Robert Siwiec
+
+
 Included Source Code
 ====================
 
@@ -19,6 +30,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
 ===================
@@ -79,8 +95,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/GetVersion.nsi

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

Installer/Language/czech.nsi

@@ -10,7 +10,13 @@ LangString InstallerLanguage ${LANG_CZECH} "Installer Language"
 LangString SelectInstallerLanguage ${LANG_CZECH} "Please select the language of the installer"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_CZECH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+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."
+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

@@ -10,7 +10,13 @@ LangString InstallerLanguage ${LANG_DUTCH} "Installer Language"
 LangString SelectInstallerLanguage ${LANG_DUTCH} "Please select the language of the installer"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_DUTCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+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."
+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

@@ -10,7 +10,13 @@ LangString InstallerLanguage ${LANG_ENGLISH} "Installer Language"
 LangString SelectInstallerLanguage ${LANG_ENGLISH} "Please select the language of the installer"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_ENGLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+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."
+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

@@ -10,7 +10,13 @@ LangString InstallerLanguage ${LANG_FRENCH} "Installer Language"
 LangString SelectInstallerLanguage ${LANG_FRENCH} "Please select the language of the installer"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_FRENCH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+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."
+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

@@ -10,7 +10,13 @@ LangString InstallerLanguage ${LANG_GERMAN} "Installationsprogamm Sprache"
 LangString SelectInstallerLanguage ${LANG_GERMAN} "Bitte w<>hlen Sie die Sprache f<>r das Installationsprogramm"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_GERMAN} "mRemoteNG ben<65>tigt das Microsoft .NET Framework 2.0."
+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."
+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/polish.nsi

@@ -10,7 +10,13 @@ LangString InstallerLanguage ${LANG_POLISH} "Installer Language"
 LangString SelectInstallerLanguage ${LANG_POLISH} "Please select the language of the installer"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_POLISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+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."
+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

@@ -1,16 +1,22 @@
 ; Spanish installer translation
 
 ; Start mRemoteNG after installation
-LangString LaunchMremoteNow ${LANG_SPANISH} "mRemoteNG run SPANISH message"
+LangString LaunchMremoteNow ${LANG_SPANISH} "Iniciando de mRemoteNG"
 
 ; Installer Language
-LangString InstallerLanguage ${LANG_SPANISH} "Installer Language"
+LangString InstallerLanguage ${LANG_SPANISH} "Lenguaje de Instalación"
 
 ; Select installer Language
-LangString SelectInstallerLanguage ${LANG_SPANISH} "Please select the language of the installer"
+LangString SelectInstallerLanguage ${LANG_SPANISH} "Seleccione el lenguaje de instalación"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requires Microsoft .NET Framework 2.0."
+LangString RequiresNetFramework ${LANG_SPANISH} "mRemoteNG requiere 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."
+LangString RequiresAdminUser ${LANG_SPANISH} "Debe ser miembro del grupo 'Administradores' para poder instalar mRemoteNG."
+
+; Start Menu items
+LangString CreditsLinkName ${LANG_SPANISH} "Créditos"
+LangString CopyingLinkName ${LANG_SPANISH} "Licencia"
+LangString UninstallLinkName ${LANG_SPANISH} "Desinstalar"
+LangString ChangeLogLinkName ${LANG_SPANISH} "Historial de Versiones"

Installer/Language/thai.nsi

@@ -11,7 +11,13 @@ LangString InstallerLanguage ${LANG_THAI} "ภาษาสำหรับกา
 LangString SelectInstallerLanguage ${LANG_THAI} "กรุณาเลือกภาษาสำหรับการติดตั้ง"
 
 ; Requires .NET Framework
-LangString RequiresNetFramework ${LANG_THAI} "mRemoteNG มีความต้องการ  Microsoft .NET Framework 2.0. เป็นพื้นฐาน"
+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

@@ -1,21 +1,19 @@
-!include "MUI.nsh"
+!include "MUI.nsh"
 !include "WordFunc.nsh"
 !insertmacro VersionCompare
 
+!include "DotNetVer.nsh"
 !include "..\Release\Version.nsh"
 
 ; This will be passed in using the /D switch by BUILD.CMD
 !ifdef PRODUCT_VERSION_TAG
-	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT} ${PRODUCT_VERSION_TAG}"
+	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
 	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}-${PRODUCT_VERSION_TAG}"
 !else
 	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
 	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}"
 !endif
 
-; Global Variables
-Var InstallDotNET
-
 ; Basic Config
 Name "mRemoteNG ${PRODUCT_VERSION_FRIENDLY}"
 OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION_TAGGED}.exe"
@@ -26,9 +24,10 @@ RequestExecutionLevel admin
 
 ; Version Information
 VIProductVersion ${PRODUCT_VERSION}
+VIAddVersionKey "CompanyName" "Next Generation Software"
 VIAddVersionKey "ProductName" "mRemoteNG"
 VIAddVersionKey "ProductVersion" ${PRODUCT_VERSION}
-VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2011 Riley McArdle"
+VIAddVersionKey "LegalCopyright" "Copyright © 2007-2009 Felix Deimel, 2010-2013 Riley McArdle"
 VIAddVersionKey "FileDescription" "mRemoteNG ${PRODUCT_VERSION_FRIENDLY} Installer"
 VIAddVersionKey "FileVersion" ${PRODUCT_VERSION}
 
@@ -95,7 +94,8 @@ Function .onInit
 	Win9x:
 	doit:
 		# We can install
-		Call SelectLanguage
+		IfSilent +2
+			Call SelectLanguage
 		Goto end
 	noop:
 		MessageBox MB_OK "$(RequiresAdminUser)"
@@ -131,22 +131,7 @@ Function SelectLanguage
 		Abort
 
 	; Check .NET version
-	StrCpy $InstallDotNET "No"
-	Call GetDotNETVersion
-	Pop $0
-
-	${If} $0 == "not found"
-		StrCpy $InstallDotNET "Yes"
-	${EndIf}
-
-	StrCpy $0 $0 "" 1 # skip "v"
-
-	${VersionCompare} $0 "2.0" $1
-	${If} $1 == 2
-		StrCpy $InstallDotNET "Yes"
-	${EndIf}
-
-	${If} $InstallDotNET == "Yes"
+	${IfNot} ${HasDotNet3.0}
 		MessageBox MB_OK|MB_ICONEXCLAMATION "$(RequiresNetFramework)"
 		Quit
 	${EndIf}
@@ -169,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}
@@ -197,13 +185,9 @@ Section "un.Uninstall"
 
 	; Start Menu
 	SetShellVarContext all
-	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
-	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
-	RMDir "$SMPROGRAMS\mRemoteNG"
+	RMDir /r "$SMPROGRAMS\mRemoteNG"
 	SetShellVarContext current
-	Delete "$SMPROGRAMS\mRemoteNG\mRemoteNG.lnk"
-	Delete "$SMPROGRAMS\mRemoteNG\Uninstall.lnk"
-	RMDir "$SMPROGRAMS\mRemoteNG"
+	RMDir /r "$SMPROGRAMS\mRemoteNG"
 
 	; Registry
 	DeleteRegValue HKLM "Software\mRemoteNG" "InstallPath"
@@ -211,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

Sort Language Files.cmd

@@ -0,0 +1,26 @@
+@echo off
+
+set TEMP_FOLDER="%TEMP%\Translations.tmp"
+set SORTRESX="%~dp0\Tools\SortRESX.exe"
+
+echo.
+echo This script sorts the language files
+echo.
+
+choice /m "Would you like to continue?"
+
+echo.
+
+rmdir /s /q %TEMP_FOLDER%
+mkdir %TEMP_FOLDER%
+copy "%~dp0\mRemoteV1\Language\*.resx" %TEMP_FOLDER%
+
+pushd %TEMP_FOLDER%
+for %%f in (*) do %SORTRESX% %TEMP_FOLDER%\%%f "%~dp0\mRemoteV1\Language\%%f"
+popd
+
+rmdir /s /q %TEMP_FOLDER%
+
+echo Done.
+echo.
+pause

Update Languages.cmd

@@ -0,0 +1,55 @@
+@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%\bg\Language.bg.resx "%~dp0\mRemoteV1\Language\Language.bg.resx"
+%SORTRESX% %TEMP_FOLDER%\de\Language.de.resx "%~dp0\mRemoteV1\Language\Language.de.resx"
+%SORTRESX% %TEMP_FOLDER%\el\Language.el.resx "%~dp0\mRemoteV1\Language\Language.el.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%\he\Language.he.resx "%~dp0\mRemoteV1\Language\Language.he.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%\nb\Language.nb.resx "%~dp0\mRemoteV1\Language\Language.nb-NO.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"
+%SORTRESX% %TEMP_FOLDER%\zh-TW\Language.zh.resx "%~dp0\mRemoteV1\Language\Language.zh-TW.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,148 +0,0 @@
-Imports System.Net
-Imports mRemoteNG.App.Runtime
-
-Namespace App
-    Public Class Announcement
-#Region "Private Properties"
-        Private wCl As WebClient
-        Private wPr As WebProxy
-#End Region
-
-        Private _curAI As Info
-        Public ReadOnly Property curAI() As Info
-            Get
-                Return _curAI
-            End Get
-        End Property
-
-        Public Function IsAnnouncementAvailable() As Boolean
-            Try
-                Dim aI As Info = GetAnnouncementInfo()
-
-                If aI.InfoOk = False Then
-                    Return False
-                End If
-
-                If aI.Name <> My.Settings.LastAnnouncement Then
-                    Return True
-                Else
-                    Return False
-                End If
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsAnnouncementAvailable failed" & vbNewLine & ex.Message, True)
-                Return False
-            End Try
-        End Function
-
-        Public Function GetAnnouncementInfo() As Info
-            Try
-                Dim strAnnouncement As String = GetAnnouncementFile()
-
-                CreateWebClient()
-
-                Dim aI As New Info()
-
-                If strAnnouncement <> "" Then
-                    aI.InfoOk = True
-
-                    Try
-                        'get Name
-                        Dim strName As String = strAnnouncement.Substring(strAnnouncement.IndexOf("Name: ") + 6, strAnnouncement.IndexOf(vbNewLine) - 6)
-                        aI.Name = strName
-
-                        strAnnouncement = strAnnouncement.Remove(0, strAnnouncement.IndexOf(vbNewLine) + 2)
-
-                        'get Download URL
-                        Dim strU As String = ""
-
-                        strU = strAnnouncement.Substring(strAnnouncement.IndexOf("URL: ") + 5, strAnnouncement.IndexOf(vbNewLine) - 5)
-
-                        aI.URL = strU
-                    Catch ex As Exception
-                        aI.InfoOk = False
-                    End Try
-                Else
-                    aI.InfoOk = False
-                End If
-
-                _curAI = aI
-                Return aI
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting Announcement info failed" & vbNewLine & ex.Message, True)
-                Return Nothing
-            End Try
-        End Function
-
-        Private Function GetAnnouncementFile() As String
-            Try
-                CreateWebClient()
-
-                Dim strTemp As String
-
-                Try
-                    strTemp = wCl.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)
-                Return ""
-            End Try
-        End Function
-
-        Private Sub CreateWebClient()
-            wCl = New WebClient()
-
-            If My.Settings.UpdateUseProxy Then
-                wPr = 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
-                End If
-
-                wCl.Proxy = wPr
-            End If
-        End Sub
-
-
-
-
-        Public Class Info
-            Private _Name As String
-            Public Property Name() As String
-                Get
-                    Return _Name
-                End Get
-                Set(ByVal value As String)
-                    _Name = value
-                End Set
-            End Property
-
-            Private _URL As String
-            Public Property URL() As String
-                Get
-                    Return _URL
-                End Get
-                Set(ByVal value As String)
-                    _URL = value
-                End Set
-            End Property
-
-
-            Private _InfoOk As Boolean
-            Public Property InfoOk() As Boolean
-                Get
-                    Return _InfoOk
-                End Get
-                Set(ByVal value As Boolean)
-                    _InfoOk = value
-                End Set
-            End Property
-        End Class
-    End Class
-End Namespace

mRemoteV1/App/App.Editions.vb

@@ -1,8 +0,0 @@
-Namespace App
-    Namespace Editions
-        Public Class Spanlink
-            Public Shared Enabled As Boolean = True
-
-        End Class
-    End Namespace
-End Namespace

mRemoteV1/App/App.Info.vb

@@ -1,4 +1,5 @@
 Imports System.Environment
+Imports System.Threading
 
 Namespace App
     Namespace Info
@@ -7,10 +8,27 @@ Namespace App
             Public Shared ReadOnly URLDonate As String = "http://donate.mremoteng.org/"
             Public Shared ReadOnly URLForum As String = "http://forum.mremoteng.org/"
             Public Shared ReadOnly URLBugs As String = "http://bugs.mremoteng.org/"
-            Public Shared ReadOnly URLAnnouncement As String = "http://update.mremoteng.org/announcement.txt"
             Public Shared ReadOnly HomePath As String = My.Application.Info.DirectoryPath
             Public Shared EncryptionKey As String = "mR3m"
             Public Shared ReportingFilePath As String = ""
+            Public Shared ReadOnly PuttyPath As String = My.Application.Info.DirectoryPath & "\PuTTYNG.exe"
+            Public Shared ReadOnly Property UserAgent As String
+                Get
+                    Dim details As New List(Of String)
+                    details.Add("compatible")
+                    If OSVersion.Platform = PlatformID.Win32NT Then
+                        details.Add(String.Format("Windows NT {0}.{1}", OSVersion.Version.Major, OSVersion.Version.Minor))
+                    Else
+                        details.Add(OSVersion.VersionString)
+                    End If
+                    If Tools.EnvironmentInfo.IsWow64 Then details.Add("WOW64")
+                    details.Add(Thread.CurrentThread.CurrentUICulture.Name)
+                    details.Add(String.Format(".NET CLR {0}", Version.ToString()))
+                    Dim detailsString As String = String.Join("; ", details.ToArray())
+
+                    Return String.Format("Mozilla/4.0 ({0}) {1}/{2}", detailsString, Application.ProductName, Application.ProductVersion)
+                End Get
+            End Property
         End Class
 
         Public Class Settings
@@ -21,22 +39,32 @@ Namespace App
 #End If
             Public Shared ReadOnly LayoutFileName As String = "pnlLayout.xml"
             Public Shared ReadOnly ExtAppsFilesName As String = "extApps.xml"
+            Public Const ThemesFileName As String = "Themes.xml"
         End Class
 
         Public Class Update
-            Public Shared ReadOnly URL As String = "http://update.mremoteng.org/"
+            Public Shared ReadOnly Property FileName As String
+                Get
 #If DEBUG Then
-            Public Shared ReadOnly File As String = "update-debug.txt"
-#Else
-            Public Shared ReadOnly File As String = "update.txt"
+                    Return "update-debug.txt"
 #End If
+                    Select Case My.Settings.UpdateChannel.ToLowerInvariant()
+                        Case "beta"
+                            Return "update-beta.txt"
+                        Case "debug"
+                            Return "update-debug.txt"
+                        Case Else
+                            Return "update.txt"
+                    End Select
+                End Get
+            End Property
         End Class
 
         Public Class Connections
             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.3
+            Public Shared ReadOnly ConnectionFileVersion As Double = 2.5
         End Class
 
         Public Class Credentials

mRemoteV1/App/App.Native.vb

@@ -2,148 +2,198 @@
 
 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
-        End Function
-
-        <DllImport("User32")> _
+        <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 SendMessage(ByVal Handle As IntPtr, ByVal msg As Integer, ByVal wParam As IntPtr, ByVal lParam As IntPtr) As IntPtr
+        <DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
+        Public Shared Function SetForegroundWindow(ByVal hWnd As IntPtr) As Boolean
         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 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
-
-        Public Const WM_DRAWCLIPBOARD As Integer = 776
-        Public Const WM_CHANGECBCHAIN As Integer = 781
 #End Region
     End Class
 End Namespace

mRemoteV1/App/App.SupportedCultures.vb

@@ -55,7 +55,7 @@
 
         Public Shared ReadOnly Property CultureNativeNames() As List(Of String)
             Get
-                Dim ValueList As List(Of String) = New List(Of String)
+                Dim ValueList As New List(Of String)
                 For Each Value As String In _Instance.Values
                     ValueList.Add(Value)
                 Next

mRemoteV1/App/App.Update.vb

@@ -1,266 +1,431 @@
 Imports System.IO
 Imports System.Net
-Imports mRemoteNG.App.Runtime
+Imports System.ComponentModel
+Imports System.Threading
+Imports mRemoteNG.Tools
+Imports System.Reflection
 
 Namespace App
     Public Class Update
-        Public Event DownloadProgressChanged(ByVal sender As Object, ByVal e As System.Net.DownloadProgressChangedEventArgs)
-        Public Event DownloadCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.AsyncCompletedEventArgs, ByVal Success As Boolean)
+#Region "Events"
+        Public Event GetUpdateInfoCompletedEvent As AsyncCompletedEventHandler
+        Public Event GetChangeLogCompletedEvent As AsyncCompletedEventHandler
+        Public Event GetAnnouncementInfoCompletedEvent As AsyncCompletedEventHandler
+        Public Event DownloadUpdateProgressChangedEvent As DownloadProgressChangedEventHandler
+        Public Event DownloadUpdateCompletedEvent As AsyncCompletedEventHandler
+#End Region
 
 #Region "Public Properties"
-        Private _curUI As Info
-        Public ReadOnly Property curUI() As Info
+        Private _currentUpdateInfo As UpdateInfo
+        Public ReadOnly Property CurrentUpdateInfo() As UpdateInfo
             Get
-                Return _curUI
+                Return _currentUpdateInfo
+            End Get
+        End Property
+
+        Private _changeLog As String
+        Public ReadOnly Property ChangeLog() As String
+            Get
+                Return _changeLog
+            End Get
+        End Property
+
+        Private _currentAnnouncementInfo As AnnouncementInfo
+        Public ReadOnly Property CurrentAnnouncementInfo() As AnnouncementInfo
+            Get
+                Return _currentAnnouncementInfo
+            End Get
+        End Property
+
+        Public ReadOnly Property IsGetUpdateInfoRunning() As Boolean
+            Get
+                If _getUpdateInfoThread IsNot Nothing Then
+                    If _getUpdateInfoThread.IsAlive Then Return True
+                End If
+                Return False
+            End Get
+        End Property
+
+        Public ReadOnly Property IsGetChangeLogRunning() As Boolean
+            Get
+                If _getChangeLogThread IsNot Nothing Then
+                    If _getChangeLogThread.IsAlive Then Return True
+                End If
+                Return False
+            End Get
+        End Property
+
+        Public ReadOnly Property IsGetAnnouncementInfoRunning() As Boolean
+            Get
+                If _getAnnouncementInfoThread IsNot Nothing Then
+                    If _getAnnouncementInfoThread.IsAlive Then Return True
+                End If
+                Return False
+            End Get
+        End Property
+
+        Public ReadOnly Property IsDownloadUpdateRunning() As Boolean
+            Get
+                Return (_downloadUpdateWebClient IsNot Nothing)
             End Get
         End Property
 #End Region
 
-#Region "Private Properties"
-        Private wCl As WebClient
-        Private wPr As WebProxy
-#End Region
-
 #Region "Public Methods"
-        Public Function IsProxyOK() As Boolean
-            Try
-                Dim uI As Info = GetUpdateInfo()
+        Public Sub New()
+            SetProxySettings()
+        End Sub
 
-                Return uI.InfoOk
+        Public Sub SetProxySettings()
+            SetProxySettings(My.Settings.UpdateUseProxy, My.Settings.UpdateProxyAddress, My.Settings.UpdateProxyPort, My.Settings.UpdateProxyUseAuthentication, My.Settings.UpdateProxyAuthUser, Security.Crypt.Decrypt(My.Settings.UpdateProxyAuthPass, Info.General.EncryptionKey))
+        End Sub
 
-                uI = Nothing
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsProxyOK (App.Update) failed" & vbNewLine & ex.Message, False)
-                Return False
-            End Try
-        End Function
-
-        Public Function IsUpdateAvailable() As Boolean
-            Try
-                Dim uI As Info = GetUpdateInfo()
-
-                If uI.InfoOk = False Then
-                    Return False
-                End If
-
-                If uI.Version > My.Application.Info.Version Then
-                    Return True
+        Public Sub SetProxySettings(ByVal useProxy As Boolean, ByVal address As String, ByVal port As Integer, ByVal useAuthentication As Boolean, ByVal username As String, ByVal password As String)
+            If useProxy And Not String.IsNullOrEmpty(address) Then
+                If Not port = 0 Then
+                    _webProxy = New WebProxy(address, port)
                 Else
-                    Return False
+                    _webProxy = New WebProxy(address)
                 End If
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "IsUpdateAvailable failed" & vbNewLine & ex.Message, True)
-                Return False
-            End Try
-        End Function
 
-        Public Function GetUpdateInfo() As Info
-            Try
-                Dim strUpdate As String = GetUpdateFile()
-
-                CreateWebClient()
-
-                Dim uI As New Info()
-
-                If strUpdate <> "" Then
-                    uI.InfoOk = True
-
-                    Try
-                        'get Version
-                        Dim strV As String = strUpdate.Substring(strUpdate.IndexOf("Version: ") + 9, strUpdate.IndexOf(vbNewLine) - 9)
-                        uI.Version = New Version(strV)
-
-                        strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                        'get Download URL
-                        Dim strU As String = ""
-
-                        strU = strUpdate.Substring(strUpdate.IndexOf("dURL: ") + 6, strUpdate.IndexOf(vbNewLine) - 6)
-
-                        uI.DownloadUrl = strU
-
-                        strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                        'get Change Log
-                        Dim strClURL As String = strUpdate.Substring(strUpdate.IndexOf("clURL: ") + 7, strUpdate.IndexOf(vbNewLine) - 7)
-                        Dim strCl As String = wCl.DownloadString(strClURL)
-                        uI.ChangeLog = strCl
-
-                        strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                        Try
-                            'get Image
-                            Dim strImgURL As String = strUpdate.Substring(strUpdate.IndexOf("imgURL: ") + 8, strUpdate.IndexOf(vbNewLine) - 8)
-                            uI.ImageURL = strImgURL
-
-                            strUpdate = strUpdate.Remove(0, strUpdate.IndexOf(vbNewLine) + 2)
-
-                            'get Image Link
-                            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)
-                        End Try
-                    Catch ex As Exception
-                        uI.InfoOk = False
-                    End Try
+                If useAuthentication Then
+                    _webProxy.Credentials = New NetworkCredential(username, password)
                 Else
-                    uI.InfoOk = False
+                    _webProxy.Credentials = Nothing
                 End If
-
-                _curUI = uI
-                Return uI
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Getting update info failed" & vbNewLine & ex.Message, True)
-                Return Nothing
-            End Try
-        End Function
-
-        Public Function DownloadUpdate(ByVal dURL As String) As Boolean
-            Try
-                CreateWebClient()
-
-                AddHandler wCl.DownloadProgressChanged, AddressOf DLProgressChanged
-                AddHandler wCl.DownloadFileCompleted, AddressOf DLCompleted
-
-                _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)
-                Return False
-            End Try
-        End Function
-#End Region
-
-#Region "Private Methods"
-        Private Sub CreateWebClient()
-            wCl = New WebClient()
-
-            If My.Settings.UpdateUseProxy Then
-                wPr = 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
-                End If
-
-                wCl.Proxy = wPr
+            Else
+                _webProxy = Nothing
             End If
         End Sub
 
-        Private Function GetUpdateFile() As String
-            Try
-                CreateWebClient()
+        Public Function IsUpdateAvailable() As Boolean
+            If _currentUpdateInfo Is Nothing OrElse Not _currentUpdateInfo.IsValid Then Return False
 
-                Dim strTemp As String
-
-                Try
-                    strTemp = wCl.DownloadString(App.Info.Update.URL & App.Info.Update.File)
-                Catch ex As Exception
-                    strTemp = ""
-                End Try
-
-                Return strTemp
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "GetUpdateFile failed" & vbNewLine & ex.Message, True)
-                Return ""
-            End Try
+            Return _currentUpdateInfo.Version > My.Application.Info.Version
         End Function
 
-        Private Sub DLProgressChanged(ByVal sender As Object, ByVal e As System.Net.DownloadProgressChangedEventArgs)
-            RaiseEvent DownloadProgressChanged(sender, e)
+        Public Function IsAnnouncementAvailable() As Boolean
+            If _currentAnnouncementInfo Is Nothing OrElse _
+                (Not _currentAnnouncementInfo.IsValid Or _
+                 String.IsNullOrEmpty(_currentAnnouncementInfo.Name)) Then Return False
+
+            Return (Not _currentAnnouncementInfo.Name = My.Settings.LastAnnouncement)
+        End Function
+
+        Public Sub GetUpdateInfoAsync()
+            If IsGetUpdateInfoRunning Then _getUpdateInfoThread.Abort()
+
+            _getUpdateInfoThread = New Thread(AddressOf GetUpdateInfo)
+            With _getUpdateInfoThread
+                .SetApartmentState(ApartmentState.STA)
+                .IsBackground = True
+                .Start()
+            End With
         End Sub
 
-        Private Sub DLCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.AsyncCompletedEventArgs)
-            Try
-                Dim fInfo As New FileInfo(_curUI.UpdateLocation)
+        Public Sub GetChangeLogAsync()
+            If _currentUpdateInfo Is Nothing OrElse Not _currentUpdateInfo.IsValid Then
+                Throw New InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling GetChangeLogAsync().")
+            End If
 
-                If fInfo.Length > 0 Then
-                    RaiseEvent DownloadCompleted(sender, e, True)
-                Else
-                    fInfo.Delete()
-                    RaiseEvent DownloadCompleted(sender, e, False)
-                End If
-            Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "DLCompleted failed" & vbNewLine & ex.Message, True)
-            End Try
+            If IsGetChangeLogRunning Then _getChangeLogThread.Abort()
+
+            _getChangeLogThread = New Thread(AddressOf GetChangeLog)
+            With _getChangeLogThread
+                .SetApartmentState(ApartmentState.STA)
+                .IsBackground = True
+                .Start()
+            End With
+        End Sub
+
+        Public Sub GetAnnouncementInfoAsync()
+            If IsGetAnnouncementInfoRunning Then _getAnnouncementInfoThread.Abort()
+
+            _getAnnouncementInfoThread = New Thread(AddressOf GetAnnouncementInfo)
+            With _getAnnouncementInfoThread
+                .SetApartmentState(ApartmentState.STA)
+                .IsBackground = True
+                .Start()
+            End With
+        End Sub
+
+        Public Sub DownloadUpdateAsync()
+            If _downloadUpdateWebClient IsNot Nothing Then
+                Throw New InvalidOperationException("A previous call to DownloadUpdateAsync() is still in progress.")
+            End If
+
+            If _currentUpdateInfo Is Nothing OrElse Not _currentUpdateInfo.IsValid Then
+                Throw New InvalidOperationException("CurrentUpdateInfo is not valid. GetUpdateInfoAsync() must be called before calling DownloadUpdateAsync().")
+            End If
+
+            _currentUpdateInfo.UpdateFilePath = Path.Combine(Path.GetTempPath(), Path.ChangeExtension(Path.GetRandomFileName, "exe"))
+            DownloadUpdateWebClient.DownloadFileAsync(CurrentUpdateInfo.DownloadAddress, _currentUpdateInfo.UpdateFilePath)
         End Sub
 #End Region
 
-        Public Class Info
-            Private _Version As Version
-            Public Property Version() As Version
-                Get
-                    Return _Version
-                End Get
-                Set(ByVal value As Version)
-                    _Version = value
-                End Set
-            End Property
+#Region "Private Properties"
+        Private _downloadUpdateWebClient As WebClient
+        Private ReadOnly Property DownloadUpdateWebClient() As WebClient
+            Get
+                If _downloadUpdateWebClient IsNot Nothing Then Return _downloadUpdateWebClient
 
-            Private _DownloadUrl As String
-            Public Property DownloadUrl() As String
-                Get
-                    Return _DownloadUrl
-                End Get
-                Set(ByVal value As String)
-                    _DownloadUrl = value
-                End Set
-            End Property
+                _downloadUpdateWebClient = CreateWebClient()
 
-            Private _UpdateLocation As String
-            Public Property UpdateLocation() As String
-                Get
-                    Return _UpdateLocation
-                End Get
-                Set(ByVal value As String)
-                    _UpdateLocation = value
-                End Set
-            End Property
+                AddHandler _downloadUpdateWebClient.DownloadProgressChanged, AddressOf DownloadUpdateProgressChanged
+                AddHandler _downloadUpdateWebClient.DownloadFileCompleted, AddressOf DownloadUpdateCompleted
 
-            Private _ChangeLog As String
-            Public Property ChangeLog() As String
-                Get
-                    Return _ChangeLog
-                End Get
-                Set(ByVal value As String)
-                    _ChangeLog = value
-                End Set
-            End Property
+                Return _downloadUpdateWebClient
+            End Get
+        End Property
+#End Region
 
-            Private _ImageURL As String
-            Public Property ImageURL() As String
-                Get
-                    Return _ImageURL
-                End Get
-                Set(ByVal value As String)
-                    _ImageURL = value
-                End Set
-            End Property
+#Region "Private Fields"
+        Private _webProxy As WebProxy
+        Private _getUpdateInfoThread As Thread
+        Private _getChangeLogThread As Thread
+        Private _getAnnouncementInfoThread As Thread
+#End Region
 
-            Private _ImageURLLink As String
-            Public Property ImageURLLink() As String
-                Get
-                    Return _ImageURLLink
-                End Get
-                Set(ByVal value As String)
-                    _ImageURLLink = value
-                End Set
-            End Property
+#Region "Private Methods"
+        Private Function CreateWebClient() As WebClient
+            Dim webClient As New WebClient
+            webClient.Headers.Add("user-agent", Info.General.UserAgent)
+            webClient.Proxy = _webProxy
+            Return webClient
+        End Function
 
-            Private _InfoOk As Boolean
-            Public Property InfoOk() As Boolean
-                Get
-                    Return _InfoOk
-                End Get
-                Set(ByVal value As Boolean)
-                    _InfoOk = value
-                End Set
-            End Property
+        Private Shared Function NewDownloadStringCompletedEventArgs(ByVal result As String, ByVal exception As Exception, ByVal cancelled As Boolean, ByVal userToken As Object) As DownloadStringCompletedEventArgs
+            Dim type As Type = GetType(DownloadStringCompletedEventArgs)
+            Const bindingFlags As BindingFlags = bindingFlags.NonPublic Or bindingFlags.Instance
+            Dim argumentTypes() As Type = {GetType(String), GetType(Exception), GetType(Boolean), GetType(Object)}
+            Dim constructor As ConstructorInfo = type.GetConstructor(bindingFlags, Nothing, argumentTypes, Nothing)
+            Dim arguments() As Object = {result, exception, cancelled, userToken}
+
+            Return constructor.Invoke(arguments)
+        End Function
+
+        Private Function DownloadString(ByVal address As Uri) As DownloadStringCompletedEventArgs
+            Dim webClient As WebClient = CreateWebClient()
+            Dim result As String = String.Empty
+            Dim exception As Exception = Nothing
+            Dim cancelled As Boolean = False
+
+            Try
+                result = webClient.DownloadString(address)
+            Catch ex As ThreadAbortException
+                cancelled = True
+            Catch ex As Exception
+                exception = ex
+            End Try
+
+            Return NewDownloadStringCompletedEventArgs(result, exception, cancelled, Nothing)
+        End Function
+
+        Private Sub GetUpdateInfo()
+            Dim updateFileUri As New Uri(New Uri(My.Settings.UpdateAddress), New Uri(Info.Update.FileName, UriKind.Relative))
+            Dim e As DownloadStringCompletedEventArgs = DownloadString(updateFileUri)
+
+            If Not e.Cancelled And e.Error Is Nothing Then
+                _currentUpdateInfo = UpdateInfo.FromString(e.Result)
+
+                My.Settings.CheckForUpdatesLastCheck = Date.UtcNow
+                If Not My.Settings.UpdatePending Then
+                    My.Settings.UpdatePending = IsUpdateAvailable()
+                End If
+            End If
+
+            RaiseEvent GetUpdateInfoCompletedEvent(Me, e)
+        End Sub
+
+        Private Sub GetChangeLog()
+            Dim e As DownloadStringCompletedEventArgs = DownloadString(_currentUpdateInfo.ChangeLogAddress)
+
+            If Not e.Cancelled And e.Error Is Nothing Then _changeLog = e.Result
+
+            RaiseEvent GetChangeLogCompletedEvent(Me, e)
+        End Sub
+
+        Private Sub GetAnnouncementInfo()
+            Dim announcementFileUri As New Uri(My.Settings.AnnouncementAddress)
+            Dim e As DownloadStringCompletedEventArgs = DownloadString(announcementFileUri)
+
+            If Not e.Cancelled And e.Error Is Nothing Then
+                _currentAnnouncementInfo = AnnouncementInfo.FromString(e.Result)
+
+                If Not String.IsNullOrEmpty(_currentAnnouncementInfo.Name) Then
+                    My.Settings.LastAnnouncement = _currentAnnouncementInfo.Name
+                End If
+            End If
+
+            RaiseEvent GetAnnouncementInfoCompletedEvent(Me, e)
+        End Sub
+
+        Private Sub DownloadUpdateProgressChanged(ByVal sender As Object, ByVal e As DownloadProgressChangedEventArgs)
+            RaiseEvent DownloadUpdateProgressChangedEvent(sender, e)
+        End Sub
+
+        Private Sub DownloadUpdateCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.AsyncCompletedEventArgs)
+            Dim raiseEventArgs As AsyncCompletedEventArgs = e
+
+            If Not e.Cancelled And e.Error Is Nothing Then
+                Try
+                    Dim updateAuthenticode As New Authenticode(_currentUpdateInfo.UpdateFilePath)
+                    With updateAuthenticode
+                        .RequireThumbprintMatch = True
+                        .ThumbprintToMatch = _currentUpdateInfo.CertificateThumbprint
+
+                        If Not .Verify() = Authenticode.StatusValue.Verified Then
+                            If .Status = Authenticode.StatusValue.UnhandledException Then
+                                Throw .Exception
+                            Else
+                                Throw New Exception(.StatusMessage)
+                            End If
+                        End If
+                    End With
+                Catch ex As Exception
+                    raiseEventArgs = New AsyncCompletedEventArgs(ex, False, Nothing)
+                End Try
+            End If
+
+            If raiseEventArgs.Cancelled Or raiseEventArgs.Error IsNot Nothing Then
+                File.Delete(_currentUpdateInfo.UpdateFilePath)
+            End If
+
+            RaiseEvent DownloadUpdateCompletedEvent(Me, raiseEventArgs)
+
+            _downloadUpdateWebClient.Dispose()
+            _downloadUpdateWebClient = Nothing
+        End Sub
+#End Region
+
+#Region "Public Classes"
+        Public Class UpdateInfo
+#Region "Public Properties"
+            Public Property IsValid As Boolean
+            Public Property Version As Version
+            Public Property DownloadAddress As Uri
+            Public Property UpdateFilePath As String
+            Public Property ChangeLogAddress As Uri
+            Public Property ImageAddress As Uri
+            Public Property ImageLinkAddress As Uri
+            Public Property CertificateThumbprint As String
+#End Region
+
+#Region "Public Methods"
+            Public Shared Function FromString(ByVal input As String) As UpdateInfo
+                Dim newInfo As New UpdateInfo
+                With newInfo
+                    If String.IsNullOrEmpty(input) Then
+                        .IsValid = False
+                    Else
+                        Dim updateFile As New UpdateFile(input)
+                        .Version = updateFile.GetVersion("Version")
+                        .DownloadAddress = updateFile.GetUri("dURL")
+                        .ChangeLogAddress = updateFile.GetUri("clURL")
+                        .ImageAddress = updateFile.GetUri("imgURL")
+                        .ImageLinkAddress = updateFile.GetUri("imgURLLink")
+                        .CertificateThumbprint = updateFile.GetThumbprint("CertificateThumbprint")
+                        .IsValid = True
+                    End If
+                End With
+                Return newInfo
+            End Function
+#End Region
         End Class
+
+        Public Class AnnouncementInfo
+#Region "Public Properties"
+            Public Property IsValid As Boolean
+            Public Property Name As String
+            Public Property Address As Uri
+#End Region
+
+#Region "Public Methods"
+            Public Shared Function FromString(ByVal input As String) As AnnouncementInfo
+                Dim newInfo As New AnnouncementInfo
+                With newInfo
+                    If String.IsNullOrEmpty(input) Then
+                        .IsValid = False
+                    Else
+                        Dim updateFile As New UpdateFile(input)
+                        .Name = updateFile.GetString("Name")
+                        .Address = updateFile.GetUri("URL")
+                        .IsValid = True
+                    End If
+                End With
+                Return newInfo
+            End Function
+#End Region
+        End Class
+#End Region
+
+#Region "Private Classes"
+        Private Class UpdateFile
+#Region "Public Properties"
+            Private ReadOnly _items As New Dictionary(Of String, String)(StringComparer.InvariantCultureIgnoreCase)
+            ' ReSharper disable MemberCanBePrivate.Local
+            Public ReadOnly Property Items() As Dictionary(Of String, String)
+                ' ReSharper restore MemberCanBePrivate.Local
+                Get
+                    Return _items
+                End Get
+            End Property
+#End Region
+
+#Region "Public Methods"
+            Public Sub New(ByVal content As String)
+                FromString(content)
+            End Sub
+
+            ' ReSharper disable MemberCanBePrivate.Local
+            Public Sub FromString(ByVal content As String)
+                ' ReSharper restore MemberCanBePrivate.Local
+                If String.IsNullOrEmpty(content) Then
+                Else
+                    Dim lineSeparators() As Char = New Char() {Chr(&HA), Chr(&HD)}
+                    Dim keyValueSeparators() As Char = New Char() {":", "="}
+                    Dim commentCharacters() As Char = New Char() {"#", ";", "'"}
+
+                    Dim lines() As String = content.Split(lineSeparators, StringSplitOptions.RemoveEmptyEntries)
+                    For Each line As String In lines
+                        line = line.Trim()
+                        If line.Length = 0 Then Continue For
+                        If Not line.Substring(0, 1).IndexOfAny(commentCharacters) = -1 Then Continue For
+
+                        Dim parts() As String = line.Split(keyValueSeparators, 2)
+                        If Not parts.Length = 2 Then Continue For
+                        Dim key As String = parts(0).Trim()
+                        Dim value As String = parts(1).Trim()
+
+                        _items.Add(key, value)
+                    Next
+                End If
+            End Sub
+
+            ' ReSharper disable MemberCanBePrivate.Local
+            Public Function GetString(ByVal key As String) As String
+                ' ReSharper restore MemberCanBePrivate.Local
+                If Not Items.ContainsKey(key) Then Return String.Empty
+                Return Items(key)
+            End Function
+
+            Public Function GetVersion(ByVal key As String) As Version
+                Dim value As String = GetString(key)
+                If String.IsNullOrEmpty(value) Then Return Nothing
+                Return New Version(value)
+            End Function
+
+            Public Function GetUri(ByVal key As String) As Uri
+                Dim value As String = GetString(key)
+                If String.IsNullOrEmpty(value) Then Return Nothing
+                Return New Uri(value)
+            End Function
+
+            Public Function GetThumbprint(ByVal key As String) As String
+                Return GetString(key).Replace(" ", "").ToUpperInvariant()
+            End Function
+#End Region
+        End Class
+#End Region
     End Class
 End Namespace

mRemoteV1/ApplicationEvents.vb

@@ -63,6 +63,5 @@
             End If
         End Sub
     End Class
-
 End Namespace
 

mRemoteV1/Config/Config.Connections.Load.vb

@@ -5,6 +5,7 @@ Imports mRemoteNG.App.Runtime
 Imports System.Data
 Imports System.Data.SqlClient
 Imports System.IO
+Imports PSTaskDialog
 
 Namespace Config
     Namespace Connections
@@ -18,8 +19,6 @@ Namespace Config
             Private sqlQuery As SqlCommand
             Private sqlRd As SqlDataReader
 
-            Private sqlDB As String = "mRemoteNG"
-
             Private selNode As TreeNode
 #End Region
 
@@ -44,6 +43,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
@@ -104,16 +113,6 @@ Namespace Config
                 End Set
             End Property
 
-            Private _Import As Boolean
-            Public Property Import() As Boolean
-                Get
-                    Return Me._Import
-                End Get
-                Set(ByVal value As Boolean)
-                    Me._Import = value
-                End Set
-            End Property
-
             Private _ConnectionList As Connection.List
             Public Property ConnectionList() As Connection.List
                 Get
@@ -156,30 +155,38 @@ Namespace Config
 #End Region
 
 #Region "Public Methods"
-            Public Sub Load()
+            Public Sub Load(ByVal import As Boolean)
                 If _UseSQL = True Then
                     LoadFromSQL()
                     SetMainFormText("SQL Server")
                 Else
                     Dim strCons As String = DecryptCompleteFile()
-                    LoadFromXML(strCons)
+                    LoadFromXML(strCons, import)
                 End If
 
-                If Import = False Then
+                If import = False Then
                     SetMainFormText(ConnectionFileName)
+                    PuttySessions.AddSessionsToTree()
                 End If
             End Sub
 #End Region
 
 #Region "SQL"
+            Private Delegate Sub LoadFromSqlDelegate()
             Private Sub LoadFromSQL()
+                If Windows.treeForm Is Nothing OrElse Windows.treeForm.tvConnections Is Nothing Then Return
+                If Windows.treeForm.tvConnections.InvokeRequired Then
+                    Windows.treeForm.tvConnections.Invoke(New LoadFromSqlDelegate(AddressOf LoadFromSQL))
+                    Return
+                End If
+
                 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()
@@ -198,8 +205,12 @@ Namespace Config
                         sqlRd.Read()
                     End If
 
-                    Dim enCulture As CultureInfo = New CultureInfo("en-US")
-                    Me.confVersion = Convert.ToDouble(sqlRd.Item("confVersion"), enCulture)
+                    confVersion = Convert.ToDouble(sqlRd.Item("confVersion"), CultureInfo.InvariantCulture)
+                    Const maxSupportedSchemaVersion As Double = 2.5
+                    If confVersion > maxSupportedSchemaVersion Then
+                        cTaskDialog.ShowTaskDialogBox(frmMain, Application.ProductName, "Incompatible database schema", String.Format("The database schema on the server is not supported. Please upgrade to a newer version of {0}.", Application.ProductName), String.Format("Schema Version: {1}{0}Highest Supported Version: {2}", vbNewLine, confVersion.ToString(), maxSupportedSchemaVersion.ToString()), "", "", "", "", eTaskDialogButtons.OK, eSysIcons.Error, Nothing)
+                        Throw New Exception(String.Format("Incompatible database schema (schema version {0}).", confVersion))
+                    End If
 
                     Dim rootNode As TreeNode
                     rootNode = New TreeNode(sqlRd.Item("Name"))
@@ -228,9 +239,11 @@ Namespace Config
 
                     sqlRd.Close()
 
+                    Windows.treeForm.tvConnections.BeginUpdate()
+
                     ' SECTION 3. Populate the TreeView with the DOM nodes.
                     AddNodesFromSQL(rootNode)
-                    'AddNodeFromXML(xDom.DocumentElement, Me._RootTreeNode)
+                    'AddNodeFromXml(xDom.DocumentElement, Me._RootTreeNode)
 
                     rootNode.Expand()
 
@@ -241,6 +254,8 @@ Namespace Config
                         End If
                     Next
 
+                    Windows.treeForm.tvConnections.EndUpdate()
+
                     'open connections from last mremote session
                     If My.Settings.OpenConsFromLastSession = True And My.Settings.NoReconnect = False Then
                         For Each conI As Connection.Info In Me._ConnectionList
@@ -256,12 +271,14 @@ 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, My.Resources.strLoadFromSqlFailed & vbNewLine & ex.Message, True)
+                    Throw
+                Finally
+                    If sqlCon IsNot Nothing Then
+                        sqlCon.Close()
+                    End If
                 End Try
             End Sub
 
@@ -307,7 +324,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)
 
@@ -348,7 +365,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")
@@ -386,7 +403,10 @@ Namespace Config
                             tNode.SelectedImageIndex = Images.Enums.TreeImage.Container
                         End If
 
-                        If sqlRd.Item("ParentID") <> 0 Then
+                        Dim parentId As String = sqlRd.Item("ParentID").ToString().Trim()
+                        If String.IsNullOrEmpty(parentId) Or parentId = "0" Then
+                            baseNode.Nodes.Add(tNode)
+                        Else
                             Dim pNode As TreeNode = Tree.Node.GetNodeFromConstantID(sqlRd.Item("ParentID"))
 
                             If pNode IsNot Nothing Then
@@ -400,14 +420,12 @@ Namespace Config
                             Else
                                 baseNode.Nodes.Add(tNode)
                             End If
-                        Else
-                            baseNode.Nodes.Add(tNode)
                         End If
 
                         'AddNodesFromSQL(tNode)
                     End While
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strAddNodesFromSqlFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodesFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -426,8 +444,6 @@ Namespace Config
                         conI.Domain = .Item("DomainName")
                         conI.DisplayWallpaper = .Item("DisplayWallpaper")
                         conI.DisplayThemes = .Item("DisplayThemes")
-                        conI.EnableFontSmoothing = .Item("EnableFontSmoothing")
-                        conI.EnableDesktopComposition = .Item("EnableDesktopComposition")
                         conI.CacheBitmaps = .Item("CacheBitmaps")
                         conI.UseConsoleSession = .Item("ConnectToConsole")
 
@@ -451,8 +467,6 @@ Namespace Config
                         conI.Inherit.Description = .Item("InheritDescription")
                         conI.Inherit.DisplayThemes = .Item("InheritDisplayThemes")
                         conI.Inherit.DisplayWallpaper = .Item("InheritDisplayWallpaper")
-                        conI.Inherit.EnableFontSmoothing = .Item("InheritEnableFontSmoothing")
-                        conI.Inherit.EnableDesktopComposition = .Item("InheritEnableDesktopComposition")
                         conI.Inherit.Domain = .Item("InheritDomain")
                         conI.Inherit.Icon = .Item("InheritIcon")
                         conI.Inherit.Panel = .Item("InheritPanel")
@@ -549,6 +563,25 @@ 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 confVersion >= 2.5 Then
+                            conI.LoadBalanceInfo = .Item("LoadBalanceInfo")
+                            conI.AutomaticResize = .Item("AutomaticResize")
+                            conI.Inherit.LoadBalanceInfo = .Item("InheritLoadBalanceInfo")
+                            conI.Inherit.AutomaticResize = .Item("InheritAutomaticResize")
+                        End If
+
                         If SQLUpdate = True Then
                             conI.PleaseConnect = .Item("Connected")
                         End If
@@ -556,7 +589,7 @@ Namespace Config
 
                     Return conI
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strGetConnectionInfoFromSqlFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strGetConnectionInfoFromSqlFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Return Nothing
@@ -611,9 +644,9 @@ Namespace Config
                 Return ""
             End Function
 
-            Private Sub LoadFromXML(Optional ByVal cons As String = "")
+            Private Sub LoadFromXML(ByVal cons As String, ByVal import As Boolean)
                 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()
@@ -624,20 +657,27 @@ Namespace Config
                     End If
 
                     If xDom.DocumentElement.HasAttribute("ConfVersion") Then
-                        Dim enCulture As System.Globalization.CultureInfo = New CultureInfo("en-US")
-                        Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value, enCulture)
+                        Me.confVersion = Convert.ToDouble(xDom.DocumentElement.Attributes("ConfVersion").Value.Replace(",", "."), CultureInfo.InvariantCulture)
                     Else
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strOldConffile)
+                        MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strOldConffile)
+                    End If
+
+                    Const maxSupportedConfVersion As Double = 2.5
+                    If confVersion > maxSupportedConfVersion Then
+                        cTaskDialog.ShowTaskDialogBox(frmMain, Application.ProductName, "Incompatible connection file format", String.Format("The format of this connection file is not supported. Please upgrade to a newer version of {0}.", Application.ProductName), String.Format("{1}{0}File Format Version: {2}{0}Highest Supported Version: {3}", vbNewLine, ConnectionFileName, confVersion.ToString(), maxSupportedConfVersion.ToString()), "", "", "", "", eTaskDialogButtons.OK, eSysIcons.Error, Nothing)
+                        Throw New Exception(String.Format("Incompatible connection file format (file format version {0}).", confVersion))
                     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
@@ -650,35 +690,35 @@ 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
                     End If
 
-                    Dim imp As Boolean = False
-
-                    If Me.confVersion > 0.9 Then '1.0
+                    Dim isExportFile As Boolean = False
+                    If confVersion >= 1.0 Then
                         If xDom.DocumentElement.Attributes("Export").Value = True Then
-                            imp = True
+                            isExportFile = True
                         End If
                     End If
 
-                    If Me._Import = True And imp = False Then
-                        mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strCannotImportNormalSessionFile)
-
-                        Exit Sub
+                    If import And Not isExportFile Then
+                        MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strCannotImportNormalSessionFile)
+                        Return
                     End If
 
-                    If imp = False Then
-                        Me._RootTreeNode.Text = rootNode.Text
-                        Me._RootTreeNode.Tag = rootNode.Tag
-                        Me._RootTreeNode.ImageIndex = Images.Enums.TreeImage.Root
-                        Me._RootTreeNode.SelectedImageIndex = Images.Enums.TreeImage.Root
+                    If Not isExportFile Then
+                        _RootTreeNode.Text = rootNode.Text
+                        _RootTreeNode.Tag = rootNode.Tag
+                        _RootTreeNode.ImageIndex = Images.Enums.TreeImage.Root
+                        _RootTreeNode.SelectedImageIndex = Images.Enums.TreeImage.Root
                     End If
 
+                    Windows.treeForm.tvConnections.BeginUpdate()
+
                     ' SECTION 3. Populate the TreeView with the DOM nodes.
-                    AddNodeFromXML(xDom.DocumentElement, Me._RootTreeNode)
+                    AddNodeFromXml(xDom.DocumentElement, _RootTreeNode)
 
                     Me._RootTreeNode.Expand()
 
@@ -689,6 +729,8 @@ Namespace Config
                         End If
                     Next
 
+                    Windows.treeForm.tvConnections.EndUpdate()
+
                     'open connections from last mremote session
                     If My.Settings.OpenConsFromLastSession = True And My.Settings.NoReconnect = False Then
                         For Each conI As Connection.Info In Me._ConnectionList
@@ -700,87 +742,89 @@ 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, My.Resources.strLoadFromXmlFailed & 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, My.Resources.strAddNodeFromXmlFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strAddNodeFromXmlFailed & vbNewLine & ex.Message & ex.StackTrace, True)
+                    Throw
                 End Try
             End Sub
 
@@ -920,7 +964,7 @@ Namespace Config
                             conI.Inherit = New Connection.Info.Inheritance(conI, .Attributes("Inherit").Value)
 
                             conI.Icon = .Attributes("Icon").Value.Replace(".ico", "")
-                            conI.Panel = My.Resources.strGeneral
+                            conI.Panel = My.Language.strGeneral
                         End If
 
                         If Me.confVersion > 1.4 Then '1.5
@@ -1014,9 +1058,21 @@ Namespace Config
                             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
+
+                        If confVersion >= 2.5 Then
+                            conI.LoadBalanceInfo = .Attributes("LoadBalanceInfo").Value
+                            conI.AutomaticResize = .Attributes("AutomaticResize").Value
+                            conI.Inherit.LoadBalanceInfo = .Attributes("InheritLoadBalanceInfo").Value
+                            conI.Inherit.AutomaticResize = .Attributes("InheritAutomaticResize").Value
+                        End If
                     End With
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Resources.strGetConnectionInfoFromXmlFailed, conI.Name, Me.ConnectionFileName, ex.Message), False)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Language.strGetConnectionInfoFromXmlFailed, conI.Name, Me.ConnectionFileName, ex.Message), False)
                 End Try
                 Return conI
             End Function

mRemoteV1/Config/Config.Settings.Load.vb

@@ -29,7 +29,11 @@ Namespace Config
                     With Me._MainForm
                         ' Migrate settings from previous version
                         If My.Settings.DoUpgrade Then
-                            My.Settings.Upgrade()
+                            Try
+                                My.Settings.Upgrade()
+                            Catch ex As Exception
+                                Log.Error("My.Settings.Upgrade() failed" & vbNewLine & ex.Message)
+                            End Try
                             My.Settings.DoUpgrade = False
 
                             ' Clear pending update flag
@@ -38,6 +42,14 @@ Namespace Config
                             My.Settings.UpdatePending = False
                         End If
 
+                        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
+
+                        Themes.ThemeManager.LoadTheme(My.Settings.ThemeName)
+
                         .WindowState = FormWindowState.Normal
                         If My.Settings.MainFormState = FormWindowState.Normal Then
                             If Not My.Settings.MainFormLocation.IsEmpty Then .Location = My.Settings.MainFormLocation
@@ -72,17 +84,18 @@ Namespace Config
                         .Location = newBounds.Location
 
                         If My.Settings.MainFormKiosk = True Then
-                            Tools.Misc.Fullscreen.EnterFullscreen()
+                            .Fullscreen.Value = True
+                            .mMenViewFullscreen.Checked = True
                         End If
 
                         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 = App.Info.General.PuttyPath
                         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
@@ -95,6 +108,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
@@ -102,8 +119,7 @@ Namespace Config
                         End If
                     End With
                 Catch ex As Exception
-                    App.Runtime.log.Error("Loading settings failed" & vbNewLine & ex.Message)
-                    'mC.AddMessage(Messages.MessageClass.ErrorMsg, "Loading settings failed" & vbNewLine & ex.Message, True)
+                    Log.Error("Loading settings failed" & vbNewLine & ex.Message)
                 End Try
             End Sub
 
@@ -111,8 +127,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
 
@@ -137,8 +153,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
 
@@ -184,8 +200,7 @@ Namespace Config
                         End If
                     End With
                 Catch ex As Exception
-                    App.Runtime.log.Error("LoadPanelsFromXML failed" & vbNewLine & ex.Message)
-                    'mC.AddMessage(Messages.MessageClass.ErrorMsg, "LoadPanelsFromXML failed" & vbNewLine & ex.Message, True)
+                    Log.Error("LoadPanelsFromXML failed" & vbNewLine & ex.Message)
                 End Try
             End Sub
 
@@ -204,7 +219,7 @@ Namespace Config
                 End If
 
                 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
@@ -217,14 +232,14 @@ 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
 
@@ -256,8 +271,7 @@ Namespace Config
                         Return Windows.screenshotPanel
                     End If
                 Catch ex As Exception
-                    App.Runtime.log.Error("GetContentFromPersistString failed" & vbNewLine & ex.Message)
-                    'mC.AddMessage(Messages.MessageClass.ErrorMsg, "GetContentFromPersistString failed" & vbNewLine & ex.Message, True)
+                    Log.Error("GetContentFromPersistString failed" & vbNewLine & ex.Message)
                 End Try
 
                 Return Nothing

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,32 +1,15 @@
 Imports mRemoteNG.App.Runtime
 Imports System.Xml
 Imports System.IO
-Imports mRemoteNG.Tools.WindowPlacement
 
 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
-                        Dim windowPlacement As New Tools.WindowPlacement(_MainForm)
+                    With frmMain
+                        Dim windowPlacement As New Tools.WindowPlacement(frmMain)
                         If .WindowState = FormWindowState.Minimized And windowPlacement.RestoreToMaximized Then
                             .Opacity = 0
                             .WindowState = FormWindowState.Maximized
@@ -42,18 +25,18 @@ Namespace Config
 
                         My.Settings.MainFormState = .WindowState
 
-                        My.Settings.MainFormKiosk = Tools.Misc.Fullscreen.FullscreenActive
+                        My.Settings.MainFormKiosk = .Fullscreen.Value
 
                         My.Settings.FirstStart = False
                         My.Settings.ResetPanels = False
                         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
@@ -62,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
@@ -75,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
 
@@ -85,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
 
@@ -97,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/Config/ConfirmClose.vb

@@ -0,0 +1,9 @@
+Namespace Config
+    Public Enum ConfirmClose
+        Unspecified = 0
+        Never = 1
+        [Exit] = 2
+        Multiple = 3
+        All = 4
+    End Enum
+End Namespace

mRemoteV1/Config/PuttySessions.vb

@@ -0,0 +1,243 @@
+Imports System.ComponentModel
+Imports System.Management
+Imports mRemoteNG.Messages
+Imports Microsoft.Win32
+Imports mRemoteNG.Connection.Protocol
+Imports mRemoteNG.My
+Imports mRemoteNG.App.Runtime
+Imports System.Security.Principal
+
+Namespace Config
+    Public Class PuttySessions
+        Private Const PuttySessionsKey As String = "Software\SimonTatham\PuTTY\Sessions"
+        Private Shared _rootTreeNode As TreeNode
+        Private Shared _eventWatcher As ManagementEventWatcher
+
+        Private Delegate Sub AddSessionsToTreeDelegate()
+        Public Shared Sub AddSessionsToTree()
+            Dim treeView As TreeView = Tree.Node.TreeView
+            If treeView Is Nothing Then Return
+            If treeView.InvokeRequired Then
+                treeView.Invoke(New AddSessionsToTreeDelegate(AddressOf AddSessionsToTree))
+                Return
+            End If
+
+            Dim savedSessions As New List(Of Connection.Info)(LoadSessions())
+            If savedSessions Is Nothing OrElse savedSessions.Count = 0 Then Return
+
+            Dim puttyRootInfo As New Root.PuttySessions.Info()
+            If String.IsNullOrEmpty(My.Settings.PuttySavedSessionsName) Then
+                puttyRootInfo.Name = Language.strPuttySavedSessionsRootName
+            Else
+                puttyRootInfo.Name = My.Settings.PuttySavedSessionsName
+            End If
+            If String.IsNullOrEmpty(My.Settings.PuttySavedSessionsPanel) Then
+                puttyRootInfo.Panel = Language.strGeneral
+            Else
+                puttyRootInfo.Panel = My.Settings.PuttySavedSessionsPanel
+            End If
+
+            Dim inUpdate As Boolean = False
+
+            If _rootTreeNode Is Nothing Then
+                _rootTreeNode = New TreeNode
+                _rootTreeNode.Name = puttyRootInfo.Name
+                _rootTreeNode.Text = puttyRootInfo.Name
+                _rootTreeNode.Tag = puttyRootInfo
+                _rootTreeNode.ImageIndex = Images.Enums.TreeImage.PuttySessions
+                _rootTreeNode.SelectedImageIndex = Images.Enums.TreeImage.PuttySessions
+            End If
+
+            If Not treeView.Nodes.Contains(_rootTreeNode) Then
+                If Not inUpdate Then
+                    treeView.BeginUpdate()
+                    inUpdate = True
+                End If
+                treeView.Nodes.Add(_rootTreeNode)
+            End If
+
+            puttyRootInfo.TreeNode = _rootTreeNode
+
+            Dim newTreeNodes As New List(Of TreeNode)
+            For Each sessionInfo As Connection.PuttySession.Info In savedSessions
+                Dim treeNode As TreeNode
+                Dim isNewNode As Boolean
+                If _rootTreeNode.Nodes.ContainsKey(sessionInfo.Name) Then
+                    treeNode = _rootTreeNode.Nodes.Item(sessionInfo.Name)
+                    isNewNode = False
+                Else
+                    treeNode = Tree.Node.AddNode(Tree.Node.Type.PuttySession, sessionInfo.Name)
+                    If treeNode Is Nothing Then Continue For
+                    treeNode.Name = treeNode.Text
+                    treeNode.ImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                    treeNode.SelectedImageIndex = Images.Enums.TreeImage.ConnectionClosed
+                    isNewNode = True
+                End If
+
+                sessionInfo.RootPuttySessionsInfo = puttyRootInfo
+                sessionInfo.TreeNode = treeNode
+                sessionInfo.Inherit.TurnOffInheritanceCompletely()
+
+                treeNode.Tag = sessionInfo
+
+                If isNewNode Then newTreeNodes.Add(treeNode)
+            Next
+
+            For Each treeNode As TreeNode In _rootTreeNode.Nodes
+                If Not savedSessions.Contains(treeNode.Tag) Then
+                    If Not inUpdate Then
+                        treeView.BeginUpdate()
+                        inUpdate = True
+                    End If
+                    _rootTreeNode.Nodes.Remove(treeNode)
+                End If
+            Next
+
+            If Not newTreeNodes.Count = 0 Then
+                If Not inUpdate Then
+                    treeView.BeginUpdate()
+                    inUpdate = True
+                End If
+                _rootTreeNode.Nodes.AddRange(newTreeNodes.ToArray())
+            End If
+
+            If inUpdate Then
+                Tree.Node.Sort(_rootTreeNode, SortOrder.Ascending)
+                _rootTreeNode.Expand()
+                treeView.EndUpdate()
+            End If
+        End Sub
+
+        Protected Shared Function GetSessionNames(Optional ByVal raw As Boolean = False) As String()
+            Dim sessionsKey As RegistryKey = Registry.CurrentUser.OpenSubKey(PuttySessionsKey)
+            If sessionsKey Is Nothing Then Return New String() {}
+
+            Dim sessionNames As New List(Of String)
+            For Each sessionName As String In sessionsKey.GetSubKeyNames()
+                If raw Then
+                    sessionNames.Add(sessionName)
+                Else
+                    sessionNames.Add(Web.HttpUtility.UrlDecode(sessionName.Replace("+", "%2B")))
+                End If
+            Next
+
+            If raw Then
+                If Not sessionNames.Contains("Default%20Settings") Then ' Do not localize
+                    sessionNames.Insert(0, "Default%20Settings")
+                End If
+            Else
+                If Not sessionNames.Contains("Default Settings") Then
+                    sessionNames.Insert(0, "Default Settings")
+                End If
+            End If
+
+            Return sessionNames.ToArray()
+        End Function
+
+        Protected Shared Function LoadSessions() As Connection.PuttySession.Info()
+            Dim sessionList As New List(Of Connection.PuttySession.Info)
+            Dim sessionInfo As Connection.Info
+            For Each sessionName As String In GetSessionNames(True)
+                sessionInfo = SessionToConnectionInfo(sessionName)
+                If sessionInfo Is Nothing OrElse String.IsNullOrEmpty(sessionInfo.Hostname) Then Continue For
+                sessionList.Add(sessionInfo)
+            Next
+            Return sessionList.ToArray()
+        End Function
+
+        Protected Shared Function SessionToConnectionInfo(ByVal sessionName As String) As Connection.PuttySession.Info
+            Dim sessionsKey As RegistryKey = Registry.CurrentUser.OpenSubKey(PuttySessionsKey)
+            If sessionsKey Is Nothing Then Return Nothing
+
+            Dim sessionKey As RegistryKey = sessionsKey.OpenSubKey(sessionName)
+            If sessionKey Is Nothing Then Return Nothing
+
+            sessionName = Web.HttpUtility.UrlDecode(sessionName.Replace("+", "%2B"))
+
+            Dim sessionInfo As New Connection.PuttySession.Info
+            With sessionInfo
+                .PuttySession = sessionName
+                .Name = sessionName
+                .Hostname = sessionKey.GetValue("HostName")
+                .Username = sessionKey.GetValue("UserName")
+                Dim protocol As String = sessionKey.GetValue("Protocol")
+                If protocol Is Nothing Then protocol = "ssh"
+                Select Case protocol.ToLowerInvariant()
+                    Case "raw"
+                        .Protocol = Protocols.RAW
+                    Case "rlogin"
+                        .Protocol = Protocols.Rlogin
+                    Case "serial"
+                        Return Nothing
+                    Case "ssh"
+                        Dim sshVersionObject As Object = sessionKey.GetValue("SshProt")
+                        If sshVersionObject IsNot Nothing Then
+                            Dim sshVersion As Integer = CType(sshVersionObject, Integer)
+                            If sshVersion >= 2 Then
+                                .Protocol = Protocols.SSH2
+                            Else
+                                .Protocol = Protocols.SSH1
+                            End If
+                        Else
+                            .Protocol = Protocols.SSH2
+                        End If
+                    Case "telnet"
+                        .Protocol = Protocols.Telnet
+                    Case Else
+                        Return Nothing
+                End Select
+                .Port = sessionKey.GetValue("PortNumber")
+            End With
+
+            Return sessionInfo
+        End Function
+
+        Public Shared Sub StartWatcher()
+            If _eventWatcher IsNot Nothing Then Return
+
+            Try
+                Dim currentUserSid As String = WindowsIdentity.GetCurrent().User.Value
+                Dim key As String = String.Join("\", {currentUserSid, PuttySessionsKey}).Replace("\", "\\")
+                Dim query As New WqlEventQuery(String.Format("SELECT * FROM RegistryTreeChangeEvent WHERE Hive = 'HKEY_USERS' AND RootPath = '{0}'", key))
+                _eventWatcher = New ManagementEventWatcher(query)
+                AddHandler _eventWatcher.EventArrived, AddressOf OnManagementEventArrived
+                _eventWatcher.Start()
+            Catch ex As Exception
+                MessageCollector.AddExceptionMessage("PuttySessions.Watcher.StartWatching() failed.", ex, MessageClass.WarningMsg, True)
+            End Try
+        End Sub
+
+        Public Shared Sub StopWatcher()
+            If _eventWatcher Is Nothing Then Return
+            _eventWatcher.Stop()
+            _eventWatcher.Dispose()
+            _eventWatcher = Nothing
+        End Sub
+
+        Private Shared Sub OnManagementEventArrived(ByVal sender As Object, ByVal e As EventArrivedEventArgs)
+            AddSessionsToTree()
+        End Sub
+
+        Public Class SessionList
+            Inherits StringConverter
+
+            Public Shared ReadOnly Property Names() As String()
+                Get
+                    Return GetSessionNames()
+                End Get
+            End Property
+
+            Public Overloads Overrides Function GetStandardValues(ByVal context As System.ComponentModel.ITypeDescriptorContext) As System.ComponentModel.TypeConverter.StandardValuesCollection
+                Return New StandardValuesCollection(Names)
+            End Function
+
+            Public Overloads Overrides Function GetStandardValuesExclusive(ByVal context As System.ComponentModel.ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+
+            Public Overloads Overrides Function GetStandardValuesSupported(ByVal context As ITypeDescriptorContext) As Boolean
+                Return True
+            End Function
+        End Class
+    End Class
+End Namespace

mRemoteV1/Connection/Connection.Icon.vb

@@ -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.Info.vb

@@ -8,17 +8,17 @@ Namespace Connection
     Public Class Info
 #Region "Properties"
 #Region "1 Display"
-        Private _Name As String = My.Resources.strNewConnection
+        Private _name As String = My.Language.strNewConnection
         <LocalizedCategory("strCategoryDisplay", 1), _
             Browsable(True), _
             LocalizedDisplayName("strPropertyNameName"), _
             LocalizedDescription("strPropertyDescriptionName")> _
-        Public Property Name() As String
+        Public Overridable Property Name() As String
             Get
-                Return Me._Name
+                Return _name
             End Get
             Set(ByVal value As String)
-                Me._Name = value
+                _name = value
             End Set
         End Property
 
@@ -27,7 +27,7 @@ Namespace Connection
             Browsable(True), _
             LocalizedDisplayName("strPropertyNameDescription"), _
             LocalizedDescription("strPropertyDescriptionDescription")> _
-        Public Property Description() As String
+        Public Overridable Property Description() As String
             Get
                 If Me._Inherit.Description And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -54,7 +54,7 @@ Namespace Connection
             Browsable(True), _
             LocalizedDisplayName("strPropertyNameIcon"), _
             LocalizedDescription("strPropertyDescriptionIcon")> _
-        Public Property Icon() As String
+        Public Overridable Property Icon() As String
             Get
                 If Me._Inherit.Icon And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -75,12 +75,12 @@ Namespace Connection
             End Set
         End Property
 
-        Private _Panel As String = My.Resources.strGeneral
+        Private _Panel As String = My.Language.strGeneral
         <LocalizedCategory("strCategoryDisplay", 1), _
             Browsable(True), _
             LocalizedDisplayName("strPropertyNamePanel"), _
             LocalizedDescription("strPropertyDescriptionPanel")> _
-            Public Property Panel() As String
+        Public Overridable Property Panel() As String
             Get
                 If Me._Inherit.Panel And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -102,17 +102,18 @@ Namespace Connection
         End Property
 #End Region
 #Region "2 Connection"
-        Private _Hostname As String = ""
+        Private _hostname As String = ""
         <LocalizedCategory("strCategoryConnection", 2), _
             Browsable(True), _
             LocalizedDisplayName("strPropertyNameAddress"), _
             LocalizedDescription("strPropertyDescriptionAddress")> _
-        Public Property Hostname() As String
+        Public Overridable Property Hostname() As String
             Get
-                Return Me._Hostname
+                Return _hostname.Trim()
             End Get
             Set(ByVal value As String)
-                Me._Hostname = value
+                If String.IsNullOrEmpty(value) Then _hostname = ""
+                _hostname = value.Trim()
             End Set
         End Property
 
@@ -121,7 +122,7 @@ Namespace Connection
             Browsable(True), _
             LocalizedDisplayName("strPropertyNameUsername"), _
             LocalizedDescription("strPropertyDescriptionUsername")> _
-        Public Property Username() As String
+        Public Overridable Property Username() As String
             Get
                 If Me._Inherit.Username And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -132,13 +133,13 @@ Namespace Connection
                         parCon = parCont.ConnectionInfo
                     End If
 
-                    Return parCon.Username
+                    Return parCon.Username.Trim()
                 Else
-                    Return Me._Username
+                    Return Me._Username.Trim()
                 End If
             End Get
             Set(ByVal value As String)
-                Me._Username = value
+                Me._Username = value.Trim()
             End Set
         End Property
 
@@ -148,7 +149,7 @@ Namespace Connection
             LocalizedDisplayName("strPropertyNamePassword"), _
             LocalizedDescription("strPropertyDescriptionPassword"), _
             PasswordPropertyText(True)> _
-        Public Property Password() As String
+        Public Overridable Property Password() As String
             Get
                 If Me._Inherit.Password And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -185,13 +186,13 @@ Namespace Connection
                         parCon = parCont.ConnectionInfo
                     End If
 
-                    Return parCon.Domain
+                    Return parCon.Domain.Trim()
                 Else
-                    Return Me._Domain
+                    Return Me._Domain.Trim()
                 End If
             End Get
             Set(ByVal value As String)
-                Me._Domain = value
+                Me._Domain = value.Trim()
             End Set
         End Property
 #End Region
@@ -202,7 +203,7 @@ Namespace Connection
             LocalizedDisplayName("strPropertyNameProtocol"), _
             LocalizedDescription("strPropertyDescriptionProtocol"), _
             TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
-        Public Property Protocol() As Connection.Protocol.Protocols
+        Public Overridable Property Protocol() As Connection.Protocol.Protocols
             Get
                 If Me._Inherit.Protocol And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -255,7 +256,7 @@ Namespace Connection
             Browsable(True), _
             LocalizedDisplayName("strPropertyNamePort"), _
             LocalizedDescription("strPropertyDescriptionPort")> _
-        Public Property Port() As Integer
+        Public Overridable Property Port() As Integer
             Get
                 If Me._Inherit.Port And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -281,8 +282,8 @@ Namespace Connection
             Browsable(True), _
             LocalizedDisplayName("strPropertyNamePuttySession"), _
             LocalizedDescription("strPropertyDescriptionPuttySession"), _
-            TypeConverter(GetType(mRemoteNG.Connection.PuttySession))> _
-        Public Property PuttySession() As String
+            TypeConverter(GetType(Config.PuttySessions.SessionList))> _
+        Public Overridable Property PuttySession() As String
             Get
                 If Me._Inherit.PuttySession And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -384,6 +385,32 @@ Namespace Connection
             End Set
         End Property
 
+        Private _loadBalanceInfo As String = My.Settings.ConDefaultLoadBalanceInfo
+        <LocalizedCategory("strCategoryProtocol", 3), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameLoadBalanceInfo"), _
+            LocalizedDescription("strPropertyDescriptionLoadBalanceInfo")> _
+        Public Property LoadBalanceInfo() As String
+            Get
+                If _Inherit.LoadBalanceInfo And _Parent IsNot Nothing Then
+                    Dim parCon As Info = TryCast(_Parent, Container.Info).ConnectionInfo
+
+                    If _IsContainer = True Then
+                        Dim curCont As Container.Info = _Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.LoadBalanceInfo.Trim()
+                Else
+                    Return _loadBalanceInfo.Trim()
+                End If
+            End Get
+            Set(ByVal value As String)
+                _loadBalanceInfo = value.Trim()
+            End Set
+        End Property
+
         Private _RenderingEngine As Connection.Protocol.HTTPBase.RenderingEngine = Tools.Misc.StringToEnum(GetType(mRemoteNG.Connection.Protocol.HTTPBase.RenderingEngine), My.Settings.ConDefaultRenderingEngine)
         <LocalizedCategory("strCategoryProtocol", 3), _
             Browsable(True), _
@@ -410,6 +437,33 @@ Namespace Connection
                 _RenderingEngine = value
             End Set
         End Property
+
+        Private _useCredSsp As Boolean = My.Settings.ConDefaultUseCredSsp
+        <LocalizedCategory("strCategoryProtocol", 3), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameUseCredSsp"), _
+            LocalizedDescription("strPropertyDescriptionUseCredSsp"), _
+            TypeConverter(GetType(mRemoteNG.Tools.Misc.YesNoTypeConverter))> _
+        Public Property UseCredSsp() As Boolean
+            Get
+                If Me._Inherit.UseCredSsp And Me._Parent IsNot Nothing Then
+                    Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
+
+                    If Me._IsContainer = True Then
+                        Dim curCont As Container.Info = Me._Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.UseCredSsp
+                Else
+                    Return Me._useCredSsp
+                End If
+            End Get
+            Set(ByVal value As Boolean)
+                Me._useCredSsp = value
+            End Set
+        End Property
 #End Region
 #Region "4 RD Gateway"
         Private _RDGatewayUsageMethod As mRemoteNG.Connection.Protocol.RDP.RDGatewayUsageMethod = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDGatewayUsageMethod), My.Settings.ConDefaultRDGatewayUsageMethod)
@@ -455,13 +509,13 @@ Namespace Connection
                         parCon = parCont.ConnectionInfo
                     End If
 
-                    Return parCon.RDGatewayHostname
+                    Return parCon.RDGatewayHostname.Trim()
                 Else
-                    Return Me._RDGatewayHostname
+                    Return Me._RDGatewayHostname.Trim()
                 End If
             End Get
             Set(ByVal value As String)
-                Me._RDGatewayHostname = value
+                Me._RDGatewayHostname = value.Trim()
             End Set
         End Property
 
@@ -508,13 +562,13 @@ Namespace Connection
                         parCon = parCont.ConnectionInfo
                     End If
 
-                    Return parCon.RDGatewayUsername
+                    Return parCon.RDGatewayUsername.Trim()
                 Else
-                    Return Me._RDGatewayUsername
+                    Return Me._RDGatewayUsername.Trim()
                 End If
             End Get
             Set(ByVal value As String)
-                Me._RDGatewayUsername = value
+                Me._RDGatewayUsername = value.Trim()
             End Set
         End Property
 
@@ -561,13 +615,13 @@ Namespace Connection
                         parCon = parCont.ConnectionInfo
                     End If
 
-                    Return parCon.RDGatewayDomain
+                    Return parCon.RDGatewayDomain.Trim()
                 Else
-                    Return Me._RDGatewayDomain
+                    Return Me._RDGatewayDomain.Trim()
                 End If
             End Get
             Set(ByVal value As String)
-                Me._RDGatewayDomain = value
+                Me._RDGatewayDomain = value.Trim()
             End Set
         End Property
 #End Region
@@ -599,6 +653,33 @@ Namespace Connection
             End Set
         End Property
 
+        Private _automaticResize As Boolean = My.Settings.ConDefaultAutomaticResize
+        <LocalizedCategory("strCategoryAppearance", 5), _
+            Browsable(True), _
+            LocalizedDisplayName("strPropertyNameAutomaticResize"), _
+            LocalizedDescription("strPropertyDescriptionAutomaticResize"), _
+            TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+        Public Property AutomaticResize() As Boolean
+            Get
+                If _Inherit.CacheBitmaps And _Parent IsNot Nothing Then
+                    Dim parCon As Info = TryCast(_Parent, Container.Info).ConnectionInfo
+
+                    If _IsContainer = True Then
+                        Dim curCont As Container.Info = _Parent
+                        Dim parCont As Container.Info = curCont.Parent
+                        parCon = parCont.ConnectionInfo
+                    End If
+
+                    Return parCon.AutomaticResize
+                Else
+                    Return _automaticResize
+                End If
+            End Get
+            Set(ByVal value As Boolean)
+                _automaticResize = value
+            End Set
+        End Property
+
         Private _Colors As Connection.Protocol.RDP.RDPColors = Tools.Misc.StringToEnum(GetType(Connection.Protocol.RDP.RDPColors), My.Settings.ConDefaultColors)
         <LocalizedCategory("strCategoryAppearance", 5), _
             Browsable(True), _
@@ -931,7 +1012,7 @@ Namespace Connection
             LocalizedDisplayName("strPropertyNameExternalToolBefore"), _
             LocalizedDescription("strPropertyDescriptionExternalToolBefore"), _
             TypeConverter(GetType(Tools.ExternalAppsTypeConverter))> _
-        Public Property PreExtApp() As String
+        Public Overridable Property PreExtApp() As String
             Get
                 If Me._Inherit.PreExtApp And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -958,7 +1039,7 @@ Namespace Connection
             LocalizedDisplayName("strPropertyNameExternalToolAfter"), _
             LocalizedDescription("strPropertyDescriptionExternalToolAfter"), _
             TypeConverter(GetType(Tools.ExternalAppsTypeConverter))> _
-        Public Property PostExtApp() As String
+        Public Overridable Property PostExtApp() As String
             Get
                 If Me._Inherit.PostExtApp And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -984,7 +1065,7 @@ Namespace Connection
             Browsable(True), _
             LocalizedDisplayName("strPropertyNameMACAddress"), _
             LocalizedDescription("strPropertyDescriptionMACAddress")> _
-        Public Property MacAddress() As String
+        Public Overridable Property MacAddress() As String
             Get
                 If Me._Inherit.MacAddress And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -1010,7 +1091,7 @@ Namespace Connection
             Browsable(True), _
             LocalizedDisplayName("strPropertyNameUser1"), _
             LocalizedDescription("strPropertyDescriptionUser1")> _
-        Public Property UserField() As String
+        Public Overridable Property UserField() As String
             Get
                 If Me._Inherit.UserField And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -1038,7 +1119,7 @@ Namespace Connection
             LocalizedDisplayName("strPropertyNameCompression"), _
             LocalizedDescription("strPropertyDescriptionCompression"), _
            TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
-       Public Property VNCCompression() As mRemoteNG.Connection.Protocol.VNC.Compression
+        Public Property VNCCompression() As mRemoteNG.Connection.Protocol.VNC.Compression
             Get
                 If Me._Inherit.VNCCompression And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -1252,7 +1333,7 @@ Namespace Connection
             LocalizedDisplayName("strPropertyNameColors"), _
             LocalizedDescription("strPropertyDescriptionColors"), _
             TypeConverter(GetType(Tools.Misc.EnumTypeConverter))> _
-       Public Property VNCColors() As mRemoteNG.Connection.Protocol.VNC.Colors
+        Public Property VNCColors() As mRemoteNG.Connection.Protocol.VNC.Colors
             Get
                 If Me._Inherit.VNCColors And Me._Parent IsNot Nothing Then
                     Dim parCon As Connection.Info = TryCast(Me._Parent, Container.Info).ConnectionInfo
@@ -1328,7 +1409,7 @@ Namespace Connection
         End Property
 #End Region
 
-        Private _Inherit As Inheritance = New Inheritance(Me)
+        Private _Inherit As New Inheritance(Me)
         <Category(""), _
             Browsable(False)> _
         Public Property Inherit() As Inheritance
@@ -1450,8 +1531,11 @@ Namespace Connection
 #End Region
 
 #Region "Methods"
-        Public Function Copy() As Connection.Info
-            Return Me.MemberwiseClone
+        Public Function Copy() As Info
+            Dim newConnectionInfo As Info = MemberwiseClone()
+            newConnectionInfo.ConstantID = Tools.Misc.CreateConstantID()
+            newConnectionInfo._OpenConnections = New Protocol.List
+            Return newConnectionInfo
         End Function
 
         Public Sub New()
@@ -1499,7 +1583,7 @@ Namespace Connection
                         Me._Port = Connection.Protocol.IntApp.Defaults.Port
                 End Select
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strConnectionSetDefaultPortFailed & vbNewLine & ex.Message)
+                MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strConnectionSetDefaultPortFailed & vbNewLine & ex.Message)
             End Try
         End Sub
 #End Region
@@ -1514,8 +1598,8 @@ Namespace Connection
                 End If
             End Sub
 
-            Public Function Copy() As Connection.Info.Inheritance
-                Return Me.MemberwiseClone
+            Public Function Copy() As Inheritance
+                Return MemberwiseClone()
             End Function
 
             Public Sub TurnOnInheritanceCompletely()
@@ -1532,6 +1616,8 @@ Namespace Connection
                 Me._Description = val
                 Me._DisplayThemes = val
                 Me._DisplayWallpaper = val
+                Me._EnableFontSmoothing = val
+                Me._EnableDesktopComposition = val
                 Me._Domain = val
                 Me._Icon = val
                 Me._Password = val
@@ -1546,6 +1632,7 @@ Namespace Connection
                 Me._RedirectSound = val
                 Me._Resolution = val
                 Me._UseConsoleSession = val
+                _useCredSsp = val
                 Me._RenderingEngine = val
                 Me._Username = val
                 Me._Panel = val
@@ -1612,9 +1699,10 @@ Namespace Connection
                 'LocalizedDisplayName("strPropertyNameInheritAll"), _
                 Get
                     If Me._CacheBitmaps And Me._Colors And Me._Description And Me._DisplayThemes And Me._DisplayWallpaper _
+                    And Me._EnableFontSmoothing And Me._EnableDesktopComposition _
                     And Me._Domain And Me._Icon And Me._Password And Me._Port And Me._Protocol And Me._PuttySession _
                     And Me._RedirectDiskDrives And Me._RedirectKeys And Me._RedirectPorts And Me._RedirectPrinters _
-                    And Me._RedirectSmartCards And Me._RedirectSound And Me._Resolution And Me._UseConsoleSession _
+                    And Me._RedirectSmartCards And Me._RedirectSound And Me._Resolution And Me._UseConsoleSession And _useCredSsp _
                     And Me._RenderingEngine And Me._UserField And Me._ExtApp And Me._Username And Me._Panel And Me._ICAEncryption And Me._RDPAuthenticationLevel And Me._PreExtApp And Me._PostExtApp _
                     And Me._MacAddress And Me._VNCAuthMode And Me._VNCColors And Me._VNCCompression And Me._VNCEncoding And Me._VNCProxyIP _
                     And Me._VNCProxyPassword And Me._VNCProxyPort And Me._VNCProxyType And Me._VNCProxyUsername Then
@@ -1815,6 +1903,21 @@ Namespace Connection
                 End Set
             End Property
 
+            Private _loadBalanceInfo As Boolean = My.Settings.InhDefaultLoadBalanceInfo
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                Browsable(True), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameLoadBalanceInfo"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionLoadBalanceInfo"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property LoadBalanceInfo() As Boolean
+                Get
+                    Return _loadBalanceInfo
+                End Get
+                Set(ByVal value As Boolean)
+                    _loadBalanceInfo = value
+                End Set
+            End Property
+
             Private _RenderingEngine As Boolean = My.Settings.InhDefaultRenderingEngine
             <LocalizedCategory("strCategoryProtocol", 4), _
                 Browsable(True), _
@@ -1844,6 +1947,21 @@ Namespace Connection
                     Me._UseConsoleSession = value
                 End Set
             End Property
+
+            Private _useCredSsp As Boolean = My.Settings.InhDefaultUseCredSsp
+            <LocalizedCategory("strCategoryProtocol", 4), _
+                Browsable(True), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameUseCredSsp"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionUseCredSsp"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property UseCredSsp() As Boolean
+                Get
+                    Return _useCredSsp
+                End Get
+                Set(ByVal value As Boolean)
+                    _useCredSsp = value
+                End Set
+            End Property
 #End Region
 #Region "5 RD Gateway"
             Private _RDGatewayUsageMethod As Boolean = My.Settings.InhDefaultRDGatewayUsageMethod
@@ -1952,6 +2070,21 @@ Namespace Connection
                 End Set
             End Property
 
+            Private _automaticResize As Boolean = My.Settings.InhDefaultAutomaticResize
+            <LocalizedCategory("strCategoryAppearance", 6), _
+                Browsable(True), _
+                LocalizedDisplayNameInheritAttribute("strPropertyNameAutomaticResize"), _
+                LocalizedDescriptionInheritAttribute("strPropertyDescriptionAutomaticResize"), _
+                TypeConverter(GetType(Tools.Misc.YesNoTypeConverter))> _
+            Public Property AutomaticResize() As Boolean
+                Get
+                    Return _automaticResize
+                End Get
+                Set(ByVal value As Boolean)
+                    _automaticResize = value
+                End Set
+            End Property
+
             Private _Colors As Boolean = My.Settings.InhDefaultColors
             <LocalizedCategory("strCategoryAppearance", 6), _
                 Browsable(True), _

mRemoteV1/Connection/Connection.InterfaceControl.vb

@@ -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.Protocol.Base.vb

@@ -17,14 +17,24 @@ Namespace Connection
                 End Set
             End Property
 
-
-            Private _InterfaceControl As Connection.InterfaceControl
-            Public Property InterfaceControl() As Connection.InterfaceControl
+            Private WithEvents _connectionWindow As UI.Window.Connection
+            Public Property ConnectionWindow As UI.Window.Connection
                 Get
-                    Return Me._InterfaceControl
+                    Return _connectionWindow
                 End Get
-                Set(ByVal value As Connection.InterfaceControl)
-                    Me._InterfaceControl = value
+                Set(value As UI.Window.Connection)
+                    _connectionWindow = value
+                End Set
+            End Property
+
+            Private _interfaceControl As InterfaceControl
+            Public Property InterfaceControl() As InterfaceControl
+                Get
+                    Return _interfaceControl
+                End Get
+                Set(ByVal value As InterfaceControl)
+                    _interfaceControl = value
+                    ConnectionWindow = TryCast(_interfaceControl.GetContainerControl(), UI.Window.Connection)
                 End Set
             End Property
 
@@ -58,26 +68,38 @@ 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
 
+            Public Overridable Sub ResizeBegin(ByVal sender As System.Object, ByVal e As EventArgs) Handles _connectionWindow.ResizeBegin
+
+            End Sub
+
+            Public Overridable Sub Resize(ByVal sender As System.Object, ByVal e As EventArgs) Handles _connectionWindow.Resize
+
+            End Sub
+
+            Public Overridable Sub ResizeEnd(ByVal sender As System.Object, ByVal e As EventArgs) Handles _connectionWindow.ResizeEnd
+
+            End Sub
+
             Public Overridable Function SetProps() As Boolean
                 Try
-                    Me._InterfaceControl.Parent.Tag = Me._InterfaceControl
-                    Me._InterfaceControl.Show()
+                    Me._interfaceControl.Parent.Tag = Me._interfaceControl
+                    Me._interfaceControl.Show()
 
                     If Me._Control IsNot Nothing Then
                         Me._Control.Name = Me._Name
-                        Me._Control.Parent = Me._InterfaceControl
-                        Me._Control.Location = Me._InterfaceControl.Location
+                        Me._Control.Parent = Me._interfaceControl
+                        Me._Control.Location = Me._interfaceControl.Location
                         Me._Control.Size = Me.InterfaceControl.Size
-                        Me._Control.Anchor = Me._InterfaceControl.Anchor
+                        Me._Control.Anchor = Me._interfaceControl.Anchor
                     End If
 
                     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
@@ -92,12 +114,9 @@ Namespace Connection
                 Me.Close()
             End Sub
 
-            Public Overridable Sub Resize()
-
-            End Sub
-
             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 +131,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 +145,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.HTTPBase.vb

@@ -1,6 +1,5 @@
 Imports System.Windows.Forms
 Imports mRemoteNG.App.Runtime
-Imports System.ComponentModel
 Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
@@ -27,7 +26,7 @@ Namespace Connection
 
                     NewExtended()
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectionFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -56,16 +55,16 @@ Namespace Connection
                         Dim objWebBrowser As WebBrowser = TryCast(wBrowser, WebBrowser)
                         Dim objAxWebBrowser As SHDocVw.WebBrowser = DirectCast(objWebBrowser.ActiveXInstance, SHDocVw.WebBrowser)
 
-                        objWebBrowser.AllowWebBrowserDrop = False
                         objWebBrowser.ScrollBarsEnabled = True
 
+                        AddHandler objWebBrowser.Navigated, AddressOf wBrowser_Navigated
                         AddHandler objWebBrowser.DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged
                         AddHandler objAxWebBrowser.NewWindow3, AddressOf wBrowser_NewWindow3
                     End If
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpSetPropsFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -108,7 +107,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strHttpConnectFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -119,8 +118,14 @@ Namespace Connection
 #End Region
 
 #Region "Events"
-            Private Sub gex_CreateWindow(ByVal sender As Object, ByVal e As Skybound.Gecko.GeckoCreateWindowEventArgs)
-                e.WebBrowser = Me.wBrowser
+            Private Sub wBrowser_Navigated(sender As Object, e As System.Windows.Forms.WebBrowserNavigatedEventArgs)
+                Dim objWebBrowser As WebBrowser = TryCast(wBrowser, WebBrowser)
+                If objWebBrowser Is Nothing Then Return
+
+                ' This can only be set once the WebBrowser control is shown, it will throw a COM exception otherwise.
+                objWebBrowser.AllowWebBrowserDrop = False
+
+                RemoveHandler objWebBrowser.Navigated, AddressOf wBrowser_Navigated
             End Sub
 
             Private Sub wBrowser_NewWindow3(ByRef ppDisp As Object, ByRef Cancel As Boolean, ByVal dwFlags As Long, ByVal bstrUrlContext As String, ByVal bstrUrl As String)
@@ -164,7 +169,7 @@ Namespace Connection
                         End If
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strHttpDocumentTileChangeFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -178,6 +183,7 @@ Namespace Connection
             End Enum
 
             Private Enum NWMF
+                ' ReSharper disable InconsistentNaming
                 NWMF_UNLOADING = &H1
                 NWMF_USERINITED = &H2
                 NWMF_FIRST = &H4
@@ -192,6 +198,7 @@ Namespace Connection
                 NWMF_SUGGESTWINDOW = &H40000
                 NWMF_SUGGESTTAB = &H80000
                 NWMF_INACTIVETAB = &H100000
+                ' ReSharper restore InconsistentNaming
             End Enum
 #End Region
         End Class

mRemoteV1/Connection/Connection.Protocol.HTTPS.vb

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

mRemoteV1/Connection/Connection.Protocol.ICA.vb

@@ -1,7 +1,6 @@
 Imports mRemoteNG.App.Runtime
 Imports System.Threading
 Imports AxWFICALib
-Imports System.ComponentModel
 Imports mRemoteNG.Tools.LocalizedAttributes
 
 Namespace Connection
@@ -19,7 +18,7 @@ Namespace Connection
                 Try
                     Me.Control = New AxICAClient
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaControlFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaControlFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -76,7 +75,7 @@ Namespace Connection
 
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetPropsFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetPropsFailed & vbNewLine & ex.Message, True)
                     Return False
                 End Try
             End Function
@@ -89,7 +88,7 @@ Namespace Connection
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaConnectionFailed & vbNewLine & ex.Message)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
@@ -135,7 +134,7 @@ Namespace Connection
                         ICA.Domain = _dom
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetCredentialsFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetCredentialsFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -157,10 +156,11 @@ Namespace Connection
                             ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, Screen.FromControl(frmMain).Bounds.Width, Screen.FromControl(frmMain).Bounds.Height, 0)
                             ICA.FullScreenWindow()
                         Case Else
-                            ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, RDP.Resolutions.Items(Int(Info.Resolution)).Width, RDP.Resolutions.Items(Int(Info.Resolution)).Height, 0)
+                            Dim resolution As Rectangle = RDP.GetResolutionRectangle(Info.Resolution)
+                            ICA.SetWindowSize(WFICALib.ICAWindowType.WindowTypeClient, resolution.Width, resolution.Height, 0)
                     End Select
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetResolutionFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetResolutionFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -201,7 +201,7 @@ Namespace Connection
                     AddHandler ICA.OnConnectFailed, AddressOf ICAEvent_OnConnectFailed
                     AddHandler ICA.OnDisconnect, AddressOf ICAEvent_OnDisconnect
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIcaSetEventHandlersFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region

mRemoteV1/Connection/Connection.Protocol.IntApp.vb

@@ -1,6 +1,7 @@
 Imports mRemoteNG.App.Native
 Imports System.Threading
 Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Tools
 
 Namespace Connection
     Namespace Protocol
@@ -10,7 +11,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"
@@ -86,8 +87,9 @@ Namespace Connection
                         Return Nothing
                     End If
 
+                    IntAppProcessStartInfo.UseShellExecute = False
                     IntAppProcessStartInfo.FileName = _IntAppPath
-                    IntAppProcessStartInfo.Arguments = Arguments
+                    IntAppProcessStartInfo.Arguments = CommandLineArguments.EscapeBackslashes(Arguments)
 
                     IntAppProcess = Process.Start(IntAppProcessStartInfo)
                     IntAppProcess.EnableRaisingEvents = True
@@ -110,22 +112,22 @@ Namespace Connection
 
                     IntAppHandle = IntAppProcess.MainWindowHandle
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strIntAppStuff, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strIntAppStuff, True)
 
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppHandle, IntAppHandle.ToString), True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppTitle, IntAppProcess.MainWindowTitle), True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strIntAppParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True)
+                    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)
                     ShowWindow(Me.IntAppHandle, SW_SHOWMAXIMIZED)
 
-                    Resize()
+                    Resize(Me, New EventArgs)
 
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppConnectionFailed & vbNewLine & ex.Message)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIntAppConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
@@ -135,15 +137,16 @@ Namespace Connection
                 Try
                     SetForegroundWindow(IntAppHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppFocusFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIntAppFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
-            Public Overrides Sub Resize()
+            Public Overrides Sub Resize(ByVal sender As Object, ByVal e As EventArgs)
                 Try
+                    If InterfaceControl.Size = Size.Empty Then Return
                     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, My.Resources.strIntAppResizeFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIntAppResizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -153,7 +156,7 @@ Namespace Connection
                         IntAppProcess.Kill()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppKillFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIntAppKillFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 Try
@@ -161,7 +164,7 @@ Namespace Connection
                         IntAppProcess.Dispose()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strIntAppDisposeFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIntAppDisposeFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 MyBase.Close()

mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb

@@ -1,8 +1,13 @@
+Imports System.Runtime.InteropServices
+Imports System.ComponentModel
+Imports mRemoteNG.Messages
 Imports mRemoteNG.App.Native
 Imports System.Threading
 Imports Microsoft.Win32
 Imports System.Drawing
 Imports mRemoteNG.App.Runtime
+Imports System.Text.RegularExpressions
+Imports mRemoteNG.Tools
 
 Namespace Connection
     Namespace Protocol
@@ -14,6 +19,7 @@ Namespace Connection
 #End Region
 
 #Region "Private Properties"
+            Dim _isPuttyNg As Boolean
 #End Region
 
 #Region "Public Properties"
@@ -67,18 +73,6 @@ Namespace Connection
                 End Set
             End Property
 
-            'Private borderWidth As Integer = frmMain.Size.Width - frmMain.ClientSize.Width
-            'Private borderHeight As Integer = frmMain.Size.Height - frmMain.ClientSize.Height
-            Private Shared _BorderSize As Size
-            Public Shared Property BorderSize() As Size
-                Get
-                    Return _BorderSize
-                End Get
-                Set(ByVal value As Size)
-                    _BorderSize = value
-                End Set
-            End Property
-
             Public ReadOnly Property Focused() As Boolean
                 Get
                     If GetForegroundWindow() = PuttyHandle Then
@@ -103,99 +97,115 @@ Namespace Connection
 
             Public Overrides Function Connect() As Boolean
                 Try
-                    PuttyProcess = New Process
+                    _isPuttyNg = IsFilePuttyNg(PuttyPath)
 
+                    PuttyProcess = New Process
                     With PuttyProcess.StartInfo
+                        .UseShellExecute = False
                         .FileName = _PuttyPath
 
-                        Select Case Me._PuttyProtocol
-                            Case Putty_Protocol.raw
-                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                            Case Putty_Protocol.rlogin
-                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                            Case Putty_Protocol.ssh
-                                Dim UserArg As String = ""
-                                Dim PassArg As String = ""
+                        Dim arguments As New CommandLineArguments
+                        arguments.EscapeForShell = False
 
-                                If My.Settings.EmptyCredentials = "windows" Then
-                                    UserArg = " -l """ & Environment.UserName & """"
-                                ElseIf My.Settings.EmptyCredentials = "custom" Then
-                                    UserArg = " -l """ & My.Settings.DefaultUsername & """"
-                                    PassArg = " -pw """ & Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey) & """"
+                        arguments.Add("-load", InterfaceControl.Info.PuttySession)
+
+                        If Not TypeOf InterfaceControl.Info Is PuttySession.Info Then
+                            arguments.Add("-" & _PuttyProtocol.ToString)
+
+                            If _PuttyProtocol = Putty_Protocol.ssh Then
+                                Dim username As String = ""
+                                Dim password As String = ""
+
+                                If Not String.IsNullOrEmpty(InterfaceControl.Info.Username) Then
+                                    username = InterfaceControl.Info.Username
+                                Else
+                                    If My.Settings.EmptyCredentials = "windows" Then
+                                        username = Environment.UserName
+                                    ElseIf My.Settings.EmptyCredentials = "custom" Then
+                                        username = My.Settings.DefaultUsername
+                                    End If
                                 End If
 
-                                If Me.InterfaceControl.Info.Username <> "" Then
-                                    UserArg = " -l """ & Me.InterfaceControl.Info.Username & """"
+                                If Not String.IsNullOrEmpty(InterfaceControl.Info.Password) Then
+                                    password = InterfaceControl.Info.Password
+                                Else
+                                    If My.Settings.EmptyCredentials = "custom" Then
+                                        password = Security.Crypt.Decrypt(My.Settings.DefaultPassword, App.Info.General.EncryptionKey)
+                                    End If
                                 End If
 
-                                If Me.InterfaceControl.Info.Password <> "" Then
-                                    PassArg = " -pw """ & Me.InterfaceControl.Info.Password & """"
+                                arguments.Add("-" & _PuttySSHVersion)
+                                If Not String.IsNullOrEmpty(username) Then
+                                    arguments.Add("-l", username)
                                 End If
+                                If Not String.IsNullOrEmpty(password) Then
+                                    arguments.Add("-pw", password)
+                                End If
+                            End If
 
-                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -" & Me._PuttySSHVersion & UserArg & PassArg & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                            Case Putty_Protocol.telnet
-                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                            Case Putty_Protocol.serial
-                                .Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
-                        End Select
+                            arguments.Add("-P", InterfaceControl.Info.Port.ToString)
+                            arguments.Add(InterfaceControl.Info.Hostname)
+                        End If
 
-                        'REMOVE IN RELEASE!
-                        'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & .Arguments, True)
+                        If _isPuttyNg Then
+                            arguments.Add("-hwndparent", InterfaceControl.Handle.ToString())
+                        End If
+
+                        .Arguments = arguments.ToString
                     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, My.Resources.strPuttyStuff, True)
-
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyHandle, PuttyHandle.ToString), True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyTitle, PuttyProcess.MainWindowTitle), True)
-                    mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True)
-
-                    SetParent(PuttyHandle, InterfaceControl.Parent.Handle)
-                    ShowWindow(PuttyHandle, SW_SHOWMAXIMIZED)
-                    Resize()
+                    Resize(Me, New EventArgs)
 
                     MyBase.Connect()
                     Return True
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyConnectionFailed & vbNewLine & ex.Message)
+                    MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyConnectionFailed & vbNewLine & ex.Message)
                     Return False
                 End Try
             End Function
 
             Public Overrides Sub Focus()
                 Try
-                    'SetForegroundWindow(PuttyHandle)
+                    If ConnectionWindow.InTabDrag Then Return
+                    SetForegroundWindow(PuttyHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyFocusFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyFocusFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
-            Public Overrides Sub Resize()
+            Public Overrides Sub Resize(ByVal sender As Object, ByVal e As EventArgs)
                 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 InterfaceControl.Size = Size.Empty 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, My.Resources.strPuttyResizeFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyResizeFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 
@@ -205,13 +215,13 @@ Namespace Connection
                         PuttyProcess.Kill()
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyKillFailed & 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, My.Resources.strPuttyDisposeFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyDisposeFailed & vbNewLine & ex.Message, True)
                 End Try
 
                 MyBase.Close()
@@ -222,47 +232,21 @@ Namespace Connection
                     PostMessage(Me.PuttyHandle, WM_SYSCOMMAND, IDM_RECONF, 0)
                     SetForegroundWindow(Me.PuttyHandle)
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPuttyShowSettingsDialogFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
 
 #Region "Public Shared Methods"
-            Public Shared Function GetSessions() As Array
+            Public Shared Function IsFilePuttyNg(file As String) As Boolean
+                Dim isPuttyNg As Boolean
                 Try
-                    Dim regKey As RegistryKey
-                    regKey = Registry.CurrentUser.OpenSubKey("Software\SimonTatham\PuTTY\Sessions")
-
-                    Dim arrKeys() As String
-                    arrKeys = regKey.GetSubKeyNames()
-                    Array.Resize(arrKeys, arrKeys.Length + 1)
-                    arrKeys(arrKeys.Length - 1) = "Default Settings"
-
-                    For i As Integer = 0 To arrKeys.Length - 1
-                        arrKeys(i) = System.Web.HttpUtility.UrlDecode(arrKeys(i))
-                    Next
-
-                    Return arrKeys
-                Catch ex As Exception
-                    App.Runtime.mC.AddMessage(Messages.MessageClass.WarningMsg, My.Resources.strPuttyGetSessionsFailed & vbNewLine & ex.Message, True)
-                    Return Nothing
+                    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
-                    Dim pSI As New ProcessStartInfo
-                    pSI.FileName = PuttyPath
-
-                    p = Process.Start(pSI)
-                    p.WaitForExit()
-
-                    mRemoteNG.Connection.PuttySession.PuttySessions = GetSessions()
-                Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyStartFailed & vbNewLine & ex.Message, True)
-                End Try
-            End Sub
 #End Region
 
 #Region "Enums"
@@ -279,7 +263,6 @@ Namespace Connection
                 ssh2 = 2
             End Enum
 #End Region
-
         End Class
     End Namespace
 End Namespace

mRemoteV1/Connection/Connection.Protocol.VNC.vb

@@ -105,14 +105,14 @@ Namespace Connection
                     '    VNC.RestrictPixel = False
                     'End If
 
-                    'VNC.ConnectingText = My.Resources.strInheritConnecting & " (SmartCode VNC viewer)"
-                    'VNC.DisconnectedText = My.Resources.strInheritDisconnected
+                    '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, My.Resources.strVncSetPropsFailed & 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, My.Resources.strVncConnectionOpenFailed & 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, My.Resources.strVncConnectionDisconnectFailed & 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, My.Resources.strVncSendSpecialKeysFailed & 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, My.Resources.strVncToggleSmartSizeFailed & 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, My.Resources.strVncToggleViewOnlyFailed & 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, My.Resources.strVncStartChatFailed & 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, My.Resources.strVncRefreshFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncRefreshFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region
@@ -212,7 +212,7 @@ Namespace Connection
                         VNC.GetPassword = AddressOf VNCEvent_Authenticate
                     End If
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strVncSetEventHandlersFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetEventHandlersFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
 #End Region

mRemoteV1/Connection/Connection.PuttySession.vb

@@ -1,21 +0,0 @@
-Imports System.ComponentModel
-
-Namespace Connection
-    Public Class PuttySession
-        Inherits StringConverter
-
-        Public Shared PuttySessions As String() = New String() {}
-
-        Public Overloads Overrides Function GetStandardValues(ByVal context As System.ComponentModel.ITypeDescriptorContext) As System.ComponentModel.TypeConverter.StandardValuesCollection
-            Return New StandardValuesCollection(PuttySessions)
-        End Function
-
-        Public Overloads Overrides Function GetStandardValuesExclusive(ByVal context As System.ComponentModel.ITypeDescriptorContext) As Boolean
-            Return True
-        End Function
-
-        Public Overloads Overrides Function GetStandardValuesSupported(ByVal context As ITypeDescriptorContext) As Boolean
-            Return True
-        End Function
-    End Class
-End Namespace

mRemoteV1/Connection/Connection.QuickConnect.vb

@@ -13,7 +13,7 @@ Namespace Connection
                         End If
                     Next
                 Catch ex As Exception
-                    mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strQuickConnectHistoryExistsFailed & 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, My.Resources.strQuickConnectAddFailed & vbNewLine & ex.Message, True)
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strQuickConnectAddFailed & vbNewLine & ex.Message, True)
                 End Try
             End Sub
         End Class

mRemoteV1/Connection/PuttySession.Info.vb

@@ -0,0 +1,121 @@
+Imports System.ComponentModel
+Imports mRemoteNG.Messages
+Imports mRemoteNG.Tools.LocalizedAttributes
+Imports mRemoteNG.My
+Imports mRemoteNG.App.Runtime
+Imports mRemoteNG.Tools
+
+Namespace Connection
+    Namespace PuttySession
+        Public Class Info
+            Inherits Connection.Info
+            Implements IComponent
+
+#Region "Commands"
+            <Command(),
+                LocalizedDisplayName("strPuttySessionSettings")> _
+            Public Sub SessionSettings()
+                Try
+                    Dim puttyProcess As New PuttyProcessController
+                    If Not puttyProcess.Start() Then Return
+                    If puttyProcess.SelectListBoxItem(PuttySession) Then
+                        puttyProcess.ClickButton("&Load")
+                    End If
+                    puttyProcess.SetControlText("Button", "&Cancel", "&Close")
+                    puttyProcess.SetControlVisible("Button", "&Open", False)
+                    puttyProcess.WaitForExit()
+                Catch ex As Exception
+                    MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strErrorCouldNotLaunchPutty & vbNewLine & ex.Message, False)
+                End Try
+            End Sub
+#End Region
+
+#Region "Properties"
+            <Browsable(False)> _
+            Public Property RootPuttySessionsInfo() As Root.PuttySessions.Info
+
+            <[ReadOnly](True)> _
+            Public Overrides Property PuttySession() As String
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Name() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Description() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Icon() As String
+                Get
+                    Return "PuTTY"
+                End Get
+                Set(value As String)
+
+                End Set
+            End Property
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Panel() As String
+                Get
+                    Return RootPuttySessionsInfo.Panel
+                End Get
+                Set(value As String)
+
+                End Set
+            End Property
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Hostname() As String
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Username() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property Password() As String
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Protocol() As Protocol.Protocols
+
+            <[ReadOnly](True)> _
+            Public Overrides Property Port() As Integer
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property PreExtApp() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property PostExtApp() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property MacAddress() As String
+
+            <[ReadOnly](True), _
+            Browsable(False)> _
+            Public Overrides Property UserField() As String
+#End Region
+
+#Region "IComponent"
+            Public Property Site() As ISite Implements IComponent.Site
+                Get
+                    Return New PropertyGridCommandSite(Me)
+                End Get
+                Set(value As ISite)
+                    Throw New NotImplementedException()
+                End Set
+            End Property
+
+            Public Sub Dispose() Implements IDisposable.Dispose
+                RaiseEvent Disposed(Me, EventArgs.Empty)
+            End Sub
+
+            Public Event Disposed As EventHandler Implements IComponent.Disposed
+#End Region
+        End Class
+    End Namespace
+End Namespace
+

mRemoteV1/Container/Container.Info.vb

@@ -6,7 +6,6 @@ Namespace Container
     <DefaultProperty("Name")> _
     Public Class Info
 #Region "Properties"
-        Private _Name As String = "New Container"
         <LocalizedCategory("strCategoryDisplay", 1), _
             Browsable(True), _
             [ReadOnly](False), _
@@ -18,10 +17,10 @@ Namespace Container
             Attributes.Container()> _
         Public Property Name() As String
             Get
-                Return Me._ConnectionInfo.Name
+                Return ConnectionInfo.Name
             End Get
             Set(ByVal value As String)
-                Me._ConnectionInfo.Name = value
+                ConnectionInfo.Name = value
             End Set
         End Property
 
@@ -81,7 +80,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/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 = My.Resources.strButtonOK
+        Me.btnOK.Text = My.Language.strButtonOK
         Me.btnOK.UseVisualStyleBackColor = True
         '
         'lblDescription
@@ -55,7 +55,7 @@ Partial Class frmChoosePanel
         Me.lblDescription.Name = "lblDescription"
         Me.lblDescription.Size = New System.Drawing.Size(229, 29)
         Me.lblDescription.TabIndex = 0
-        Me.lblDescription.Text = My.Resources.strLabelSelectPanel
+        Me.lblDescription.Text = My.Language.strLabelSelectPanel
         '
         'btnNew
         '
@@ -66,7 +66,7 @@ Partial Class frmChoosePanel
         Me.btnNew.Name = "btnNew"
         Me.btnNew.Size = New System.Drawing.Size(57, 23)
         Me.btnNew.TabIndex = 40
-        Me.btnNew.Text = My.Resources.strButtonNew
+        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 = My.Resources.strButtonCancel
+        Me.btnCancel.Text = My.Language.strButtonCancel
         Me.btnCancel.UseVisualStyleBackColor = True
         '
         'frmChoosePanel
@@ -100,7 +100,7 @@ Partial Class frmChoosePanel
         Me.Name = "frmChoosePanel"
         Me.ShowInTaskbar = False
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = My.Resources.strTitleSelectPanel
+        Me.Text = My.Language.strTitleSelectPanel
         Me.ResumeLayout(False)
 
     End Sub

mRemoteV1/Forms/frmChoosePanel.vb

@@ -17,18 +17,18 @@ Public Class frmChoosePanel
     End Sub
 
     Private Sub ApplyLanguage()
-        btnOK.Text = My.Resources.strButtonOK
-        lblDescription.Text = My.Resources.strLabelSelectPanel
-        btnNew.Text = My.Resources.strButtonNew
-        btnCancel.Text = My.Resources.strButtonCancel
-        Text = My.Resources.strTitleSelectPanel
+        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(My.Resources.strPanelName & ":", My.Resources.strNewPanel, My.Resources.strNewPanel)
+        Dim pnlName As String = InputBox(My.Language.strPanelName & ":", My.Language.strNewPanel, My.Language.strNewPanel)
 
         If pnlName <> "" Then
             AddPanel(pnlName)

mRemoteV1/Forms/frmMain.Designer.vb

@@ -107,7 +107,7 @@ 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.tsExtAppsToolbar = New System.Windows.Forms.ToolStrip
+        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
@@ -120,7 +120,6 @@ Partial Class frmMain
         Me.ToolStripSplitButton1 = New System.Windows.Forms.ToolStripDropDownButton
         Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem
         Me.ToolStripMenuItem2 = New System.Windows.Forms.ToolStripMenuItem
-        Me.tmrShowUpdate = New System.Windows.Forms.Timer(Me.components)
         Me.tmrAutoSave = New System.Windows.Forms.Timer(Me.components)
         Me.msMain.SuspendLayout()
         Me.tsContainer.ContentPanel.SuspendLayout()
@@ -138,7 +137,7 @@ 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, 424)
@@ -274,6 +273,7 @@ Partial Class frmMain
         Me.mMenFileImportExport.Name = "mMenFileImportExport"
         Me.mMenFileImportExport.Size = New System.Drawing.Size(334, 22)
         Me.mMenFileImportExport.Text = "Import/Export Folder"
+        Me.mMenFileImportExport.Visible = False
         '
         'ImportFromXMLFileToolStripMenuItem
         '
@@ -314,6 +314,7 @@ Partial Class frmMain
         '
         Me.mMenFileSep3.Name = "mMenFileSep3"
         Me.mMenFileSep3.Size = New System.Drawing.Size(331, 6)
+        Me.mMenFileSep3.Visible = False
         '
         'mMenFileDelete
         '
@@ -676,18 +677,19 @@ 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
         '
         '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.MaximumSize = New System.Drawing.Size(0, 25)
+        Me.tsExternalTools.TabIndex = 17
         '
         'cMenExtAppsToolbar
         '
@@ -710,6 +712,7 @@ Partial Class frmMain
         Me.tsQuickConnect.Location = New System.Drawing.Point(3, 24)
         Me.tsQuickConnect.Name = "tsQuickConnect"
         Me.tsQuickConnect.Size = New System.Drawing.Size(331, 25)
+        Me.tsQuickConnect.MaximumSize = New System.Drawing.Size(0, 25)
         Me.tsQuickConnect.TabIndex = 18
         '
         'btnQuickyPlay
@@ -739,6 +742,7 @@ Partial Class frmMain
         Me.ToolStrip1.Location = New System.Drawing.Point(3, 74)
         Me.ToolStrip1.Name = "ToolStrip1"
         Me.ToolStrip1.Size = New System.Drawing.Size(264, 25)
+        Me.ToolStrip1.MaximumSize = New System.Drawing.Size(0, 25)
         Me.ToolStrip1.TabIndex = 19
         Me.ToolStrip1.Visible = False
         '
@@ -788,11 +792,6 @@ Partial Class frmMain
         Me.ToolStripMenuItem2.Size = New System.Drawing.Size(135, 22)
         Me.ToolStripMenuItem2.Text = "Ctrl-Esc"
         '
-        'tmrShowUpdate
-        '
-        Me.tmrShowUpdate.Enabled = True
-        Me.tmrShowUpdate.Interval = 5000
-        '
         'tmrAutoSave
         '
         Me.tmrAutoSave.Interval = 10000
@@ -855,10 +854,9 @@ Partial Class frmMain
     Friend WithEvents mMenViewFullscreen As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents mMenToolsSSHTransfer As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents tsContainer As System.Windows.Forms.ToolStripContainer
-    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

mRemoteV1/Forms/frmMain.resx

@@ -278,9 +278,6 @@
   <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>
   <metadata name="tmrAutoSave.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>252, 17</value>
   </metadata>

mRemoteV1/Forms/frmMain.vb

@@ -1,79 +1,97 @@
+Imports WeifenLuo.WinFormsUI.Docking
 Imports mRemoteNG.App.Runtime
 Imports System.Reflection
+Imports System.Runtime.InteropServices
 Imports Crownwood
 Imports mRemoteNG.App.Native
-Imports System.Runtime.InteropServices
 Imports PSTaskDialog
+Imports mRemoteNG.Config
+Imports mRemoteNG.Themes
 
 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
+        MainForm = Me
+
+        Startup.CheckCompatibility()
 
         Startup.CreateLogger()
 
         ' Create gui config load and save objects
-        sL = New Config.Settings.Load(Me)
-        sS = New Config.Settings.Save(Me)
+        Dim SettingsLoad As New Config.Settings.Load(Me)
 
         ' Load GUI Configuration
-        sL.Load()
+        SettingsLoad.Load()
 
         Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now)
 
         Startup.ParseCommandLineArgs()
 
-        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)
-        End If
         ApplyLanguage()
 
+        AddHandler ThemeManager.ThemeChanged, AddressOf ApplyThemes
+        ApplyThemes()
+
         fpChainedWindowHandle = SetClipboardViewer(Me.Handle)
 
-        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)
+        WindowList = New UI.Window.List
 
-        wL = New UI.Window.List
+        Tools.IeBrowserEmulation.Register()
 
         Startup.GetConnectionIcons()
-        Startup.GetPuttySessions()
-        App.Runtime.GetExtApps()
+        GetExtApps()
         Windows.treePanel.Focus()
 
         Tree.Node.TreeView = Windows.treeForm.tvConnections
 
-        'insert new edition code here
-        Dim edSpanlink As New App.Editions.Spanlink
+        If My.Settings.FirstStart And _
+                Not My.Settings.LoadConsFromCustomLocation And _
+                Not IO.File.Exists(GetStartupConnectionFileName()) Then
+            NewConnections(GetStartupConnectionFileName())
+        End If
 
         'LoadCredentials()
         LoadConnections()
+        If Not IsConnectionsFileLoaded Then
+            Application.Exit()
+            Return
+        End If
+
+        PuttySessions.StartWatcher()
 
         If My.Settings.StartupComponentsCheck Then
             Windows.Show(UI.Window.Type.ComponentsCheck)
         End If
 
-        If Not My.Settings.CheckForUpdatesAsked Then
-            Dim CommandButtons() As String = {My.Resources.strAskUpdatesCommandRecommended, My.Resources.strAskUpdatesCommandCustom, My.Resources.strAskUpdatesCommandAskLater}
-            Dim Result As DialogResult = cTaskDialog.ShowTaskDialogBox(Me, My.Application.Info.ProductName, My.Resources.strAskUpdatesMainInstruction, String.Format(My.Resources.strAskUpdatesContent, My.Application.Info.ProductName), "", "", "", "", String.Join("|", CommandButtons), eTaskDialogButtons.None, eSysIcons.Question, eSysIcons.Question)
-            If cTaskDialog.CommandButtonResult = 0 Or cTaskDialog.CommandButtonResult = 1 Then
-                My.Settings.CheckForUpdatesAsked = True
-            End If
-            If cTaskDialog.CommandButtonResult = 1 Then
-                Windows.Show(UI.Window.Type.Options)
-                Windows.optionsForm.ShowUpdatesTab()
-            End If
-        End If
+#If PORTABLE Then
+        mMenInfoAnnouncements.Visible = False
+        mMenToolsUpdate.Visible = False
+        mMenInfoSep2.Visible = False
+#End If
 
-        Startup.UpdateCheck()
-        Startup.AnnouncementCheck()
         Startup.CreateSQLUpdateHandlerAndStartTimer()
 
         AddSysMenuItems()
@@ -83,168 +101,232 @@ Public Class frmMain
     End Sub
 
     Private Sub ApplyLanguage()
-        mMenFile.Text = My.Resources.strMenuFile
-        mMenFileNew.Text = My.Resources.strMenuNewConnectionFile
-        mMenFileNewConnection.Text = My.Resources.strNewConnection
-        mMenFileNewFolder.Text = My.Resources.strNewFolder
-        mMenFileLoad.Text = My.Resources.strMenuOpenConnectionFile
-        mMenFileSave.Text = My.Resources.strMenuSaveConnectionFile
-        mMenFileSaveAs.Text = My.Resources.strMenuSaveConnectionFileAs
-        mMenFileImportExport.Text = My.Resources.strImportExport
-        ImportFromActiveDirectoryToolStripMenuItem.Text = My.Resources.strImportAD
-        ImportFromPortScanToolStripMenuItem.Text = My.Resources.strImportPortScan
-        ImportFromRDPFileToolStripMenuItem.Text = My.Resources.strImportRDPFiles
-        ImportFromXMLFileToolStripMenuItem.Text = My.Resources.strImportmRemoteXML
-        ExportToXMLFileToolStripMenuItem.Text = My.Resources.strExportmRemoteXML
-        mMenFileExit.Text = My.Resources.strMenuExit
+        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.Resources.strMenuView
-        mMenViewAddConnectionPanel.Text = My.Resources.strMenuAddConnectionPanel
-        mMenViewConnectionPanels.Text = My.Resources.strMenuConnectionPanels
-        mMenViewConnections.Text = My.Resources.strMenuConnections
-        mMenViewConfig.Text = My.Resources.strMenuConfig
-        mMenViewSessions.Text = My.Resources.strMenuSessions
-        mMenViewErrorsAndInfos.Text = My.Resources.strMenuNotifications
-        mMenViewScreenshotManager.Text = My.Resources.strMenuScreenshotManager
-        mMenViewJumpTo.Text = My.Resources.strMenuJumpTo
-        mMenViewJumpToConnectionsConfig.Text = My.Resources.strMenuConnectionsAndConfig
-        mMenViewJumpToSessionsScreenshots.Text = My.Resources.strMenuSessionsAndScreenshots
-        mMenViewJumpToErrorsInfos.Text = My.Resources.strMenuNotifications
-        mMenViewResetLayout.Text = My.Resources.strMenuResetLayout
-        mMenViewQuickConnectToolbar.Text = My.Resources.strMenuQuickConnectToolbar
-        mMenViewExtAppsToolbar.Text = My.Resources.strMenuExternalToolsToolbar
-        mMenViewFullscreen.Text = My.Resources.strMenuFullScreen
+        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.strScreenshots
+        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.Resources.strMenuTools
-        mMenToolsSSHTransfer.Text = My.Resources.strMenuSSHFileTransfer
-        mMenToolsExternalApps.Text = My.Resources.strMenuExternalTools
-        mMenToolsPortScan.Text = My.Resources.strMenuPortScan
-        mMenToolsComponentsCheck.Text = My.Resources.strComponentsCheck
-        mMenToolsUpdate.Text = My.Resources.strMenuCheckForUpdates
-        mMenToolsOptions.Text = My.Resources.strMenuOptions
+        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.Resources.strMenuHelp
-        mMenInfoHelp.Text = My.Resources.strMenuHelpContents
-        mMenInfoForum.Text = My.Resources.strMenuSupportForum
-        mMenInfoBugReport.Text = My.Resources.strMenuReportBug
-        mMenInfoDonate.Text = My.Resources.strMenuDonate
-        mMenInfoWebsite.Text = My.Resources.strMenuWebsite
-        mMenInfoAbout.Text = My.Resources.strMenuAbout
-        mMenInfoAnnouncements.Text = My.Resources.strMenuAnnouncements
+        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.Resources.strLabelConnect
-        btnQuickyPlay.Text = My.Resources.strMenuConnect
-        mMenQuickyCon.Text = My.Resources.strMenuConnections
+        lblQuickConnect.Text = My.Language.strLabelConnect
+        btnQuickyPlay.Text = My.Language.strMenuConnect
+        mMenQuickyCon.Text = My.Language.strMenuConnections
 
-        cMenToolbarShowText.Text = My.Resources.strMenuShowText
+        cMenToolbarShowText.Text = My.Language.strMenuShowText
 
-        ToolStripButton1.Text = My.Resources.strConnect
-        ToolStripButton2.Text = My.Resources.strScreenshot
-        ToolStripButton3.Text = My.Resources.strRefresh
+        ToolStripButton1.Text = My.Language.strConnect
+        ToolStripButton2.Text = My.Language.strScreenshot
+        ToolStripButton3.Text = My.Language.strRefresh
 
-        ToolStripSplitButton1.Text = My.Resources.strSpecialKeys
-        ToolStripMenuItem1.Text = My.Resources.strKeysCtrlAltDel
-        ToolStripMenuItem2.Text = My.Resources.strKeysCtrlEsc
+        ToolStripSplitButton1.Text = My.Language.strSpecialKeys
+        ToolStripMenuItem1.Text = My.Language.strKeysCtrlAltDel
+        ToolStripMenuItem2.Text = My.Language.strKeysCtrlEsc
+    End Sub
+
+    Public Sub ApplyThemes()
+        With ThemeManager.ActiveTheme
+            pnlDock.DockBackColor = .WindowBackgroundColor
+            tsContainer.BackColor = .ToolbarBackgroundColor
+            tsContainer.ForeColor = .ToolbarTextColor
+            tsContainer.TopToolStripPanel.BackColor = .ToolbarBackgroundColor
+            tsContainer.TopToolStripPanel.ForeColor = .ToolbarTextColor
+            tsContainer.BottomToolStripPanel.BackColor = .ToolbarBackgroundColor
+            tsContainer.BottomToolStripPanel.ForeColor = .ToolbarTextColor
+            tsContainer.LeftToolStripPanel.BackColor = .ToolbarBackgroundColor
+            tsContainer.LeftToolStripPanel.ForeColor = .ToolbarTextColor
+            tsContainer.RightToolStripPanel.BackColor = .ToolbarBackgroundColor
+            tsContainer.RightToolStripPanel.ForeColor = .ToolbarTextColor
+            tsContainer.ContentPanel.BackColor = .ToolbarBackgroundColor
+            tsContainer.ContentPanel.ForeColor = .ToolbarTextColor
+            msMain.BackColor = .ToolbarBackgroundColor
+            msMain.ForeColor = .ToolbarTextColor
+            ApplyMenuColors(msMain.Items)
+            tsExternalTools.BackColor = .ToolbarBackgroundColor
+            tsExternalTools.ForeColor = .ToolbarTextColor
+            tsQuickConnect.BackColor = .ToolbarBackgroundColor
+            tsQuickConnect.ForeColor = .ToolbarTextColor
+        End With
+    End Sub
+
+    Private Shared Sub ApplyMenuColors(itemCollection As ToolStripItemCollection)
+        With ThemeManager.ActiveTheme
+            Dim menuItem As ToolStripMenuItem
+            For Each item As ToolStripItem In itemCollection
+                item.BackColor = .MenuBackgroundColor
+                item.ForeColor = .MenuTextColor
+
+                menuItem = TryCast(item, ToolStripMenuItem)
+                If menuItem IsNot Nothing Then
+                    ApplyMenuColors(menuItem.DropDownItems)
+                End If
+            Next
+        End With
+    End Sub
+
+    Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+#If PORTABLE Then
+        Return
+#End If
+        If Not My.Settings.CheckForUpdatesAsked Then
+            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
+            Return
+        End If
+
+        If Not My.Settings.CheckForUpdatesOnStartup Then Return
+
+        Dim nextUpdateCheck As Date = My.Settings.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(My.Settings.CheckForUpdatesFrequencyDays))
+        If My.Settings.UpdatePending Or Date.UtcNow > nextUpdateCheck Then
+            If Not IsHandleCreated Then CreateHandle() ' Make sure the handle is created so that InvokeRequired returns the correct result
+            Startup.CheckForUpdate()
+            Startup.CheckForAnnouncement()
+        End If
     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.ProductName, My.Resources.strConfirmExitMainInstruction, "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
-            If cTaskDialog.VerificationChecked Then
-                My.Settings.ConfirmExit = False
-            End If
-            If Result = DialogResult.No Then
-                e.Cancel = True
-                Exit Sub
+        If Not (WindowList Is Nothing OrElse WindowList.Count = 0) Then
+            Dim connectionWindow As UI.Window.Connection
+            Dim openConnections As Integer = 0
+            For Each window As UI.Window.Base In WindowList
+                connectionWindow = TryCast(window, UI.Window.Connection)
+                If connectionWindow IsNot Nothing Then
+                    openConnections = openConnections + connectionWindow.TabController.TabPages.Count
+                End If
+            Next
+
+            If openConnections > 0 And _
+                    (My.Settings.ConfirmCloseConnection = ConfirmClose.All Or _
+                    (My.Settings.ConfirmCloseConnection = ConfirmClose.Multiple And openConnections > 1) Or _
+                     My.Settings.ConfirmCloseConnection = ConfirmClose.Exit) 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.ConfirmCloseConnection = My.Settings.ConfirmCloseConnection - 1
+                End If
+                If result = DialogResult.No Then
+                    e.Cancel = True
+                    Return
+                End If
             End If
         End If
 
-        For Each Window As UI.Window.Base In wL
-            Window.Close()
-        Next
+        Shutdown.Cleanup()
 
-        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
+
+        Shutdown.StartUpdate()
 
         Debug.Print("[END] - " & Now)
     End Sub
 #End Region
 
 #Region "Timer"
-    Private tmrRuns As Integer = 0
-    Private Sub tmrShowUpdate_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles tmrShowUpdate.Tick
-        If tmrRuns = 5 Then
-            Me.tmrShowUpdate.Enabled = False
-        End If
-
-        If App.Runtime.IsUpdateAvailable Then
-            App.Runtime.Windows.Show(UI.Window.Type.Update)
-            Me.tmrShowUpdate.Enabled = False
-        End If
-
-        If App.Runtime.IsAnnouncementAvailable Then
-            App.Runtime.Windows.Show(UI.Window.Type.Announcement)
-            Me.tmrShowUpdate.Enabled = False
-        End If
-
-        tmrRuns += 1
-    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 index As Integer = tsExternalTools.Items.Count - 1 To 0 Step -1
+                tsExternalTools.Items(index).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
+        If Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.Connection Or _
+           Tree.Node.GetNodeType(Tree.Node.SelectedNode) = Tree.Node.Type.PuttySession Then
             extA.Start(Tree.Node.SelectedNode.Tag)
         Else
             extA.Start()
         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
@@ -255,46 +337,64 @@ 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)
+        Select Case Tree.Node.GetNodeType(Tree.Node.SelectedNode)
             Case Tree.Node.Type.Root
+                mMenFileNewConnection.Enabled = True
+                mMenFileNewFolder.Enabled = True
                 mMenFileImportExport.Enabled = True
                 mMenFileDelete.Enabled = False
                 mMenFileRename.Enabled = True
                 mMenFileDuplicate.Enabled = False
-                mMenFileDelete.Text = My.Resources.strMenuDelete
-                mMenFileRename.Text = My.Resources.strMenuRenameFolder
-                mMenFileDuplicate.Text = My.Resources.strMenuDuplicate
+                mMenFileDelete.Text = My.Language.strMenuDelete
+                mMenFileRename.Text = My.Language.strMenuRenameFolder
+                mMenFileDuplicate.Text = My.Language.strMenuDuplicate
             Case Tree.Node.Type.Container
+                mMenFileNewConnection.Enabled = True
+                mMenFileNewFolder.Enabled = True
                 mMenFileImportExport.Enabled = True
                 mMenFileDelete.Enabled = True
                 mMenFileRename.Enabled = True
                 mMenFileDuplicate.Enabled = True
-                mMenFileDelete.Text = My.Resources.strMenuDeleteFolder
-                mMenFileRename.Text = My.Resources.strMenuRenameFolder
-                mMenFileDuplicate.Text = My.Resources.strMenuDuplicateFolder
+                mMenFileDelete.Text = My.Language.strMenuDeleteFolder
+                mMenFileRename.Text = My.Language.strMenuRenameFolder
+                mMenFileDuplicate.Text = My.Language.strMenuDuplicateFolder
             Case Tree.Node.Type.Connection
+                mMenFileNewConnection.Enabled = True
+                mMenFileNewFolder.Enabled = True
                 mMenFileImportExport.Enabled = False
                 mMenFileDelete.Enabled = True
                 mMenFileRename.Enabled = True
                 mMenFileDuplicate.Enabled = True
-                mMenFileDelete.Text = My.Resources.strMenuDeleteConnection
-                mMenFileRename.Text = My.Resources.strMenuRenameConnection
-                mMenFileDuplicate.Text = My.Resources.strMenuDuplicateConnection
-            Case Else
+                mMenFileDelete.Text = My.Language.strMenuDeleteConnection
+                mMenFileRename.Text = My.Language.strMenuRenameConnection
+                mMenFileDuplicate.Text = My.Language.strMenuDuplicateConnection
+            Case Tree.Node.Type.PuttyRoot, Tree.Node.Type.PuttySession
+                mMenFileNewConnection.Enabled = False
+                mMenFileNewFolder.Enabled = False
                 mMenFileImportExport.Enabled = False
                 mMenFileDelete.Enabled = False
                 mMenFileRename.Enabled = False
                 mMenFileDuplicate.Enabled = False
-                mMenFileDelete.Text = My.Resources.strMenuDelete
-                mMenFileRename.Text = My.Resources.strMenuRename
-                mMenFileDuplicate.Text = My.Resources.strMenuDuplicate
+                mMenFileDelete.Text = My.Language.strMenuDelete
+                mMenFileRename.Text = My.Language.strMenuRename
+                mMenFileDuplicate.Text = My.Language.strMenuDuplicate
+            Case Else
+                mMenFileNewConnection.Enabled = True
+                mMenFileNewFolder.Enabled = True
+                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
 
@@ -318,8 +418,8 @@ Public Class frmMain
     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(My.Resources.strSaveConnectionsFileBeforeOpeningAnother, 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
@@ -335,7 +435,7 @@ 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
@@ -366,14 +466,14 @@ 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
@@ -461,7 +561,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
@@ -472,10 +572,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
@@ -490,14 +590,10 @@ Public Class frmMain
         End If
     End Sub
 
+    Public Fullscreen As New Tools.Misc.Fullscreen(Me)
     Private Sub mMenViewFullscreen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewFullscreen.Click
-        If Tools.Misc.Fullscreen.FullscreenActive Then
-            Tools.Misc.Fullscreen.ExitFullscreen()
-            Me.mMenViewFullscreen.Checked = False
-        Else
-            Tools.Misc.Fullscreen.EnterFullscreen()
-            Me.mMenViewFullscreen.Checked = True
-        End If
+        Fullscreen.Value = Not Fullscreen.Value
+        mMenViewFullscreen.Checked = Fullscreen.Value
     End Sub
 #End Region
 
@@ -553,7 +649,7 @@ 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
 
@@ -575,7 +671,7 @@ Public Class frmMain
 
             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
 
@@ -643,7 +739,7 @@ Public Class frmMain
         Next
     End Sub
 
-    Private Sub AddNodeToMenu(ByVal tnc As TreeNodeCollection, ByVal menToolStrip As ToolStripMenuItem)
+    Private Shared Sub AddNodeToMenu(ByVal tnc As TreeNodeCollection, ByVal menToolStrip As ToolStripMenuItem)
         Try
             For Each tNode As TreeNode In tnc
                 Dim tMenItem As New ToolStripMenuItem()
@@ -656,23 +752,24 @@ Public Class frmMain
 
                     menToolStrip.DropDownItems.Add(tMenItem)
                     AddNodeToMenu(tNode.Nodes, tMenItem)
-                ElseIf Tree.Node.GetNodeType(tNode) = Tree.Node.Type.Connection Then
+                ElseIf Tree.Node.GetNodeType(tNode) = Tree.Node.Type.Connection Or _
+                       Tree.Node.GetNodeType(tNode) = Tree.Node.Type.PuttySession Then
                     tMenItem.Image = Windows.treeForm.imgListTree.Images(tNode.ImageIndex)
                     tMenItem.Tag = tNode.Tag
 
                     menToolStrip.DropDownItems.Add(tMenItem)
                 End If
 
-                AddHandler tMenItem.MouseDown, AddressOf ConMenItem_MouseDown
+                AddHandler tMenItem.MouseUp, AddressOf ConMenItem_MouseUp
             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)
+    Private Shared Sub ConMenItem_MouseUp(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs)
         If e.Button = MouseButtons.Left Then
-            If TypeOf sender.Tag Is mRemoteNG.Connection.Info Then
+            If TypeOf sender.Tag Is Connection.Info Then
                 App.Runtime.OpenConnection(sender.Tag)
             End If
         End If
@@ -680,42 +777,67 @@ Public Class frmMain
 #End Region
 
 #Region "Window Overrides and DockPanel Stuff"
-    Private Sub frmMain_Resize(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Resize
-        If Me.WindowState = FormWindowState.Minimized Then
+    Private _inSizeMove As Boolean = False
+    Private Sub frmMain_ResizeBegin(ByVal sender As Object, ByVal e As EventArgs) Handles Me.ResizeBegin
+        _inSizeMove = True
+    End Sub
+
+    Private Sub frmMain_Resize(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Resize
+        If WindowState = FormWindowState.Minimized Then
             If My.Settings.MinimizeToTray Then
-                If App.Runtime.SysTrayIcon Is Nothing Then
-                    App.Runtime.SysTrayIcon = New Tools.Controls.SysTrayIcon()
+                If NotificationAreaIcon Is Nothing Then
+                    NotificationAreaIcon = New Tools.Controls.NotificationAreaIcon()
                 End If
-                Me.Hide()
+                Hide()
             End If
         Else
-            prevWindowsState = Me.WindowState
+            PreviousWindowState = WindowState
         End If
     End Sub
 
-    Private bWmGetTextFlag As Boolean = False
-    Private bWmWindowPosChangedFlag As Boolean = False
+    Private Sub frmMain_ResizeEnd(ByVal sender As Object, ByVal e As EventArgs) Handles Me.ResizeEnd
+        _inSizeMove = False
 
+        ' This handles activations from clicks that started a size/move operation
+        ActivateConnection()
+    End Sub
+
+    Private _inMouseActivate As Boolean = False
     Protected Overloads Overrides Sub WndProc(ByRef m As Message)
         Try
-#If Config = "Debug" Then
-            'Debug.Print(m.Msg)
-#End If
-
             Select Case m.Msg
-                Case WM_GETTEXT
-                    bWmGetTextFlag = True
-                Case WM_WINDOWPOSCHANGED
-                    If bWmGetTextFlag Then
-                        ActivateConnection()
+                Case WM_MOUSEACTIVATE
+                    _inMouseActivate = True
+                Case WM_ACTIVATEAPP
+                    _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 TreeViews and ComboBoxes get focus but don't simulate a mouse event
+                        If TypeOf control Is TreeView Or 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.TabControl 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
 
-                    bWmGetTextFlag = False
-                    bWmWindowPosChangedFlag = True
-                Case WM_ACTIVATEAPP
-                    If bWmWindowPosChangedFlag Then
-                        ActivateConnection()
-                    End If
+                    ' This handles activations from clicks that did not start 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
@@ -730,9 +852,6 @@ Public Class frmMain
                     'Send to the next window
                     SendMessage(fpChainedWindowHandle, m.Msg, m.LParam, m.WParam)
                     fpChainedWindowHandle = m.LParam
-                Case Else
-                    bWmGetTextFlag = False
-                    bWmWindowPosChangedFlag = False
             End Select
         Catch ex As Exception
         End Try
@@ -755,6 +874,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"
@@ -764,21 +909,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), My.Resources.strScreen & " " & 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, My.Resources.strSendTo)
-        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,300 @@
+<?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
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD+
+        JgAAAk1TRnQBSQFMAgEBCAEAAVABAQFQAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABMAMAAQEBAAEgBgABMP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8ALgAB4gHvAfQB/wGo
+        AckB1wH/AWcBpAG2Af8BSgGGAZwB/wE1AVwBigH/ATABVwGHAf8BMAFhAZUB/wFDAY4BqwH/AY8BtwHN
+        Af8B3QHqAfEB/wwAA1cBtwOfAf8DmgH/A5YB/wORAf8DjQH/A4kB/wOEAf8DgAH/A1IB/wNOAf8DSgH/
+        A0cB/wNDAf8DQAH/A1cBtxgAAw0BEgNWAbYDVgG2Aw0BEWAAAa0BzwHfAf8BQgGRAa0B/wFHAaMBvwH/
+        AWMBwAHUAf8BlQHZAeYB/wGBAdsB8AH/ATsBxgHsAf8BDwGqAd0B/wEBAZIBxwH/AQ0BgAGsAf8BJAFc
+        AZIB/wGdAb8B0QH/CAADqAH/A+kB/wPTAf8D0gH/A9EB/wPQAf8DzgH/A80B/wPNAf8DywH/A8sB/wPK
+        Af8DyQH/A8gB/wPiAf8DQAH/GAADXgHZA+QB/wPjAf8DWAHBMAADQQFyAUwCXwHzAVkCXAHPAUsCTAGQ
+        AyMBMxwAAUUBhAGbAf8BLwG9AecB/wFSAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/ATsBygHw
+        Af8BCQG2Ae0B/wEAAacB6AH/AQABoQHhAf8BAAGWAdIB/wEoAUkBZQH/CAADrQH/A9YB/wO6Af8DuAH/
+        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DRAH/CAADCwEPA1QBrQM6
+        AWEDPwFuA2cB+AHiAeEB3wH/AeEB4AHfAf8DXwHzAzwBZwM8AWYDUwGtAwsBDxwAAyEBMAIrAWIB/AGG
+        Aa0B4QH/AVQBqAHcAf8BNQGSAckB/wEGAUgBqwH/AVUCVgGxAx8BLRQAAUgBhwGeAf8BLgHEAfAB/wFU
+        AdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/ATsBygHwAf8BCQG2Ae0B/wEAAagB6AH/AQABoQHh
+        Af8BAAGcAdoB/wEpAUoBZwH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOwAf8DrwH/
+        A60B/wOrAf8DqQH/A6gB/wPKAf8DSAH/CAADWgHFBP8ChAGDAf4CgwGCAf4C5wHmAf8B1gHVAdMB/wHX
+        AdYB1AH/AeMB4gHgAf8DfwH+A6gB/QHpAegB5gH/A1gBwRwAAVQCVgGrAUMBnQHRAf8BmQG8AesB/wFH
+        AaAB4wH/AZYBuQHqAf8BlAG4AeoB/wE2AZMBygH/AisBXgH8A0MBeBAAAUoBiQGgAf8BLgHEAe8B/wFT
+        AdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/ATwBygHwAf8BCQG2Ae0B/wEAAagB6AH/AQABoQHh
+        Af8BAAGcAdoB/wErAU0BaQH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0Af8DsgH/
+        A7AB/wOtAf8DrAH/A6wB/wPPAf8DTAH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/AckByAHG
+        Af8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeUYAAMfAS0BKwE2AWYB/AGd
+        Ab8B7AH/AT8BnAHiAf8BMQGTAd8B/wEuAZEB3wH/ATUBlAHgAf8BlQG4AeoB/wGGAa0B4QH/AR8BgwG7
+        Af8BSwJMAZAMAAFMAYwBogH/ATABxgHwAf8BVQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wE8
+        AcoB8AH/AQkBtgHtAf8BAAGoAegB/wEAAaIB4gH/AQABmwHbAf8BLQFQAYAB/wgAA1oBvQPaAf8DyAH/
+        A8AB/wO/Af8DvQH/A7oB/wO4Af8DtwH/A7UB/wOzAf8DsAH/A68B/wOzAf8DwgH/A1oBvQgAA04BlQH2
+        AfUB9AH/AeYB5QHkAf8BvwG+Ab0B/wLrAeoB/wHUAdMB0gH/AdYB1QHUAf8B4gLhAf8CtAGzAf8B1wHW
+        AdQB/wHiAeEB3wH/A0oBjQwAAysBQgNIAYQBVQJXAbcBTAJfAfMBTAGkAdcB/wGhAcIB7QH/AZ8BwAHt
+        Af8BnQG/Ae0B/wFKAaMB5AH/ATABkgHfAf8BLgGQAd4B/wFRAacB5gH/AZIBtgHoAf8BGQFVAbcB/wM3
+        AVoIAAFPAY8BpQH/ATEBxgHwAf8BVQHUAfIB/wGNAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wE7AcoB8AH/
+        AQkBtgHtAf8BAAGnAegB/wEAAaEB4gH/AQABnAHbAf8BLwFTAYMB/wgAA1oBvQPjAf8D5wH/A+EB/wPg
+        Af8D4AH/A98B/wPfAf8D3gH/A90B/wPdAf8D3AH/A9sB/wPgAf8D0AH/A1oBvQMLAQ8DVQG1A2QB5wHk
+        AeMB4gH/AdEB0AHPAf8C8AHvAf8DrgH/A2QB8QNnAfICrAGrAf8C6AHnAf8CywHKAf8B4AHfAd0B/wNh
+        AeQDVQG1AwsBDwNMAZMBOgGXAc8B/wFRAagB2QH/AY0BtAHiAf8BowHEAe0B/wGnAccB7gH/AToBlwHN
+        Af8BCgFLAbIB/wE1AZMByQH/AZ8BwAHtAf8BTgGWAaMB/wGeAZYBHgH/AVIBlAGRAf8BjQGzAekB/wFP
+        AaUB2AH/AVoCXgHYCAABUAGSAagB/wExAcUB8AH/AVYB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0
+        Af8BOwHKAfAB/wEJAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/ATEBVgGGAf8IAAMpAT8DzgH/
+        A+wB/wPeAf8D2AH/A9IB/wPMAf8DyAH/A8cB/wPIAf8DywH/A9AB/wPdAf8D6AH/A6QB/wMrAUIDPwFt
+        AuQB4wH/AdgB1gHVAf8B0gHRAdAB/wHFAcQBwwH/Ae0B7AHrAf8DVwG6CAADXAHNAegB5wHmAf8BtgG1
+        AbQB/wHWAdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmAUgCYgH2Aa4BzQHwAf8BsAHPAfAB/wGYAb8B7AH/
+        AVQBrgHnAf8BqgHKAe8B/wETAVEBuAH/BAABCwFMAbMB/wGiAcMB7QH/AagBlwEHAf8BxAG1ATAB/wGs
+        AZcBAAH/ATEBkwHfAf8BmAG7AesB/wEAAToBnwH/CAABUwGVAasB/wExAcUB8AH/AVYB1AHyAf8BjQHj
+        AfQB/wGiAesB9gH/AYMB3wH0Af8BPAHLAfAB/wEJAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/
+        ATQBWQGIAf8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wE6Aa0BPgH/AUwBqgE6Af8BRgGvAT4B/wEs
+        AaUBOAH/AawBxQGsAf8DwgH/A9EB/wPTAf8DWgG9BAADQgF2AewB6wHoAf8B2gHZAdcB/wHUAdMB0QH/
+        AcYBxQHEAf8B3gLcAf8DRgF+CAADUAGaAd0B3AHbAf8ByAHGAcUB/wLiAeEB/wLhAd8B/wHuAe0B7AH/
+        Az8BbwFaAmAB3gGoAckB7QH/AYQBpwHtAf8BLgFAAe0B/wFAAY4B6QH/Aa0BzQHwAf8BQwGdAdIB/wEU
+        AVIBuQH/AT0BmQHOAf8BpQHFAe4B/wGVAZoBPwH/Aa0BlwEAAf8BnQGXASMB/wE8AZsB4gH/AZgBuwHq
+        Af8BSAJiAfYIAAFVAZgBrgH/ATEBxQHwAf8BVgHUAfEB/wGNAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wE8
+        AcoB8AH/AQkBtgHtAf8BAAGoAekB/wEAAaEB4QH/AQABnAHaAf8BNgFbAYoB/wwAAykBPwPRAf8D8wH/
+        AccB3gHKAf8BOgHJAYUB/wGzAdwBpAH/AecBxwFSAf8B3AG/AUkB/wFMAcwBjwH/ASUBrQE+Af8BuAHQ
+        AbgB/wPxAf8DrwH/AysBQgQAAy8BSgNgAesDcgH8Ad4B3QHcAf8BywLKAf8B5gLlAf8DYQHhAzIBUAM4
+        AVwDYAHrAu4B7AH/AcwCywH/AecB5gHlAf8DcgH8A2AB6wMsAUMDUQGcAZIBuQHlAf8BRAFKAfYB/wGB
+        AYQB9QH/AhYB8AH/AZABuwHrAf8BrgHNAfAB/wGsAcwB8AH/AaoBygHwAf8BhQGyAekB/wE0AakBwQH/
+        ARoBswGNAf8BLAGoAbYB/wFGAaEB5AH/AZcBugHoAf8DXQHtCAABWAGbAbAB/wEwAcYB8AH/AVYB1AHy
+        Af8BjQHjAfQB/wGiAesB9gH/AYMB3wH0Af8BPAHKAfAB/wEJAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEA
+        AZwB2gH/ATkBXwGOAf8QAANaAb0DxAH/AUwBzgGLAf8BmQHkAasB/wGwAcUBMwH/AeoBtQEeAf8B4QGi
+        AQ8B/wGlAZ0BFgH/AYIBxQGPAf8BHwGaASwB/wOgAf8DWgG9EAADXgHOAeEB4AHeAf8B2QHXAdYB/wG4
+        ArcB/wHhAeAB3wH/A6gB/QOoAf0C9gH1Af8CwAG/Af8B6gHpAegB/wLzAfIB/wNcAckIAAMjATMBKwFb
+        AXEB/AGSAaQB9QH/AS8BMAH2Af8BJwGGAfQB/wERAaYB+wH/ATIBqwHyAf8BVAGvAecB/wFRAa0B5wH/
+        AU4BqgHmAf8BFQG2AYAB/wE2AcgBlwH/AREBtwFQAf8BUwGsAecB/wGPAbUB4wH/AVoCXgHVCAABWwGf
+        AbMB/wEwAcYB8AH/AVQB1AHxAf8BjAHjAfQB/wGiAesB9gH/AYMB3wH0Af8BPAHKAfAB/wEJAbYB7QH/
+        AQABpwHoAf8BAAGhAeEB/wEAAZsB2gH/ATsBYgGQAf8YAAFYAXQBYwH8AaIB6QGVAf8B1gHPAT8B/wHi
+        AbMBHQH/AdEBuwElAf8BwgGuARgB/wGCAb0BQgH/ASsBaQFAAfwYAANMAZEB4wHiAeAB/wLeAdwB/wHh
+        AeAB3wH/AcwCywH/AcQBwwHCAf8CzwHOAf8C3gHdAf8C8AHvAf8C8AHvAf8C9gH1Af8DSAGHDAADSQGH
+        AYYBrwHhAf8BuQHXAfMB/wEIAaYB/gH/AUIBvwL/AQEBowL/ATwBvgHwAf8BEAHOAfsB/wEwAb4B8QH/
+        ASgBswGgAf8BEQG3AU8B/wEdAbMBkAH/AacByAHuAf8BTQGlAdYB/wFPAlEBnAgAAVwBoQG1Af8BVgHV
+        AfQB/wGaAegB9wH/AbUB8wH6Af8BwgH4AfwB/wHDAfgB/QH/AcEB9wH9Af8BrwHwAfsB/wGPAeIB9wH/
+        AVUB0AHwAf8BKQG4AeUB/wE+AWUBkwH/GAABWgF0AWQB/AGiAfABnwH/AdgB7QGvAf8B3gHFAT4B/wG0
+        AeIBOwH/ATYB5wEPAf8BQQHXAUEB/wErAWsBVQH8FAADAQECA18B4wHlAeQB4QH/Au4B7QH/Au4B7QH/
+        AusB6gH/AeMB4gHhAf8C6AHnAf8C6gHpAf8C8wHyAf8C9QH0Af8B+gH5AfgB/wNcAd8MAAMEAQYDUQGf
+        AYUBrgHhAf8BMAGyAfkB/wEBAaMC/wEWAakB+wH/AQYB0wH+Af8BQgHiAv8BAQHVAv8BVQGwAegB/wFS
+        Aa0B5wH/AakBygHvAf8BpQHFAe0B/wErAT4BaAH8AyEBMAgAAV8BowG4Af8BxQH5Af0B/wHFAfkB/QH/
+        AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5
+        Af0B/wFAAWgBlQH/GAADYQHcAcgB9wHUAf8B2AH2AcoB/wHnAeMBqQH/AdsBzwFCAf8BrwHcAT4B/wGd
+        AeoBqwH/A18B4BgAA0ABbwN/Af4DZAHnA18B8wHoAecB5gH/AecB5gHlAf8C7QHsAf8C+wH6Af8DZwHy
+        A2QB5wN/Af4DPQFoFAADQgF1AV8CYgH2AY4BtgHjAf8BuQHXAfMB/wEzAdUB+wH/AQAB1QL/ARcB0QH7
+        Af8BswHSAfIB/wGxAdAB8QH/AZIBuAHiAf8BOAGVAcwB/wNKAYoMAAG3AdcB4QH/AYwBvQHMAf8BnQHP
+        AdsB/wGtAd8B6AH/AbkB7AHzAf8BwgH1AfoB/wHCAfUB+gH/AbgB6wHxAf8BqQHaAeMB/wGUAcQB0QH/
+        AWYBqAG4Af8BqQHFAdEB/xgAAy0BRQFNAXABZwH6AdsB+AHpAf8B5wHyAdgB/wHtAeUBswH/Ad8B2QGm
+        Af8BXwF/AV8B+wMyAVAgAAMPARQDCgEOA1MBqgHvAe4B7QH/AvQB8wH/A1IBpAMIAQsDEQEXIAADFgEe
+        A1QBrgFMAaMB3AH/AZEBuAHkAf8BqAHKAewB/wGlAccB7AH/AY0BtQHiAf8BPgGaAdIB/wFaAl8B2wMx
+        AU4QAAL+Av8B4wHxAfQB/wG5AdcB4QH/AZUBvgHMAf8BZgGoAbsB/wFZAZsBsAH/AVUBmAGtAf8BXgGh
+        AbMB/wGMAbIBwgH/AbEBzQHXAf8B3wHrAe8B/wP+Af8cAAMuAUcDXgHZAV4BdAFiAfwBXgFzAV4B/ANe
+        Ad0DMgFQLAADLwFKA10B8ANiAe8DLAFDMAADKwFCA0wBkAFbAl0B0gFZAlwBzwNOAZkDLQFFHAADEQEX
+        A1YBswFTAVQBUwGstAADBAEFAxABFQMfAS0DKQE/Ay8BSQMuAUgDKAE9Ax4BKwMPARQDAwEEEAADtwH/
+        AZwBqAGeAf8BAAFNASgB/wESAZIBSgH/AQABUQEoAf8BAAE+AaAB/wEAATwBngH/AQABOQGbAf8BAAE3
+        AZkB/wEAATUBlwH/AQABMgGUAf8BAAExAZMB/wNCAf8DQgH/CAABVwFQAU0BjwFwAWABVQG1AaQBcgFU
+        Ae4BuQF2AVAB/wG1AXQBTgH/AbMBcwFOAf8BsAFxAU0B/wGsAW8BTAH/AakBbgFMAf8BpwFsAUsB/wGm
+        AWsBSgH/AaABbQFMAf4BlQFoAVEB8QF1AWEBVAHETAADBQEHAx8BLAI+AT0BagJSAVABowFbAlkBxAFd
+        AloB0wFdAloB0wFbAlkBwwFSAlEBoQM8AWYDHAEoAwQBBgwAAxUBHQNRAaIBFwGVAU4B/wGCAb4BqgH/
+        ASYBpQGCAf8BBwGXAUAB/wEKAZkBRQH/AQ4BmQFJAf8BEgGdAU4B/wFMAaoB0gH/AUoBqAHRAf8BAAEz
+        AZUB/xAAAZYBcgFVAd4w/wGSAWkBUAHtSwABAQMSARgDPgFrAV0CWQHXAUYCKwH8AawBIwEAAf8B4QFD
+        ARcB/wHkAVUBKwH/AdMBQQEPAf8BowJAAf0BYQJeAdoCPgE9AWoDDwEUCAADGAEiAVABUgFQAaQDVgGz
+        AUMBrAGfAf8BSgG3AZ4B/wFUAbsBrAH/AVQBuwGuAf8BVQG7AbAB/wGAAbwBswH/AQ0BmgFRAf8BKgGV
+        AccB/wFNAasB0wH/AQABNgGYAf8QAAG8AX8BVwH+BP8BrgFkASkB/wGsAWEBKAH/AawBYQEoBf8BUwGq
+        AVoB/wFOAaUBVAH/AUkBoAFPAf8BRAGbAUkB/wFBAZcBRgH/AT0BkwFCBf8BoQFuAU0B/kwAAxsBJgNZ
+        AdIBEwIAAf8BigEyARoB/wHKAYYBPAH/AfYBvAGcAf8B+QHMAbcB/wHjAaABTgH/AbEBTQEzAf8BTwEp
+        AQoB/wFeAlgB3QMcASgIAAFVAVYBVQGxA1YBswNWAbMBMgGkAZEB/wFFAbYBmwH/AT4BsgGbAf8BQAGy
+        AZ4B/wFCAbMBoQH/AYUBvwG2Af8BFAGeAYIB/wEvAZkByQH/AVEBrQHUAf8BAAE6AZwB/xAAAcMBhQFX
+        Bf8BrgFkASkB/wHNAZ4BcQH/AawBYQEoBf8BSAGeAU0B/wFtAckBeAH/AW0ByQF4Af8BbAHIAXcB/wFr
+        AccBdQH/ATsBkgFABf8BpwFuAUwB/wQAA50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wgAAVMCTwGlASoBDwEAAf8BTwE6ASUB/wGPAUwBNwH/
+        AawBiAFBAf8BwgGjAYgB/wHBAaUBjgH/AbMBmAGBAf8BkQFMATYB/wFKATEBHAH/ATkBEgEAAf8BVgJV
+        AbEIAAMIAQsDVQGyA1YBswFMAbIBqAH/AVMBvQGnAf8BhwHBAbUB/wGGAcEBtgH/AYcBwQG3Af8BiAHB
+        AbkB/wEaAaIBiAH/ATQBnAHLAf8BVQGwAdUB/wEAAT0BnwH/EAABxAGFAVgF/wGuAWQBKQH/Ac0BnwFy
+        Af8BrAFhASgF/wFLAaIBUQH/AXABygF6Af8BbwHKAXoB/wFuAckBeQH/AWwByAF3Af8BPgGUAUMF/wGr
+        AW8BTQH/BAADnQH/AboCvQH/AeYC7AH/AeYC7QH/AecC7QH/AegC7gH/AekC7wH/AekC7wH/AeoC7wH/
+        AeoC8AH/AesC8AH/AesC8QH/AewC8QH/AewC8QH/Ab0CvwH/A50B/wQAAzkBXwFLASsBEAH/AcMBsQGi
+        Af8BtgGcAYMB/wGmAU8BIgH/AagBTQEfAf8BwwGkAYcB/wHYAcYBsAH/Ab0BqQGLAf8BVQE1ARUB/wEy
+        ARIBAAH/ASgBBAEAAf8BLwEIAQAB/wMzAVMIAAMGAQgDVQGyASUBoAGKAf8BkwHJAboB/wE1Aa8BlwH/
+        ARoBogGDAf8BGwGjAYcB/wEdAaQBiwH/ARwBqgGSAf8BKgHCAe0B/wGBAbQB1wH/AQABQQGjAf8QAAHH
+        AYcBVwX/AbMBawEwAf8B0AGkAXsB/wGxAWkBKwX/AU0BpAFTAf8BcQHLAXsB/wFwAcsBegH/AW8BygF5
+        Af8BbQHJAXgB/wFBAZgBRgX/AbEBcwFOAf8IAANcAeoB2wLiAf8BzQLPAf8DywH/A8wB/wPOAf8DzwH/
+        A9AB/wPSAf8D0wH/A9UB/wHXAtgB/wHnAuwB/wNtAfcEAAMiATEBVgJVAbEBPQERAQAB/wGqAYUBNQH/
+        AbIBSAEGAf8BrQElAQAB/wG6AUIBAAH/AeoB1QG/Af8B/QH8AfoB/wHWAb4BpgH/AZABNQECAf8BOAEG
+        AQAB/wE5ARYBAAH/ATIBEgEAAf8DVwHFAxwBJwgAAwQBBgELAZQBTQH/AUQBuQGeAf8BHwGmAYkB/wFP
+        AbEB1QH/AUsBrQHUAf8BRwGrAdIB/wE1AboB5AH/AQABmQE/Af8BAAGOAS4B/wEAAUYBmgH/EAAByAGJ
+        AVgF/wG2AXMBPQH/AdEBpQGCAf8BtQFwATUF/wFPAacBVgH/AXABywF6Af8BcAHLAXoB/wFvAcoBeQH/
+        AW0ByQF4Af8BRAGbAUoF/wG1AXUBUAH/CAADXAHqAdkC4QH/AcsCzAH/A8cB/wPIAf8DygH/A8sB/wPN
+        Af8DzgH/A9AB/wPRAf8B0wLUAf8B5QLrAf8DbQH3BAADLgFHA1kB7AE4AQYBAAH/AZkBJQEAAf8BuAE9
+        AQAB/wHCATkBAAH/AckBSwEAAf8B5gG/AZQB/wHsAdQBtgH/Ac0BnAE4Af8BqAFCAQIB/wGZAUMBFwH/
+        AaMBjAFIAf8BVQE8ASUB/wJRAT8B9wE1AjQBVQwAAS4BjgHEAf8BKAGsAYsB/wElAaoBjwH/AVQBtQHY
+        Af8BUAGyAdYB/wFNAa8B1QH/AUkBrAHTAf8BAAGQATgB/wEvAagBhAH/AQABTgEpAf8DFAEbDAABygGL
+        AVkF/wG7AXwBUQH/AbkBegFJAf8BuQF5AUcF/wFDAZoBSQH/AVABpwFWAf8BTgGlAVQB/wFMAaMBUgH/
+        AUoBoQFQAf8BRwGeAU0F/wG4AXkBUQH/CAADXAHqAdcC3wH/AccCyQH/A8IB/wPEAf8DxQH/A8gB/wPJ
+        Af8DygH/A8wB/wPNAf8B0ALRAf8B4wLqAf8DbQH3BAADOQFfAkABLQH9AUoBEQEAAf8BrgEvAQAB/wHA
+        ATcBAAH/AecBlgEcAf8B6AGyAVAB/wHkAbEBUAH/AdIBiQEPAf8BvQE8AQAB/wGoASoBAAH/AbgBjQEz
+        Af8B1AHDAbIB/wGYAYQBRAH/ATEBEwEAAf8BPgI9AWoMAAE0AZEByQH/AaQBzAHkAf8BhwG7AdsB/wEV
+        AaEBUAH/AQ8BnAFKAf8BCgGaAUYB/wEFAZYBQAH/ASEBowGBAf8BhAHAAasB/wEYAZYBTwH/A1EBogMV
+        AR0IAAHGAYgBXAH+MP8BuwF7AVIB/wgAA1wB6gHWAt8B/wHDAsUB/wPAAf8DwAH/A8IB/wPDAf8DxAH/
+        A8UB/wPIAf8DyQH/A80B/wHgAugB/wNtAfcEAAM3AVoCTQEoAfoBgwEcAQAB/wHLAUYBAAH/AeUBiwET
+        Af8B/gG2AUgC/wHjAcIB/wH0AbwBhQH/AdYBTQEAAf8BxQFEAQAB/wG6ATkBAAH/Aa8BTQEPAf8BrgGI
+        ATMB/wGUAUwBMwH/ATIBFAEAAf8DPAFmDAABOQGVAc0B/wGoAc8B5QH/AYwBvwHdAf8BGwGlAYEB/wGN
+        AcUBuAH/AYkBwwG0Af8BhgHBAbEB/wGEAb8BrwH/AU0BuQGfAf8BRAGtAaAB/wNWAbMBUAFSAVABpAMY
+        ASIEAAHBAYgBWAH6BP8B7QHDAZoB/wHtAcMBmgH/Ae0BwwGaAf8B7QHDAZoB/wHtAcMBmgH/Ae0BwwGa
+        Af8B7QHDAZoB/wHtAcMBmgH/Ae0BwwGaAf8B7QHDAZoF/wG9AYABVAH/CAADYAHWAccCzQH/AdsC5AH/
+        AdsC5AH/AdsC5QH/AdwC5QH/AdwC5QH/Ad0C5gH/Ad0C5gH/Ad4C5wH/Ad8C6AH/AeAC6AH/Ac0C0wH/
+        A18B4wQAAyYBOQFgAloB3gGOASQBAAH/AewBngEpAf8B/gG/AYUC/wHMAaEC/wHfAbsB/wH+AcIBVQH/
+        AeIBjgEfAf8B0wGEARAB/wHKAU8BAgH/AbUBRgEAAf8BlwE3AQAB/wGBATQBDwH/A1kB7AMuAUgMAAE9
+        AZgB0AH/AasB0QHnAf8BkAHCAd8B/wEiAakBiAH/AZEByQG7Af8BTAG6AaUB/wFIAbgBoQH/AUQBtgGe
+        Af8BSAG4AZ0B/wEzAaUBkgH/A1YBswNWAbMBVQFWAVUBsQQAAbYBhwFdAfAE/wHtAcMBmwH/AfQB2gHA
+        Af8B9AHaAcAB/wH0AdsBwQH/AfQB2wHBAf8B9AHbAcEB/wH0AdsBwQH/AfQB2wHBAf8B9AHbAcEB/wHt
+        AcMBmgX/AbsBfwFXAf4IAAMsAUMDWwHIA50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wNeAd0DMQFOBAADCQEMA0sBjgHAAUQBAwL/AbwBVQH/AfoBzgGnAf8B+AHbAb4C/wHiAcYC/wG+
+        AYYB/wH0AawBSwH/AewBwgGaAf8B4gG1AYsB/wG4AUsBCQH/AZ0BOgECAf8BiAE6ARYB/wNPAaUDEAEV
+        DAABQQGbAdMB/wGuAdQB6AH/AasB0wHoAf8BLwGxAZAB/wGbAc4BwAH/AZkBzQG9Af8BlgHLAbsB/wGV
+        AcoBuQH/AYABvwGoAf8BTQGzAakB/wNWAbMDVQGyAwgBCwQAAZcBegFeAdgE/wHtAcMBmwH/Ae0BwwGb
+        Af8B7QHDAZsB/wHtAcMBmgH/Ae0BwwGaAf8B7QHDAZoB/wHtAcMBmgH/Ae0BwwGaAf8B7QHDAZoB/wHt
+        AcMBmgX/AbsBhAFcAfhIAAMTARoCZAFTAfEB2AGeAUgB/wHnAdMBwAH/AfwB9QHuAv8B+AHrAv8B5QHC
+        Af8B9gG5AYIB/wHyAdIBuAH/Ae4B0gG2Af8BwgGGASQB/wGnAUwBHQH/Ak0BKQH6Ax0BKRAAAUQBnQHV
+        Af8BQgGbAdMB/wE/AZoB0gH/AR8BoQGMAf8BGgGfAYoB/wEXAZ0BhQH/ARMBmQGAAf8BLAGlAZIB/wFV
+        AbgBsQH/ASYBoQGLAf8DVQGyAwYBCAgAAWEBWQFSAZsw/wHWAakBiAH/TAADNQFXAakBOAEKAf8BygG4
+        AagG/wH+AfwC/wH2AeIB/wH7AcUBoAH/AeQBuQGVAf8B2wGsAVMB/wHDAY4BMgH/AZMBOgEOAf8BPgI9
+        AWowAAFTAlQBrANWAbMDVgGzAwQBBgwAAUYBQwFBAXEBWQFTAU4BkAGLAXMBXAHMAc4BkgFcAf8ByAGN
+        AV4B/gHNAZEBXAH/AcwBjwFcAf8BzQGRAV4B/wHNAZIBYAH/AcsBkAFeAf8BsAGDAVsB7wGJAXIBXgHL
+        AdgBrQGKAf8B1wGrAYoB/1AAAzIBUQJkAVkB7AHQAbIBlQH/AewB4AHZAf8B5gHVAcQB/wHTAbABlAH/
+        AdMBpgFNAf8BywGPASsB/wFnAWUBWQHyAToCOQFgNAABUwJUAawDVgGzAwQBBpwAAxEBFwNEAXoCWgFX
+        AcUCZQFeAeUCYQFYAeYCXAFZAckCSAFHAYMDFQEdEAABQgFNAT4HAAE+AwABKAMAAUADAAEwAwABAQEA
+        AQEFAAGAAQEWAAP/gQAB4AEHAgAB/AE/Av8BwAEDAgAB/AE/AfwBHwHAAQMCAAHAAQMB+AEHAcABAwIA
+        AcABAwH4AQMBwAEDAgABwAEDAfABAQHAAQMCAAHAAQMBgAEAAcABAwYAAcABAwIAAQEBgAEBAQABwAED
+        AYACAQGAAgABwAEDAYABAQQAAcABAwHAAQMBwAEDAgABwAEDAfABDwHAAQMBgAEAAcABAwHwAQ8BgAED
+        AYABAAHAAQMB8AEPAcABAwHgAQEBwAEDAfABDwHwAQ8B8AEDAcABAwH4AR8B/AE/AfwBDwHjBf8B4AEH
+        AYABAQGAAQEC/wHAAQMBgAEHAYABAQL/AYABAwEAAQcBgAEBAv8BwAEDAQABBwGAAQECAAHAAQMBAAEH
+        AYABAQIAAYABAQGAAQcBgAEBAYABAQIAAcABBwGAAQEBgAEBAgAB4AEDAYABAQGAAQECAAHgAQEBgAEB
+        AYABAQIAAeABAAGAAQEBgAEBAgAB4AEAAYABAQGAAQECAAHgAQABgAEBAv8BgAEBAeABAQGAAQEC/wHA
+        AQMB/wHDAYABAQL/AeABBwH/AccE/wHwAQ8L
+</value>
+  </data>
+  <metadata name="dlgColor.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>140, 17</value>
+  </metadata>
+</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 = My.Resources.strLabelPassword
+        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 = My.Resources.strLabelVerify
+        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 = My.Resources.strButtonOK
+        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 = My.Resources.strButtonCancel
+        Me.btnCancel.Text = My.Language.strButtonCancel
         Me.btnCancel.UseVisualStyleBackColor = True
         '
         'lblStatus
@@ -152,7 +152,7 @@ Partial Class frmPassword
         Me.ShowIcon = False
         Me.ShowInTaskbar = False
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
-        Me.Text = My.Resources.strTitlePassword
+        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 = My.Resources.strLabelPassword
-        lblVerify.Text = My.Resources.strLabelVerify
-        btnOK.Text = My.Resources.strButtonOK
-        btnCancel.Text = My.Resources.strButtonCancel
+        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.Resources.strTitlePassword
+        Text = My.Language.strTitlePassword
     End Sub
 
     Private Sub txtPassword_GotFocus(ByVal sender As Object, ByVal e As System.EventArgs) Handles txtPassword.GotFocus

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 ,
@@ -91,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 ,
@@ -116,7 +118,11 @@ CREATE TABLE [dbo].[tblCons] (
 	[InheritRDGatewayUseConnectionCredentials] [bit] NOT NULL ,
 	[InheritRDGatewayUsername] [bit] NOT NULL ,
 	[InheritRDGatewayPassword] [bit] NOT NULL ,
-	[InheritRDGatewayDomain] [bit] NOT NULL
+	[InheritRDGatewayDomain] [bit] NOT NULL ,
+	[LoadBalanceInfo] [varchar] (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+	[AutomaticResize] [bit] NOT NULL DEFAULT 1 ,
+	[InheritLoadBalanceInfo] [bit] NOT NULL DEFAULT 0 ,
+	[InheritAutomaticResize] [bit] NOT NULL DEFAULT 0
 ) ON [PRIMARY]
 GO
  
@@ -129,7 +135,7 @@ CREATE TABLE [dbo].[tblRoot] (
 GO
  
 CREATE TABLE [dbo].[tblUpdate] (
-                [LastUpdate] [datetime] NULL 
+	[LastUpdate] [datetime] NULL 
 ) ON [PRIMARY]
 GO
 

mRemoteV1/Images/Images.Enums.vb

@@ -5,6 +5,7 @@ Namespace Images
             Container = 1
             ConnectionOpen = 2
             ConnectionClosed = 3
+            PuttySessions = 4
         End Enum
 
         Public Enum ErrorImage

mRemoteV1/Language/Language.el.resx

@@ -0,0 +1,348 @@
+<?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="strAbout" xml:space="preserve">
+    <value>Σχετικά με</value>
+  </data>
+  <data name="strActive" xml:space="preserve">
+    <value>Ενεργό</value>
+  </data>
+  <data name="strActivity" xml:space="preserve">
+    <value>Δραστηριότητα</value>
+  </data>
+  <data name="strAddConnection" xml:space="preserve">
+    <value>Νέα σύνδεση</value>
+  </data>
+  <data name="strAddFolder" xml:space="preserve">
+    <value>Νέος φάκελος</value>
+  </data>
+  <data name="strAddNodeFromXmlFailed" xml:space="preserve">
+    <value>AddNodeFromXML απέτυχε!</value>
+  </data>
+  <data name="strAddNodesFromSqlFailed" xml:space="preserve">
+    <value>AddNodesFromSQL απέτυχε!</value>
+  </data>
+  <data name="strAllowOnlySingleInstance" xml:space="preserve">
+    <value>Επιτρέπετε μόνο ένα μόνο παράδειγμα της εφαρμογής (απαιτείται επανεκκίνηση του mRemoteNG)</value>
+  </data>
+  <data name="strAlways" xml:space="preserve">
+    <value>Πάντα</value>
+  </data>
+  <data name="strAlwaysConnectEvenIfAuthFails" xml:space="preserve">
+    <value>Πάντοτε να συνδεθεί, ακόμη και αν ο έλεγχος ταυτότητας αποτυγχάνει</value>
+  </data>
+  <data name="strAlwaysShowPanelSelection" xml:space="preserve">
+    <value>Πάντα Εμφάνιση πίνακα διαλόγου επιλογής κατά το άνοιγμα συνδέσεων</value>
+  </data>
+  <data name="strAlwaysShowSysTrayIcon" xml:space="preserve">
+    <value>Να εμφανίζονται πάντα γνωστοποίησης περιοχων εικόνας</value>
+  </data>
+  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+    <value>Ρωτήστε με ξανά αργότερα</value>
+  </data>
+  <data name="strAskUpdatesCommandCustom" xml:space="preserve">
+    <value>Προσαρμογή των ρυθμίσεων τώρα</value>
+  </data>
+  <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
+    <value>Χρήση των προτεινόμενων ρυθμίσεων</value>
+  </data>
+  <data name="strAskUpdatesContent" xml:space="preserve">
+    <value>{0} μπορεί να ελέγχει αυτόματα ενημερώσεις που μπορούν να παρέχουν νέα χαρακτηριστικά και διορθώσεις σφαλμάτων. Συνιστάται να επιτρέψετε {0} να ελέγξει για ενημερώσεις σε εβδομαδιαία βάση.</value>
+  </data>
+  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+    <value>Ρυθμίσεις αυτόματης ενημέρωσης</value>
+  </data>
+  <data name="strAspect" xml:space="preserve">
+    <value>Πτυχή</value>
+  </data>
+  <data name="strAutomaticallyGetSessionInfo" xml:space="preserve">
+    <value>Αυτόματη λήψη πληροφοριών περιόδου</value>
+  </data>
+  <data name="strAutoSaveEvery" xml:space="preserve">
+    <value>Αυτόματη αποθήκευση κάθε:</value>
+  </data>
+  <data name="strAutoSaveMins" xml:space="preserve">
+    <value>Λεπτά (0 σημαίνει απενεργοποιημένο)</value>
+  </data>
+  <data name="strAvailableVersion" xml:space="preserve">
+    <value>Τρέχουσα έκδοση</value>
+  </data>
+  <data name="strButtonBrowse" xml:space="preserve">
+    <value>&amp;Αναζήτηση...</value>
+  </data>
+  <data name="strButtonCancel" xml:space="preserve">
+    <value>&amp;Ακύρωση</value>
+  </data>
+  <data name="strButtonChange" xml:space="preserve">
+    <value>Αλλαγή</value>
+  </data>
+  <data name="strButtonClose" xml:space="preserve">
+    <value>&amp;Κλείσιμο</value>
+  </data>
+  <data name="strButtonDefaultInheritance" xml:space="preserve">
+    <value>Προεπιλογή κληρονομικότητας</value>
+  </data>
+  <data name="strButtonDefaultProperties" xml:space="preserve">
+    <value>Προεπιλεγμένες ιδιότητες</value>
+  </data>
+  <data name="strButtonDisconnect" xml:space="preserve">
+    <value>Αποσύνδεση</value>
+  </data>
+  <data name="strButtonIcon" xml:space="preserve">
+    <value>Εικονίδιο</value>
+  </data>
+  <data name="strButtonImport" xml:space="preserve">
+    <value>&amp;Εισαγωγή</value>
+  </data>
+  <data name="strButtonInheritance" xml:space="preserve">
+    <value>Κληρονομιά</value>
+  </data>
+  <data name="strButtonLaunchPutty" xml:space="preserve">
+    <value>Εκκίνηση του PuTTY</value>
+  </data>
+  <data name="strButtonNew" xml:space="preserve">
+    <value>&amp; Νέο</value>
+  </data>
+  <data name="strButtonOK" xml:space="preserve">
+    <value>&amp;ΟΚ</value>
+  </data>
+  <data name="strButtonProperties" xml:space="preserve">
+    <value>Ιδιότητες</value>
+  </data>
+  <data name="strButtonScan" xml:space="preserve">
+    <value>&amp;Σάρωση</value>
+  </data>
+  <data name="strButtonStop" xml:space="preserve">
+    <value>&amp;Διακοπή</value>
+  </data>
+  <data name="strButtonTestProxy" xml:space="preserve">
+    <value>Δοκιμή διακομιστή μεσολάβησης</value>
+  </data>
+  <data name="strCannotImportNormalSessionFile" xml:space="preserve">
+    <value>Δεν μπορείτε να εισαγάγετε ένα κανονικό αρχείο σύνδεσης.
+Παρακαλούμε χρησιμοποιήστε Αρχείο - Συνδέσεις φορτίου για τα κανονικά αρχεία σύνδεσης!</value>
+  </data>
+  <data name="strCannotStartPortScan" xml:space="preserve">
+    <value>Δεν είναι δυνατή η εκκίνηση της σάρωσης υποδοχων, εσφαλμένη μορφή IP!</value>
+  </data>
+  <data name="strCategoryAppearance" xml:space="preserve">
+    <value>Εμφάνιση</value>
+  </data>
+  <data name="strCategoryConnection" xml:space="preserve">
+    <value>Σύνδεση</value>
+  </data>
+  <data name="strCategoryCredentials" xml:space="preserve">
+    <value>Πιστοποιήσεις</value>
+  </data>
+  <data name="strCategoryDisplay" xml:space="preserve">
+    <value>Οθόνη</value>
+  </data>
+  <data name="strCategoryGateway" xml:space="preserve">
+    <value>Πύλη</value>
+  </data>
+  <data name="strCategoryGeneral" xml:space="preserve">
+    <value>Γενική</value>
+  </data>
+  <data name="strCategoryMiscellaneous" xml:space="preserve">
+    <value>Διάφορα</value>
+  </data>
+  <data name="strCategoryProtocol" xml:space="preserve">
+    <value>Πρωτόκολλο</value>
+  </data>
+  <data name="strCategoryRedirect" xml:space="preserve">
+    <value>Ανακατεύθυνση</value>
+  </data>
+  <data name="strCcAlwaysShowScreen" xml:space="preserve">
+    <value>Πάντα εμφάνιση αυτής της οθόνης κατά την εκκίνηση</value>
+  </data>
+  <data name="strCcCheckAgain" xml:space="preserve">
+    <value>Ανανέωση</value>
+  </data>
+  <data name="strCcCheckFailed" xml:space="preserve">
+    <value>Ο ελέγχος απέτυχε!</value>
+  </data>
+  <data name="strCcCheckSucceeded" xml:space="preserve">
+    <value>Ο ελεγχος πέτυχε!</value>
+  </data>
+  <data name="strCcEOLFailed" xml:space="preserve">
+    <value>Η δυνατότητα (RDP) συνεδρίες προϋποθέτει ότι έχετε μια εγγεγραμμένο αντίγραφο του eolwtscom.dll στο σύστημά σας. mRemoteNG πλοία με αυτό το στοιχείο αλλά θα δεν εγγραφείτε αυτόματα εκτός αν η εκτέλεση του πακέτου εγκατάστασης. Να εγγραφείτε δεν με μη αυτόματο τρόπο αυτό: Ανοίξτε στο τρέχω διάλογος (έναρξη - Run) και πληκτρολογήστε τα παρακάτω: regsvr32 "c:\Program Files\mRemoteNG\eolwtscom.dll" (όπου c:\Program Files\mRemoteNG\ είναι η διαδρομή προς την εγκατάσταση mRemoteNG). Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή να χρησιμοποιήσετε τη δυνατότητα συνεδρίες (RDP) στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/</value>
+  </data>
+  <data name="strCcEOLOK" xml:space="preserve">
+    <value>Το EOLWTSCOM βρέθηκε και φαίνεται να έχει καταχωρηθεί σωστά.</value>
+  </data>
+  <data name="strCcGeckoFailed" xml:space="preserve">
+    <value>Για να χρησιμοποιήσετε το μηχανισμό απόδοσης Gecko πρέπει να έχετε XULrunner 1.8.1.x και ο δρόμος για την εγκατάσταση ορίστε στις επιλογές σας. Μπορείτε να κατεβάσετε XULrunner 1.8.1.3 εδώ: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ όταν ολοκληρώσετε τη λήψη κάντε εξαγωγή του πακέτου για την πορεία της επιλογής σας. Στη συνέχεια, στο mRemoteNG πηγαίνετε στο εργαλεία - επιλογές - προηγμένες και πληκτρολογήσει τη σωστή διαδρομή στο πεδίο διαδρομή XULrunner. Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή χρησιμοποιούν την μηχανή Gecko στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/</value>
+  </data>
+  <data name="strCcGeckoOK" xml:space="preserve">
+    <value>Το XULrunner βρέθηκε και φαίνεται να έχει εγκατασταθεί σωστά.</value>
+  </data>
+  <data name="strCcICAFailed" xml:space="preserve">
+    <value>ICA απαιτεί ότι είναι εγκατεστημένο το XenDesktop Online Plugin και ότι καταχωρείται η βιβλιοθήκη wfica.ocx. Μπορείτε να κατεβάσετε τον πελάτη εδώ: http://www.citrix.com/download/ αν έχετε το XenDesktop Online Plugin εγκατασταθεί και ο έλεγχος συνεχίσει να αποτυγχάνει, προσπαθήστε να εγγραφείτε wfica.ocx με μη αυτόματο τρόπο. Να κάνει αυτό ανοίγω πάνω στο τρέχω διάλογος (έναρξη - Run) και πληκτρολογήστε τα παρακάτω: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (όπου c:\Program Files\Citrix\ICA Client\ είναι η διαδρομή στην εγκατάσταση XenDesktop Online Plugin). Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή να χρησιμοποιήσετε ICA στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/"</value>
+  </data>
+  <data name="strCcICAOK" xml:space="preserve">
+    <value>Όλα τα συστατικά ICA βρέθηκαν και φαίνεται να καταχωρηθηκαν σωστά. Πρόγραμμα-πελάτη Citrix ICA ελέγχου έκδοση {0}</value>
+  </data>
+  <data name="strCcNotInstalledProperly" xml:space="preserve">
+    <value>δεν έχει εγκατασταθεί σωστά</value>
+  </data>
+  <data name="strConnectInFullscreen" xml:space="preserve">
+    <value>Σύνδεση σε λειτουργία πλήρους οθόνης</value>
+  </data>
+  <data name="strConnecting" xml:space="preserve">
+    <value>Σύνδεση...</value>
+  </data>
+  <data name="strConnectionEventConnected" xml:space="preserve">
+    <value>Πρωτόκολλο γεγονός που συνδέεται</value>
+  </data>
+  <data name="strConnectionEventConnectedDetail" xml:space="preserve">
+    <value>Σύνδεση με "{0}" μέσω "{1}" από το χρήστη "{2}" (Περιγραφή: «{3}»? Χρήστη το πεδίο: «{4}")</value>
+  </data>
+  <data name="strConnectionEventConnectionFailed" xml:space="preserve">
+    <value>Η συνδεση απέτυχε!</value>
+  </data>
+  <data name="strConnectionEventErrorOccured" xml:space="preserve">
+    <value>Πρωτόκολλο ErrorOccured εκδήλωση</value>
+  </data>
+  <data name="strConnectionOpenFailed" xml:space="preserve">
+    <value>Άνοιγμα σύνδεσης απέτυχε!</value>
+  </data>
+  <data name="strConnectionOpenFailedNoHostname" xml:space="preserve">
+    <value>Δεν μπορεί να ανοίχθει η σύνδεση: Το όνομα του κεντρικού υπολογιστή δεν ειναι καθορισμένο!</value>
+  </data>
+  <data name="strConnectionRdpErrorDetail" xml:space="preserve">
+    <value>RDP λάθος! 
+Κωδικός σφάλματος: {0} 
+Περιγραφή σφάλματος: {1}</value>
+  </data>
+  <data name="strConnections" xml:space="preserve">
+    <value>Συνδέσεις</value>
+  </data>
+  <data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
+    <value>Αδυναμία ορισμού προεπιλεγμένης θύρας!</value>
+  </data>
+  <data name="strConnectionsFileBackupFailed" xml:space="preserve">
+    <value>Δεν ήταν δυνατή η δημιουργία αντιγράφων ασφαλείας των συνδέσεων αρχείου!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeImported" xml:space="preserve">
+    <value>Δεν ήταν δυνατή η εισαγωγή συνδέσεων αρχείου!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeLoaded" xml:space="preserve">
+    <value>Το αρχείο συνδέσεων "{0}" δεν μπορεί να φορτωθεί!</value>
+  </data>
+</root>

mRemoteV1/Language/Language.en-US.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -59,7 +59,7 @@
             : 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: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>
@@ -105,15 +105,15 @@
       </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="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>
@@ -123,31 +123,121 @@
   <data name="strPropertyNameColors" xml:space="preserve">
     <value>Colors</value>
   </data>
-  <data name="strComponentsCheck" xml:space="preserve">
-    <value>Components Check</value>
-  </data>
-  <data name="strCcAlwaysShowScreen" xml:space="preserve">
-    <value>Always show this screen at startup</value>
-  </data>
-  <data name="strCcCheckAgain" xml:space="preserve">
-    <value>Refresh</value>
-  </data>
-  <data name="strConnecting" xml:space="preserve">
-    <value>Connecting...</value>
-  </data>
   <data name="strRDP16777216Colors" xml:space="preserve">
     <value>16777216 Colors (24-bit)</value>
   </data>
   <data name="strRDP256Colors" xml:space="preserve">
     <value>256 Colors (8-bit)</value>
   </data>
+  <data name="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>
-  <data name="strRDP32768Colors" xml:space="preserve">
-    <value>32768 Colors (15-bit)</value>
+  <data name="strThemeDescriptionConfigPanelBackgroundColor" xml:space="preserve">
+    <value>The background color of the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelCategoryTextColor" xml:space="preserve">
+    <value>The color of the category text in the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelGridLineColor" xml:space="preserve">
+    <value>The color of the grid lines in the config panel</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelHelpBackgroundColor" xml:space="preserve">
+    <value>The background color of the help area of the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelHelpTextColor" xml:space="preserve">
+    <value>The color of the text in the help area of the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConfigPanelTextColor" xml:space="preserve">
+    <value>The color of the text in the config panel.</value>
+  </data>
+  <data name="strThemeDescriptionConnectionsPanelBackgroundColor" xml:space="preserve">
+    <value>The background color of the connections panel.</value>
+  </data>
+  <data name="strThemeDescriptionConnectionsPanelTextColor" xml:space="preserve">
+    <value>The color of the text in the connections panel.</value>
+  </data>
+  <data name="strThemeDescriptionConnectionsPanelTreeLineColor" xml:space="preserve">
+    <value>The color of the tree lines in the connections panel.</value>
+  </data>
+  <data name="strThemeDescriptionMenuBackgroundColor" xml:space="preserve">
+    <value>The background color of the menus.</value>
+  </data>
+  <data name="strThemeDescriptionMenuTextColor" xml:space="preserve">
+    <value>The color of the text in the menus.</value>
+  </data>
+  <data name="strThemeDescriptionSearchBoxBackgroundColor" xml:space="preserve">
+    <value>The background color of the search box.</value>
+  </data>
+  <data name="strThemeDescriptionSearchBoxTextColor" xml:space="preserve">
+    <value>The color of the text in the search box.</value>
+  </data>
+  <data name="strThemeDescriptionSearchBoxTextPromptColor" xml:space="preserve">
+    <value>The color of the prompt text in the search box.</value>
+  </data>
+  <data name="strThemeDescriptionToolbarBackgroundColor" xml:space="preserve">
+    <value>The background color of the toolbars.</value>
+  </data>
+  <data name="strThemeDescriptionToolbarTextColor" xml:space="preserve">
+    <value>The color of the text in the toolbars.</value>
+  </data>
+  <data name="strThemeDescriptionWindowBackgroundColor" xml:space="preserve">
+    <value>The background color of the main window.</value>
+  </data>
+  <data name="strThemeNameConfigPanelBackgroundColor" xml:space="preserve">
+    <value>Config Panel Background Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelCategoryTextColor" xml:space="preserve">
+    <value>Config Panel Category Text Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelGridLineColor" xml:space="preserve">
+    <value>Config Panel Grid Line Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelHelpBackgroundColor" xml:space="preserve">
+    <value>Config Panel Help Background Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelHelpTextColor" xml:space="preserve">
+    <value>Config Panel Help Text Color</value>
+  </data>
+  <data name="strThemeNameConfigPanelTextColor" xml:space="preserve">
+    <value>Config Panel Text Color</value>
+  </data>
+  <data name="strThemeNameConnectionsPanelBackgroundColor" xml:space="preserve">
+    <value>Connections Panel Background Color</value>
+  </data>
+  <data name="strThemeNameConnectionsPanelTextColor" xml:space="preserve">
+    <value>Connections Panel Text Color</value>
+  </data>
+  <data name="strThemeNameConnectionsPanelTreeLineColor" xml:space="preserve">
+    <value>Connections Panel Tree Line Color</value>
+  </data>
+  <data name="strThemeNameMenuBackgroundColor" xml:space="preserve">
+    <value>Menu Background Color</value>
+  </data>
+  <data name="strThemeNameMenuTextColor" xml:space="preserve">
+    <value>Menu Text Color</value>
+  </data>
+  <data name="strThemeNameSearchBoxBackgroundColor" xml:space="preserve">
+    <value>Search Box Background Color</value>
+  </data>
+  <data name="strThemeNameSearchBoxTextColor" xml:space="preserve">
+    <value>Search Box Text Color</value>
+  </data>
+  <data name="strThemeNameSearchBoxTextPromptColor" xml:space="preserve">
+    <value>Search Box Text Prompt Color</value>
+  </data>
+  <data name="strThemeNameToolbarBackgroundColor" xml:space="preserve">
+    <value>Toolbar Background Color</value>
+  </data>
+  <data name="strThemeNameToolbarTextColor" xml:space="preserve">
+    <value>Toolbar Text Color</value>
+  </data>
+  <data name="strThemeNameWindowBackgroundColor" xml:space="preserve">
+    <value>Window Background Color</value>
   </data>
 </root>

mRemoteV1/Language/Language.es-AR.resx

@@ -0,0 +1,387 @@
+<?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="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.hu.resx

@@ -0,0 +1,438 @@
+<?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="strAbout" xml:space="preserve">
+    <value>Névjegy</value>
+  </data>
+  <data name="strActive" xml:space="preserve">
+    <value>Aktív</value>
+  </data>
+  <data name="strActivity" xml:space="preserve">
+    <value>Tevékenység</value>
+  </data>
+  <data name="strAddConnection" xml:space="preserve">
+    <value>Új kapcsolat</value>
+  </data>
+  <data name="strAddFolder" xml:space="preserve">
+    <value>Új mappa</value>
+  </data>
+  <data name="strAlways" xml:space="preserve">
+    <value>Mindig</value>
+  </data>
+  <data name="strAlwaysConnectEvenIfAuthFails" xml:space="preserve">
+    <value>Kapcsolódj mindig, sikertelen hitelesítés esetén is</value>
+  </data>
+  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+    <value>Kérdezz rá később</value>
+  </data>
+  <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
+    <value>Javasolt beállítások használata</value>
+  </data>
+  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+    <value>Automatikus frissítés beállításai</value>
+  </data>
+  <data name="strAutomaticallyGetSessionInfo" xml:space="preserve">
+    <value>Munkamenet információk automatikus megszerzése</value>
+  </data>
+  <data name="strAutoSaveEvery" xml:space="preserve">
+    <value>Automatikus mentés minden:</value>
+  </data>
+  <data name="strAutoSaveMins" xml:space="preserve">
+    <value>Perc (0 - kikapcsolva)</value>
+  </data>
+  <data name="strAvailableVersion" xml:space="preserve">
+    <value>Aktuális verzió</value>
+  </data>
+  <data name="strButtonBrowse" xml:space="preserve">
+    <value>&amp;Böngészés...</value>
+  </data>
+  <data name="strButtonCancel" xml:space="preserve">
+    <value>&amp;Mégsem</value>
+  </data>
+  <data name="strButtonChange" xml:space="preserve">
+    <value>Módosít</value>
+  </data>
+  <data name="strButtonClose" xml:space="preserve">
+    <value>Be&amp;zár</value>
+  </data>
+  <data name="strButtonDisconnect" xml:space="preserve">
+    <value>Kapcsolat bontása</value>
+  </data>
+  <data name="strButtonIcon" xml:space="preserve">
+    <value>Ikon</value>
+  </data>
+  <data name="strButtonImport" xml:space="preserve">
+    <value>&amp;Improtálás</value>
+  </data>
+  <data name="strButtonLaunchPutty" xml:space="preserve">
+    <value>PuTTY indítása</value>
+  </data>
+  <data name="strButtonNew" xml:space="preserve">
+    <value>&amp;Új</value>
+  </data>
+  <data name="strButtonOK" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="strButtonProperties" xml:space="preserve">
+    <value>Tulajdonságok</value>
+  </data>
+  <data name="strCannotStartPortScan" xml:space="preserve">
+    <value>Helytelen IP cím, a port szkennelés nem indítható!</value>
+  </data>
+  <data name="strCategoryAppearance" xml:space="preserve">
+    <value>Megjelenés</value>
+  </data>
+  <data name="strCategoryConnection" xml:space="preserve">
+    <value>Kapcsolat</value>
+  </data>
+  <data name="strCategoryCredentials" xml:space="preserve">
+    <value>Hitelesítés</value>
+  </data>
+  <data name="strCategoryDisplay" xml:space="preserve">
+    <value>Képernyő</value>
+  </data>
+  <data name="strCategoryGateway" xml:space="preserve">
+    <value>Átjáró</value>
+  </data>
+  <data name="strCategoryGeneral" xml:space="preserve">
+    <value>Általános</value>
+  </data>
+  <data name="strCategoryMiscellaneous" xml:space="preserve">
+    <value>Egyéb</value>
+  </data>
+  <data name="strCategoryProtocol" xml:space="preserve">
+    <value>Protokoll</value>
+  </data>
+  <data name="strCategoryRedirect" xml:space="preserve">
+    <value>Átirányítás</value>
+  </data>
+  <data name="strCcCheckFailed" xml:space="preserve">
+    <value>Az ellenőrzés sikertelen!</value>
+  </data>
+  <data name="strCcCheckSucceeded" xml:space="preserve">
+    <value>Az ellenőrzés sikeres!</value>
+  </data>
+  <data name="strCheckboxDomain" xml:space="preserve">
+    <value>Tartomány</value>
+  </data>
+  <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
+    <value>Többé ne mutasd ezt az üzenetet.</value>
+  </data>
+  <data name="strColumnFilename" xml:space="preserve">
+    <value>Fájlnév</value>
+  </data>
+  <data name="strColumnHostnameIP" xml:space="preserve">
+    <value>Kiszolgálónév/IP cím</value>
+  </data>
+  <data name="strColumnMessage" xml:space="preserve">
+    <value>Üzenet</value>
+  </data>
+  <data name="strColumnUsername" xml:space="preserve">
+    <value>Felhasználónév</value>
+  </data>
+  <data name="strCommandLineArgsCouldNotBeParsed" xml:space="preserve">
+    <value>Nem értelmezhető parancssori argumentum!</value>
+  </data>
+  <data name="strConnecting" xml:space="preserve">
+    <value>Kapcsolódás...</value>
+  </data>
+  <data name="strConnectionEventConnectionFailed" xml:space="preserve">
+    <value>Sikertelen kapcsolódás!</value>
+  </data>
+  <data name="strConnections" xml:space="preserve">
+    <value>Kapcsolatok</value>
+  </data>
+  <data name="strCurrentVersion" xml:space="preserve">
+    <value>Telepített verzió</value>
+  </data>
+  <data name="strDontConnectWhenAuthFails" xml:space="preserve">
+    <value>Ne kapcsolódj sikertelen hitelesítéskor</value>
+  </data>
+  <data name="strDoubleClickTabClosesIt" xml:space="preserve">
+    <value>Duplaklikk a fülön bezárja azt</value>
+  </data>
+  <data name="strExperimental" xml:space="preserve">
+    <value>Kísérleti</value>
+  </data>
+  <data name="strFullscreen" xml:space="preserve">
+    <value>Teljes képernyő</value>
+  </data>
+  <data name="strGeneral" xml:space="preserve">
+    <value>Általános</value>
+  </data>
+  <data name="strGroupboxFiles" xml:space="preserve">
+    <value>Fájlok</value>
+  </data>
+  <data name="strHttpConnectFailed" xml:space="preserve">
+    <value>A HTTP csatlakozás nem sikerült!</value>
+  </data>
+  <data name="strImportExport" xml:space="preserve">
+    <value>Importálás/Exportálás</value>
+  </data>
+  <data name="strKeysCtrlAltDel" xml:space="preserve">
+    <value>CTRL-ALT-DEL</value>
+  </data>
+  <data name="strKeysCtrlEsc" xml:space="preserve">
+    <value>CONTROL-ESC</value>
+  </data>
+  <data name="strLabelAddress" xml:space="preserve">
+    <value>Cím:</value>
+  </data>
+  <data name="strLabelDisplayName" xml:space="preserve">
+    <value>Megjelenítendő név</value>
+  </data>
+  <data name="strLabelDomain" xml:space="preserve">
+    <value>Tartomány:</value>
+  </data>
+  <data name="strLabelFilename" xml:space="preserve">
+    <value>Fájlnév:</value>
+  </data>
+  <data name="strLabelHostname" xml:space="preserve">
+    <value>Hosztnév:</value>
+  </data>
+  <data name="strLabelOptions" xml:space="preserve">
+    <value>Opciók:</value>
+  </data>
+  <data name="strLabelPassword" xml:space="preserve">
+    <value>Jelszó:</value>
+  </data>
+  <data name="strLabelPort" xml:space="preserve">
+    <value>Port:</value>
+  </data>
+  <data name="strLabelPortableEdition" xml:space="preserve">
+    <value>Hordozható kiadás</value>
+  </data>
+  <data name="strLabelProtocol" xml:space="preserve">
+    <value>Protokoll:</value>
+  </data>
+  <data name="strLabelServerStatus" xml:space="preserve">
+    <value>Szerver állapot:</value>
+  </data>
+  <data name="strLabelSQLDatabaseName" xml:space="preserve">
+    <value>Adatbázis:</value>
+  </data>
+  <data name="strLabelSQLServerDatabaseName" xml:space="preserve">
+    <value>Adatbázis:</value>
+  </data>
+  <data name="strLabelUsername" xml:space="preserve">
+    <value>Felhasználónév:</value>
+  </data>
+  <data name="strLabelVerify" xml:space="preserve">
+    <value>Ellenőrzés:</value>
+  </data>
+  <data name="strLanguage" xml:space="preserve">
+    <value>Nyelv</value>
+  </data>
+  <data name="strLanguageDefault" xml:space="preserve">
+    <value>(Automatikus észlelés)</value>
+  </data>
+  <data name="strMenuAbout" xml:space="preserve">
+    <value>Névjegy</value>
+  </data>
+  <data name="strMenuCheckForUpdates" xml:space="preserve">
+    <value>Frissítés keresése</value>
+  </data>
+  <data name="strMenuJumpTo" xml:space="preserve">
+    <value>Ugrás</value>
+  </data>
+  <data name="strMenuLaunchExternalTool" xml:space="preserve">
+    <value>Külső eszköz indítása</value>
+  </data>
+  <data name="strMenuNewConnectionFile" xml:space="preserve">
+    <value>Új kapcsolatfájl</value>
+  </data>
+  <data name="strMenuNewExternalTool" xml:space="preserve">
+    <value>Új külső eszköz</value>
+  </data>
+  <data name="strMenuNotifications" xml:space="preserve">
+    <value>Értesítések</value>
+  </data>
+  <data name="strMenuOpenConnectionFile" xml:space="preserve">
+    <value>Kapcsolatfájl megnyitása...</value>
+  </data>
+  <data name="strMenuOptions" xml:space="preserve">
+    <value>Opciók</value>
+  </data>
+  <data name="strMenuReconnect" xml:space="preserve">
+    <value>Újrakapcsolódás</value>
+  </data>
+  <data name="strMenuRename" xml:space="preserve">
+    <value>Átnevezés</value>
+  </data>
+  <data name="strMenuRenameConnection" xml:space="preserve">
+    <value>Kapcsolat átnevezése</value>
+  </data>
+  <data name="strMenuRenameFolder" xml:space="preserve">
+    <value>Könyvtár átnevezése</value>
+  </data>
+  <data name="strMenuRenameTab" xml:space="preserve">
+    <value>Fül átnevezése</value>
+  </data>
+  <data name="strMenuReportBug" xml:space="preserve">
+    <value>Hibabejelentés</value>
+  </data>
+  <data name="strMenuResetLayout" xml:space="preserve">
+    <value>Elrendezés alaphelyzetbe állítása</value>
+  </data>
+  <data name="strMenuSaveConnectionFile" xml:space="preserve">
+    <value>Kapcsolatfájl mentése</value>
+  </data>
+  <data name="strMenuSaveConnectionFileAs" xml:space="preserve">
+    <value>Kapcsolatfájl mentése, mint...</value>
+  </data>
+  <data name="strMenuScreenshot" xml:space="preserve">
+    <value>Képernyőmentés</value>
+  </data>
+  <data name="strMenuScreenshotManager" xml:space="preserve">
+    <value>Képernyőmentés kezelő</value>
+  </data>
+  <data name="strMenuSessions" xml:space="preserve">
+    <value>Munkamenetek</value>
+  </data>
+  <data name="strMenuSessionsAndScreenshots" xml:space="preserve">
+    <value>Munkamanetek és képernyőmentések</value>
+  </data>
+  <data name="strMenuWebsite" xml:space="preserve">
+    <value>Honlap</value>
+  </data>
+  <data name="strNever" xml:space="preserve">
+    <value>Soha</value>
+  </data>
+  <data name="strNewConnection" xml:space="preserve">
+    <value>Új kapcsolat</value>
+  </data>
+  <data name="strNewFolder" xml:space="preserve">
+    <value>Új mappa</value>
+  </data>
+  <data name="strNewPanel" xml:space="preserve">
+    <value>Új panel</value>
+  </data>
+  <data name="strNewRoot" xml:space="preserve">
+    <value>Új gyökérelem</value>
+  </data>
+  <data name="strNewTitle" xml:space="preserve">
+    <value>Új cím</value>
+  </data>
+  <data name="strNo" xml:space="preserve">
+    <value>Nem</value>
+  </data>
+  <data name="strUseSQLServer" xml:space="preserve">
+    <value>SQL szerver használata a kapcsolatok kezelésére</value>
+  </data>
+</root>

mRemoteV1/Language/Language.pt-BR.resx

@@ -0,0 +1,490 @@
+<?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="strAbout" xml:space="preserve">
+    <value>Sobre</value>
+  </data>
+  <data name="strActive" xml:space="preserve">
+    <value>Ativo</value>
+  </data>
+  <data name="strActivity" xml:space="preserve">
+    <value>Atividade</value>
+  </data>
+  <data name="strAddConnection" xml:space="preserve">
+    <value>Nova conexão</value>
+  </data>
+  <data name="strAddFolder" xml:space="preserve">
+    <value>Nova pasta</value>
+  </data>
+  <data name="strAddNodeFromXmlFailed" xml:space="preserve">
+    <value>AddNodeFromXML falhou!</value>
+  </data>
+  <data name="strAddNodesFromSqlFailed" xml:space="preserve">
+    <value>AddNodesFromSQL falhou!</value>
+  </data>
+  <data name="strAllowOnlySingleInstance" xml:space="preserve">
+    <value>Permitir apenas uma única instância do aplicativo (É necessário reiniciar o mRemoteNG)</value>
+  </data>
+  <data name="strAlways" xml:space="preserve">
+    <value>Sempre</value>
+  </data>
+  <data name="strAlwaysConnectEvenIfAuthFails" xml:space="preserve">
+    <value>Conectar sempre, mesmo se a autenticação falhar</value>
+  </data>
+  <data name="strAlwaysShowPanelSelection" xml:space="preserve">
+    <value>Sempre mostrar a caixa de diálogo de seleção de painel ao abrir conexões</value>
+  </data>
+  <data name="strAlwaysShowSysTrayIcon" xml:space="preserve">
+    <value>Sempre mostrar ícone da área de notificação</value>
+  </data>
+  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+    <value>Me pergunte novamente mais tarde</value>
+  </data>
+  <data name="strAskUpdatesCommandCustom" xml:space="preserve">
+    <value>Personalizar as configurações agora</value>
+  </data>
+  <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
+    <value>Usar as configurações recomendadas</value>
+  </data>
+  <data name="strAskUpdatesContent" xml:space="preserve">
+    <value>{0} pode verificar automaticamente as atualizações que podem fornecer novas funcionalidades e correções de bugs. É recomendável que você permita {0} verificar atualizações semanais.</value>
+  </data>
+  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+    <value>Configurações de atualização automática</value>
+  </data>
+  <data name="strAspect" xml:space="preserve">
+    <value>Aspecto</value>
+  </data>
+  <data name="strAutomaticallyGetSessionInfo" xml:space="preserve">
+    <value>Obter automaticamente informações de sessão</value>
+  </data>
+  <data name="strAutoSaveEvery" xml:space="preserve">
+    <value>Salvar automaticamente a cada:</value>
+  </data>
+  <data name="strAutoSaveMins" xml:space="preserve">
+    <value>Minutos (0 significa desativado)</value>
+  </data>
+  <data name="strAvailableVersion" xml:space="preserve">
+    <value>Versão atual</value>
+  </data>
+  <data name="strButtonBrowse" xml:space="preserve">
+    <value>&amp; Procurar...</value>
+  </data>
+  <data name="strButtonCancel" xml:space="preserve">
+    <value>&amp; Cancelar</value>
+  </data>
+  <data name="strButtonChange" xml:space="preserve">
+    <value>Alterar</value>
+  </data>
+  <data name="strButtonClose" xml:space="preserve">
+    <value>&amp; Fechar</value>
+  </data>
+  <data name="strButtonDefaultInheritance" xml:space="preserve">
+    <value>Herança padrão</value>
+  </data>
+  <data name="strButtonDefaultProperties" xml:space="preserve">
+    <value>Propriedades padrões</value>
+  </data>
+  <data name="strButtonDisconnect" xml:space="preserve">
+    <value>Desconectar</value>
+  </data>
+  <data name="strButtonIcon" xml:space="preserve">
+    <value>Ícone</value>
+  </data>
+  <data name="strButtonImport" xml:space="preserve">
+    <value>&amp; Importar</value>
+  </data>
+  <data name="strButtonInheritance" xml:space="preserve">
+    <value>Herança</value>
+  </data>
+  <data name="strButtonLaunchPutty" xml:space="preserve">
+    <value>Executar o PuTTY</value>
+  </data>
+  <data name="strButtonNew" xml:space="preserve">
+    <value>&amp; Novo</value>
+  </data>
+  <data name="strButtonOK" xml:space="preserve">
+    <value>&amp; OK</value>
+  </data>
+  <data name="strButtonProperties" xml:space="preserve">
+    <value>Propriedades</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>Testar Proxy</value>
+  </data>
+  <data name="strCannotImportNormalSessionFile" xml:space="preserve">
+    <value>Você não pode importar um arquivo de conexão normal. Por favor, use Arquivo - Carregar Conexões para os arquivos de conexão normal!</value>
+  </data>
+  <data name="strCannotStartPortScan" xml:space="preserve">
+    <value>Não é possível iniciar a varredura de portas, formato IP incorreto!</value>
+  </data>
+  <data name="strCategoryAppearance" xml:space="preserve">
+    <value>Aparência</value>
+  </data>
+  <data name="strCategoryConnection" xml:space="preserve">
+    <value>Conexão</value>
+  </data>
+  <data name="strCategoryCredentials" xml:space="preserve">
+    <value>Credenciais</value>
+  </data>
+  <data name="strCategoryDisplay" xml:space="preserve">
+    <value>Mostrar</value>
+  </data>
+  <data name="strCategoryGateway" xml:space="preserve">
+    <value>Gateway</value>
+  </data>
+  <data name="strCategoryGeneral" xml:space="preserve">
+    <value>Geral</value>
+  </data>
+  <data name="strCategoryMiscellaneous" xml:space="preserve">
+    <value>Diversos</value>
+  </data>
+  <data name="strCategoryProtocol" xml:space="preserve">
+    <value>Protocolo</value>
+  </data>
+  <data name="strCategoryRedirect" xml:space="preserve">
+    <value>Redirecionar</value>
+  </data>
+  <data name="strCcAlwaysShowScreen" xml:space="preserve">
+    <value>Sempre mostrar esta tela na inicialização</value>
+  </data>
+  <data name="strCcCheckAgain" xml:space="preserve">
+    <value>Atualizar</value>
+  </data>
+  <data name="strCcCheckFailed" xml:space="preserve">
+    <value>Falha na verificação!</value>
+  </data>
+  <data name="strCcCheckSucceeded" xml:space="preserve">
+    <value>Verificação com sucesso!</value>
+  </data>
+  <data name="strCcEOLFailed" xml:space="preserve">
+    <value>O recurso de sessões (RDP) requer que você tenha uma cópia registrada do eolwtscom.dll no seu sistema. 
+mRemoteNG vem com este componente mas não o registra automaticamente a menos que você instale o pacote. 
+Para registrá-lo manualmente faça isso: Abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\Program Files\mRemoteNG\eolwtscom.dll" (onde c:\Program Files\mRemoteNG\ é o caminho para a instalação de mRemoteNG). 
+Se você ainda não conseguir passar por esta verificação ou não conseguir usar o recurso de sessões (RDP) no mRemoteNG, por favor, consulte o fórum de mRemoteNG em http://forum.mremoteng.org/</value>
+  </data>
+  <data name="strCcEOLOK" xml:space="preserve">
+    <value>EOLWTSCOM foi encontrada e parece ser registrado corretamente.</value>
+  </data>
+  <data name="strCcGeckoFailed" xml:space="preserve">
+    <value>Para usar o motor de renderização Gecko, você precisa ter o XULrunner 1.8.1.x e o caminho para a instalação do conjunto em suas opções. 
+Você pode baixar o XULrunner 1.8.1.3 em: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ 
+Quando terminar de baixar o pacote, extraia o pacote para um caminho de sua escolha. 
+Em seguida, emtre no mRemoteNG e vá em ferramentas - opções - avançadas e digite o caminho correto no campo caminho XULrunner. 
+Se ainda não conseguir passar esta verificação ou usar o motor Gecko em mRemoteNG por favor consultar o fórum de mRemoteNG em http://forum.mremoteng.org/</value>
+  </data>
+  <data name="strCcGeckoOK" xml:space="preserve">
+    <value>XULrunner foi encontrado e aparenta estar instalado corretamente.</value>
+  </data>
+  <data name="strCcICAFailed" xml:space="preserve">
+    <value>ICA requer que o XenDesktop Online Plugin esteja instalado e a biblioteca wfica.ocs registrada. Você pode baixar o cliente aqui: http://www.citrix.com/download/ 
+Se você tiver o Plugin Online XenDesktop instalado e a verificação ainda falhar, tente registrar manualmente o wfica.ocx 
+Para fazer isso abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (onde c:\Program Files\Citrix\ICA Client\ é o caminho para a instalação do Plugin Online do XenDesktop). 
+Se você ainda não puder passar por esta verificação ou usar ICA em mRemoteNG, por favor, consulte o fórum de mRemoteNG no http://forum.mremoteng.org/"</value>
+  </data>
+  <data name="strCcICAOK" xml:space="preserve">
+    <value>Todos os componentes de ICA, foram encontrados e parecem ser registrado corretamente. Citrix ICA cliente controle versão {0}</value>
+  </data>
+  <data name="strCcNotInstalledProperly" xml:space="preserve">
+    <value>não instalado corretamente</value>
+  </data>
+  <data name="strCcPuttyFailed" xml:space="preserve">
+    <value>O SSH, Telnet, Rlogin e protocolos RAW precisam PuTTY para trabalhar. PuTTY vem com cada pacote de mRemoteNG e está localizado no caminho de instalação. 
+Por favor, certifique-se de que você tem o Putty.exe em seu diretório mRemoteNG (padrão: c:\Program Files\mRemoteNG\) ou que você tenha especificado um caminho válido para seu executável PuTTY nas opções (ferramentas - opções - avançadas - caminho personalizado PuTTY)</value>
+  </data>
+  <data name="strCcPuttyOK" xml:space="preserve">
+    <value>O executável PuTTY foi encontrado e está pronto para usar.</value>
+  </data>
+  <data name="strCheckboxDomain" xml:space="preserve">
+    <value>Domínio</value>
+  </data>
+  <data name="strCheckboxDoNotShowThisMessageAgain" xml:space="preserve">
+    <value>Não mostre esta mensagem novamente.</value>
+  </data>
+  <data name="strCheckboxInheritance" xml:space="preserve">
+    <value>Herança</value>
+  </data>
+  <data name="strCheckboxPassword" xml:space="preserve">
+    <value>Senha</value>
+  </data>
+  <data name="strCheckboxProxyAuthentication" xml:space="preserve">
+    <value>Este servidor proxy requer autenticação</value>
+  </data>
+  <data name="strCheckboxPuttyPath" xml:space="preserve">
+    <value>Use o caminho personalizado para o PuTTY:</value>
+  </data>
+  <data name="strCheckboxReconnectWhenReady" xml:space="preserve">
+    <value>Reconectar quando estiver pronto</value>
+  </data>
+  <data name="strCheckboxUpdateUseProxy" xml:space="preserve">
+    <value>Usar um servidor proxy para se conectar</value>
+  </data>
+  <data name="strCheckboxUsername" xml:space="preserve">
+    <value>Nome de usuário</value>
+  </data>
+  <data name="strCheckboxWaitForExit" xml:space="preserve">
+    <value>Esperar para sair</value>
+  </data>
+  <data name="strCheckForUpdate" xml:space="preserve">
+    <value>Verificar novamente</value>
+  </data>
+  <data name="strCheckForUpdatesOnStartup" xml:space="preserve">
+    <value>Verificar se há atualizações e anúncios na inicialização</value>
+  </data>
+  <data name="strCheckNow" xml:space="preserve">
+    <value>Verificar agora</value>
+  </data>
+  <data name="strClosedPorts" xml:space="preserve">
+    <value>Portas fechadas</value>
+  </data>
+  <data name="strCollapseAllFolders" xml:space="preserve">
+    <value>Recolher todas as pastas</value>
+  </data>
+  <data name="strColumnArguments" xml:space="preserve">
+    <value>Argumentos</value>
+  </data>
+  <data name="strColumnDisplayName" xml:space="preserve">
+    <value>Nome de exibição</value>
+  </data>
+  <data name="strColumnFilename" xml:space="preserve">
+    <value>Nome do arquivo</value>
+  </data>
+  <data name="strColumnHostnameIP" xml:space="preserve">
+    <value>HostName/IP</value>
+  </data>
+  <data name="strColumnMessage" xml:space="preserve">
+    <value>Mensagem</value>
+  </data>
+  <data name="strColumnUsername" xml:space="preserve">
+    <value>Nome de usuário</value>
+  </data>
+  <data name="strColumnWaitForExit" xml:space="preserve">
+    <value>Esperar para sair</value>
+  </data>
+  <data name="strComponentsCheck" xml:space="preserve">
+    <value>Validação de componentes</value>
+  </data>
+  <data name="strConfigPropertyGridButtonIconClickFailed" xml:space="preserve">
+    <value>btnIcon_Click falhou!</value>
+  </data>
+  <data name="strConfigPropertyGridHideItemsFailed" xml:space="preserve">
+    <value>ShowHideGridItems falhou!</value>
+  </data>
+  <data name="strConfigPropertyGridMenuClickFailed" xml:space="preserve">
+    <value>IconMenu_Click falhou!</value>
+  </data>
+  <data name="strConfigPropertyGridObjectFailed" xml:space="preserve">
+    <value>Propriedade do Objeto de grade falhou!</value>
+  </data>
+  <data name="strConfigPropertyGridSetHostStatusFailed" xml:space="preserve">
+    <value>SetHostStatus falhou!</value>
+  </data>
+  <data name="strConfigPropertyGridValueFailed" xml:space="preserve">
+    <value>pGrid_PopertyValueChanged falhou!</value>
+  </data>
+  <data name="strConfigUiLoadFailed" xml:space="preserve">
+    <value>Config UI carregamento falhou!</value>
+  </data>
+  <data name="strConfirmCloseConnectionMainInstruction" xml:space="preserve">
+    <value>Você quer fechar a conexão, "{0}"?</value>
+  </data>
+  <data name="strConfirmCloseConnectionPanelMainInstruction" xml:space="preserve">
+    <value>Tem certeza que deseja fechar o painel, "{0}"? Todas as ligações ativas serão fechadas.</value>
+  </data>
+  <data name="strConfirmDeleteExternalTool" xml:space="preserve">
+    <value>Tem certeza que deseja excluir a ferramenta externa, "{0}"?</value>
+  </data>
+  <data name="strConfirmDeleteExternalToolMultiple" xml:space="preserve">
+    <value>Tem certeza que deseja excluir as ferramentas externas {0} selecionadas?</value>
+  </data>
+  <data name="strConfirmDeleteNodeConnection" xml:space="preserve">
+    <value>Tem certeza que deseja excluir a ligação, "{0}"?</value>
+  </data>
+  <data name="strConfirmDeleteNodeFolder" xml:space="preserve">
+    <value>Tem certeza que deseja excluir a pasta vazia, "{0}"?</value>
+  </data>
+  <data name="strConfirmDeleteNodeFolderNotEmpty" xml:space="preserve">
+    <value>Tem certeza que deseja excluir a pasta, "{0}"? Pastas ou ligações que ele contém também serão excluídas.</value>
+  </data>
+  <data name="strConfirmExitMainInstruction" xml:space="preserve">
+    <value>Você quer fechar todas as conexões abertas?</value>
+  </data>
+  <data name="strConfirmResetLayout" xml:space="preserve">
+    <value>Tem certeza de que deseja redefinir os painéis para o layout padrão?</value>
+  </data>
+  <data name="strConnect" xml:space="preserve">
+    <value>Conectar-se</value>
+  </data>
+  <data name="strConnectInFullscreen" xml:space="preserve">
+    <value>Se conectar em modo fullscreen</value>
+  </data>
+  <data name="strConnecting" xml:space="preserve">
+    <value>Conectando...</value>
+  </data>
+  <data name="strConnectionEventConnected" xml:space="preserve">
+    <value>Protocolo evento conectado</value>
+  </data>
+  <data name="strConnectionEventConnectedDetail" xml:space="preserve">
+    <value>Conexão para "{0}" via "{1}" estabelecido pelo usuário "{2}" (Descrição: "{3}"; Campo usuário: "{4}")</value>
+  </data>
+  <data name="strConnectionEventConnectionFailed" xml:space="preserve">
+    <value>Conexão falhou!</value>
+  </data>
+  <data name="strConnectionEventErrorOccured" xml:space="preserve">
+    <value>Erro no evento de protocolo</value>
+  </data>
+  <data name="strConnectionOpenFailed" xml:space="preserve">
+    <value>Abrir conexão falhou!</value>
+  </data>
+  <data name="strConnectionOpenFailedNoHostname" xml:space="preserve">
+    <value>Não é possível abrir a conexão: nenhum nome de host especificado!</value>
+  </data>
+  <data name="strConnectionRdpErrorDetail" xml:space="preserve">
+    <value>Erro RDP!
+Código de erro: {0}
+Descrição do erro: {1}</value>
+  </data>
+  <data name="strConnections" xml:space="preserve">
+    <value>Conexões</value>
+  </data>
+  <data name="strConnectionSetDefaultPortFailed" xml:space="preserve">
+    <value>Impossível definir porta padrão!</value>
+  </data>
+  <data name="strConnectionsFileBackupFailed" xml:space="preserve">
+    <value>Não foi possível criar o backup do arquivo de conexões!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeImported" xml:space="preserve">
+    <value>Falha na importação do arquivo de conexões!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeLoaded" xml:space="preserve">
+    <value>Arquivo de conexões "{0}" não pôde ser carregado!</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeLoadedNew" xml:space="preserve">
+    <value>Arquivo de conexões "{0}" não pôde ser carregado! Começando com o novo arquivo de conexões.</value>
+  </data>
+  <data name="strConnectionsFileCouldNotBeSaved" xml:space="preserve">
+    <value>Não consegui salvar o arquivo de conexões!</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
@@ -121,6 +113,10 @@ Namespace Messages
             AddToList(lvItem)
         End Sub
 
+        Public Sub AddExceptionMessage(ByVal message As String, ByVal ex As Exception, Optional ByVal msgClass As MessageClass = MessageClass.ErrorMsg, Optional ByVal logOnly As Boolean = False)
+            AddMessage(msgClass, message & vbNewLine & Tools.Misc.GetExceptionMessageRecursive(ex), logOnly)
+        End Sub
+
         Private Sub SwitchTimerTick(ByVal sender As Object, ByVal e As System.EventArgs)
             Me.SwitchToMessage()
             Me.ECTimer.Enabled = False
@@ -138,11 +134,11 @@ Namespace Messages
         Private Shared Sub ShowMessageBox(ByVal Msg As Messages.Message)
             Select Case Msg.MsgClass
                 Case Messages.MessageClass.InformationMsg
-                    MessageBox.Show(Msg.MsgText, String.Format(My.Resources.strTitleInformation, 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, String.Format(My.Resources.strTitleWarning, 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, String.Format(My.Resources.strTitleError, 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,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:2.0.50727.4927
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.239
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -14,10 +14,10 @@ Option Explicit On
 
 Namespace My
     
-    'HINWEIS: Diese Datei wird automatisch generiert. Ändern Sie sie nicht direkt. Zum Ändern
-    ' oder bei in dieser Datei auftretenden Buildfehlern wechseln Sie zum Projekt-Designer.
-    ' (Wechseln Sie dazu zu den Projekteigenschaften, oder doppelklicken Sie auf den Knoten "Eigenes Projekt" im
-    ' Projektmappen-Explorer). Nehmen Sie auf der Registerkarte "Anwendung" entsprechende Änderungen vor.
+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
+    ' or if you encounter build errors in this file, go to the Project Designer
+    ' (go to Project Properties or double-click the My Project node in
+    ' Solution Explorer), and make changes on the Application tab.
     '
     Partial Friend Class MyApplication
         

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-2009 Felix Deimel, 2010-2011 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,4 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.67.*")> 
+<Assembly: AssemblyVersion("1.71.*")> 
+
+<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/Settings.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.5444
+'     Runtime Version:4.0.30319.1008
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -15,12 +15,12 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
         
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings),MySettings)
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
         
 #Region "My.Settings Auto-Save Functionality"
 #If _MyType = "WindowsForms" Then
@@ -185,7 +185,7 @@ Namespace My
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
         Public Property AutomaticallyGetSessionInfo() As Boolean
             Get
                 Return CType(Me("AutomaticallyGetSessionInfo"),Boolean)
@@ -234,19 +234,6 @@ Namespace My
             End Set
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
-         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
-        Public Property ConfirmExit() As Boolean
-            Get
-                Return CType(Me("ConfirmExit"),Boolean)
-            End Get
-            Set
-                Me("ConfirmExit") = value
-            End Set
-        End Property
-        
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -1743,7 +1730,7 @@ Namespace My
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
         Public Property StartupComponentsCheck() As Boolean
             Get
                 Return CType(Me("StartupComponentsCheck"),Boolean)
@@ -2093,7 +2080,7 @@ Namespace My
         
         <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("de,en,en-US,fr")>  _
+         Global.System.Configuration.DefaultSettingValueAttribute("de,el,en,en-US,es-AR,es,fr,hu,it,nb-NO,nl,pt,pt-BR,pl,ru,uk,zh-CN,zh-TW")>  _
         Public ReadOnly Property SupportedUICultures() As String
             Get
                 Return CType(Me("SupportedUICultures"),String)
@@ -2207,10 +2194,10 @@ Namespace My
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
-        Public Property ConfirmCloseConnection() As Boolean
+         Global.System.Configuration.DefaultSettingValueAttribute("4")>  _
+        Public Property ConfirmCloseConnection() As Integer
             Get
-                Return CType(Me("ConfirmCloseConnection"),Boolean)
+                Return CType(Me("ConfirmCloseConnection"),Integer)
             End Get
             Set
                 Me("ConfirmCloseConnection") = value
@@ -2240,6 +2227,251 @@ Namespace My
                 Me("MainFormRestoreLocation") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("mRemoteNG")>  _
+        Public Property SQLDatabaseName() As String
+            Get
+                Return CType(Me("SQLDatabaseName"),String)
+            End Get
+            Set
+                Me("SQLDatabaseName") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("10"),  _
+         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
+        Public Property BackupFileKeepCount() As Integer
+            Get
+                Return CType(Me("BackupFileKeepCount"),Integer)
+            End Get
+            Set
+                Me("BackupFileKeepCount") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("{0}.{1:yyyyMMdd-HHmmssffff}.backup"),  _
+         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
+        Public Property BackupFileNameFormat() As String
+            Get
+                Return CType(Me("BackupFileNameFormat"),String)
+            End Get
+            Set
+                Me("BackupFileNameFormat") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property InhDefaultUseCredSsp() As Boolean
+            Get
+                Return CType(Me("InhDefaultUseCredSsp"),Boolean)
+            End Get
+            Set
+                Me("InhDefaultUseCredSsp") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public Property ConDefaultUseCredSsp() As Boolean
+            Get
+                Return CType(Me("ConDefaultUseCredSsp"),Boolean)
+            End Get
+            Set
+                Me("ConDefaultUseCredSsp") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False"),  _
+         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
+        Public Property AlwaysShowPanelTabs() As Boolean
+            Get
+                Return CType(Me("AlwaysShowPanelTabs"),Boolean)
+            End Get
+            Set
+                Me("AlwaysShowPanelTabs") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False"),  _
+         Global.System.Configuration.SettingsManageabilityAttribute(Global.System.Configuration.SettingsManageability.Roaming)>  _
+        Public Property IdentifyQuickConnectTabs() As Boolean
+            Get
+                Return CType(Me("IdentifyQuickConnectTabs"),Boolean)
+            End Get
+            Set
+                Me("IdentifyQuickConnectTabs") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("release")>  _
+        Public ReadOnly Property UpdateChannel() As String
+            Get
+                Return CType(Me("UpdateChannel"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property ThemeName() As String
+            Get
+                Return CType(Me("ThemeName"),String)
+            End Get
+            Set
+                Me("ThemeName") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public Property ShowConfigHelpText() As Boolean
+            Get
+                Return CType(Me("ShowConfigHelpText"),Boolean)
+            End Get
+            Set
+                Me("ShowConfigHelpText") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property PuttySavedSessionsName() As String
+            Get
+                Return CType(Me("PuttySavedSessionsName"),String)
+            End Get
+            Set
+                Me("PuttySavedSessionsName") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property PuttySavedSessionsPanel() As String
+            Get
+                Return CType(Me("PuttySavedSessionsPanel"),String)
+            End Get
+            Set
+                Me("PuttySavedSessionsPanel") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public Property CompatibilityWarnLenovoAutoScrollUtility() As Boolean
+            Get
+                Return CType(Me("CompatibilityWarnLenovoAutoScrollUtility"),Boolean)
+            End Get
+            Set
+                Me("CompatibilityWarnLenovoAutoScrollUtility") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("https://update.mremoteng.org/announcement.txt")>  _
+        Public ReadOnly Property AnnouncementAddress() As String
+            Get
+                Return CType(Me("AnnouncementAddress"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("https://update.mremoteng.org/")>  _
+        Public Property UpdateAddress() As String
+            Get
+                Return CType(Me("UpdateAddress"),String)
+            End Get
+            Set
+                Me("UpdateAddress") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("")>  _
+        Public Property ConDefaultLoadBalanceInfo() As String
+            Get
+                Return CType(Me("ConDefaultLoadBalanceInfo"),String)
+            End Get
+            Set
+                Me("ConDefaultLoadBalanceInfo") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public Property ConDefaultAutomaticResize() As Boolean
+            Get
+                Return CType(Me("ConDefaultAutomaticResize"),Boolean)
+            End Get
+            Set
+                Me("ConDefaultAutomaticResize") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property InhDefaultLoadBalanceInfo() As Boolean
+            Get
+                Return CType(Me("InhDefaultLoadBalanceInfo"),Boolean)
+            End Get
+            Set
+                Me("InhDefaultLoadBalanceInfo") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property InhDefaultAutomaticResize() As Boolean
+            Get
+                Return CType(Me("InhDefaultAutomaticResize"),Boolean)
+            End Get
+            Set
+                Me("InhDefaultAutomaticResize") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

mRemoteV1/My Project/Settings.settings

@@ -33,7 +33,7 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="AutomaticallyGetSessionInfo" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="LoadConsFromCustomLocation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
@@ -44,9 +44,6 @@
     <Setting Name="SaveConsOnExit" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="ConfirmExit" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
-    </Setting>
     <Setting Name="CheckForUpdatesOnStartup" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
@@ -393,7 +390,7 @@
       <Value Profile="(Default)">5500</Value>
     </Setting>
     <Setting Name="StartupComponentsCheck" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="XULRunnerPath" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -474,7 +471,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="SupportedUICultures" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">de,en,en-US,fr</Value>
+      <Value Profile="(Default)">de,el,en,en-US,es-AR,es,fr,hu,it,nb-NO,nl,pt,pt-BR,pl,ru,uk,zh-CN,zh-TW</Value>
     </Setting>
     <Setting Name="ConDefaultRDGatewayHostname" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -500,8 +497,8 @@
     <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 Name="ConfirmCloseConnection" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">4</Value>
     </Setting>
     <Setting Name="MainFormRestoreSize" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Size" Scope="User">
       <Value Profile="(Default)" />
@@ -509,5 +506,62 @@
     <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>
+    <Setting Name="IdentifyQuickConnectTabs" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Roaming="true" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="UpdateChannel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">release</Value>
+    </Setting>
+    <Setting Name="ThemeName" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="ShowConfigHelpText" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="PuttySavedSessionsName" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="PuttySavedSessionsPanel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="CompatibilityWarnLenovoAutoScrollUtility" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="AnnouncementAddress" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">https://update.mremoteng.org/announcement.txt</Value>
+    </Setting>
+    <Setting Name="UpdateAddress" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)">https://update.mremoteng.org/</Value>
+    </Setting>
+    <Setting Name="ConDefaultLoadBalanceInfo" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="ConDefaultAutomaticResize" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="InhDefaultLoadBalanceInfo" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="InhDefaultAutomaticResize" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

mRemoteV1/Root/PuttySessions.Info.vb

@@ -0,0 +1,29 @@
+Imports mRemoteNG.Tools.LocalizedAttributes
+
+Namespace Root
+    Namespace PuttySessions
+        Public Class Info
+            Inherits Root.Info
+
+            Public Sub New()
+                MyBase.New(RootType.PuttySessions)
+            End Sub
+
+            Public Overrides Property Name() As String
+
+            Private _panel As String = My.Language.strGeneral
+            <LocalizedCategory("strCategoryDisplay", 1), _
+            LocalizedDisplayName("strPropertyNamePanel"), _
+            LocalizedDescription("strPropertyDescriptionPanel")> _
+            Public Property Panel() As String
+                Get
+                    Return _panel
+                End Get
+                Set(ByVal value As String)
+                    _panel = value
+                End Set
+            End Property
+        End Class
+    End Namespace
+End Namespace
+

mRemoteV1/Root/Root.Info.vb

@@ -10,7 +10,7 @@ Namespace Root
         End Sub
 
 #Region "Properties"
-        Private _Name As String = My.Resources.strConnections
+        Private _Name As String = My.Language.strConnections
         <LocalizedCategory("strCategoryDisplay", 1), _
             Browsable(True), _
             [ReadOnly](False), _
@@ -20,7 +20,7 @@ Namespace Root
             LocalizedDisplayName("strPropertyNameName"), _
             LocalizedDescription("strPropertyDescriptionName"), _
             Attributes.Root()> _
-        Public Property Name() As String
+        Public Overridable Property Name() As String
             Get
                 Return Me._Name
             End Get
@@ -104,6 +104,7 @@ Namespace Root
         Public Enum RootType
             Connection
             Credential
+            PuttySessions
         End Enum
 
         Public Class Attributes

mRemoteV1/Security/Security.Crypt.vb

@@ -37,47 +37,52 @@ Namespace Security
 
                 Return Convert.ToBase64String(encdata)
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Encryption failed" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Language.strErrorEncryptionFailed, ex.Message))
             End Try
 
             Return StrToEncrypt
         End Function
 
-        Public Shared Function Decrypt(ByVal StrToDecrypt As String, ByVal StrSecret As String) As String
-            If StrToDecrypt = "" Or StrSecret = "" Then
-                Return StrToDecrypt
+        Public Shared Function Decrypt(ByVal ciphertextBase64 As String, ByVal password As String) As String
+            If String.IsNullOrEmpty(ciphertextBase64) Or String.IsNullOrEmpty(password) Then
+                Return ciphertextBase64
             End If
 
             Try
-                Dim rd As New RijndaelManaged
-                Dim rijndaelIvLength As Integer = 16
-                Dim md5 As New MD5CryptoServiceProvider
-                Dim key() As Byte = md5.ComputeHash(Encoding.UTF8.GetBytes(StrSecret))
+                Dim plaintext As String
 
-                md5.Clear()
+                Using rijndaelManaged As New RijndaelManaged
+                    Using md5 As New MD5CryptoServiceProvider
+                        Dim key() As Byte = md5.ComputeHash(Encoding.UTF8.GetBytes(password))
+                        rijndaelManaged.Key = key
+                    End Using
 
-                Dim encdata() As Byte = Convert.FromBase64String(StrToDecrypt)
-                Dim ms As New MemoryStream(encdata)
-                Dim iv(15) As Byte
+                    Dim ciphertext() As Byte = Convert.FromBase64String(ciphertextBase64)
 
-                ms.Read(iv, 0, rijndaelIvLength)
-                rd.IV = iv
-                rd.Key = key
+                    Using memoryStream As New MemoryStream(ciphertext)
+                        Const ivLength As Integer = 16
+                        Dim iv(ivLength - 1) As Byte
+                        memoryStream.Read(iv, 0, ivLength)
+                        rijndaelManaged.IV = iv
 
-                Dim cs As New CryptoStream(ms, rd.CreateDecryptor, CryptoStreamMode.Read)
+                        Using cryptoStream As New CryptoStream(memoryStream, rijndaelManaged.CreateDecryptor, CryptoStreamMode.Read)
+                            Using streamReader As New StreamReader(cryptoStream, System.Text.Encoding.UTF8, True)
+                                plaintext = streamReader.ReadToEnd()
+                            End Using
+                            rijndaelManaged.Clear()
+                        End Using ' cryptoStream
+                    End Using ' memoryStream
+                End Using ' rijndaelManaged
 
-                Dim data(ms.Length - rijndaelIvLength) As Byte
-                Dim i As Integer = cs.Read(data, 0, data.Length)
-
-                cs.Close()
-                rd.Clear()
-
-                Return System.Text.Encoding.UTF8.GetString(data, 0, i)
+                Return plaintext
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.ErrorMsg, "Decryption failed" & vbNewLine & ex.Message, True)
+                ' Ignore CryptographicException "Padding is invalid and cannot be removed." when password is incorrect.
+                If Not TypeOf ex Is CryptographicException Then
+                    MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, String.Format(My.Language.strErrorDecryptionFailed, ex.Message))
+                End If
             End Try
 
-            Return StrToDecrypt
+            Return ciphertextBase64
         End Function
     End Class
 End Namespace

mRemoteV1/Security/Security.Impersonator.vb

@@ -10,7 +10,7 @@ Namespace Security
     Public Class Impersonator
 #Region "Logon API"
         Private Const LOGON32_PROVIDER_DEFAULT As Integer = 0
-        Private Const LOGON32_LOGON_INTERACTIVE As Integer = 2 ' This parameter causes LogonUser to create a primary token.
+        Private Const LOGON32_LOGON_NEW_CREDENTIALS As Integer = 9
 
         Private Const SecurityImpersonation As Integer = 2
 
@@ -37,7 +37,6 @@ Namespace Security
 #End Region
 
         Private tokenHandle As New IntPtr(0)
-        Private dupeTokenHandle As New IntPtr(0)
         Private impersonatedUser As WindowsImpersonationContext = Nothing
 
         ' GetErrorMessage formats and returns an error message corresponding to the input errorCode.
@@ -59,30 +58,20 @@ Namespace Security
                 If Not (impersonatedUser Is Nothing) Then Throw New Exception("Already impersonating a user.")
 
                 tokenHandle = IntPtr.Zero
-                dupeTokenHandle = IntPtr.Zero
 
-                Dim returnValue As Integer = LogonUser(UserName, DomainName, Password, LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT, tokenHandle)
+                Dim returnValue As Integer = LogonUser(UserName, DomainName, Password, LOGON32_LOGON_NEW_CREDENTIALS, LOGON32_PROVIDER_DEFAULT, tokenHandle)
 
                 If 0 = returnValue Then
                     Dim errCode As Integer = Marshal.GetLastWin32Error()
                     Dim errMsg As String = "LogonUser failed with error code: " + errCode.ToString() + "(" + GetErrorMessage(errCode) + ")"
-                    Dim exLogon As Exception = New System.Exception(errMsg)
+                    Dim exLogon As New ApplicationException(errMsg)
                     Throw exLogon
                 End If
 
-                returnValue = DuplicateToken(tokenHandle, SecurityImpersonation, dupeTokenHandle)
-                If 0 = returnValue Then
-                    CloseHandle(tokenHandle)
-                    Throw New System.Exception("Error trying to duplicate handle.")
-                End If
-
-                ' The token that is passed to the following constructor must
-                ' be a primary token in order to use it for impersonation.
-                Dim newId As New WindowsIdentity(dupeTokenHandle)
+                Dim newId As New WindowsIdentity(tokenHandle)
                 impersonatedUser = newId.Impersonate()
-
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Starting Impersonation failed (Sessions feature will not work)" & vbNewLine & ex.Message, True)
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Starting Impersonation failed (Sessions feature will not work)" & vbNewLine & ex.Message, True)
             End Try
         End Sub
 
@@ -93,12 +82,11 @@ Namespace Security
             Try
                 impersonatedUser.Undo() ' Stop impersonating the user.
             Catch ex As Exception
-                mC.AddMessage(Messages.MessageClass.WarningMsg, "Stopping Impersonation failed" & vbNewLine & ex.Message, True)
-                Throw ex
+                MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Stopping Impersonation failed" & vbNewLine & ex.Message, True)
+                Throw
             Finally
 
                 If Not System.IntPtr.op_Equality(tokenHandle, IntPtr.Zero) Then CloseHandle(tokenHandle)
-                If Not System.IntPtr.op_Equality(dupeTokenHandle, IntPtr.Zero) Then CloseHandle(dupeTokenHandle)
 
                 impersonatedUser = Nothing
             End Try