[X2Go-Commits] [x2goclient] 01/01: res/i18n/x2goclient_*.ts: update translation files.

git-admin at x2go.org git-admin at x2go.org
Fri Jun 15 16:28:02 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 5fc0c0364e50c88c426fe6917ab3eef355c7fb85
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jun 15 16:27:32 2018 +0200

    res/i18n/x2goclient_*.ts: update translation files.
---
 debian/changelog             |    1 +
 res/i18n/x2goclient_da.ts    | 1280 ++++++++++++++++++++---------------------
 res/i18n/x2goclient_de.ts    | 1275 +++++++++++++++++++++--------------------
 res/i18n/x2goclient_es.ts    | 1275 +++++++++++++++++++++--------------------
 res/i18n/x2goclient_et.ts    | 1275 +++++++++++++++++++++--------------------
 res/i18n/x2goclient_fi.ts    | 1275 +++++++++++++++++++++--------------------
 res/i18n/x2goclient_fr.ts    |   49 +-
 res/i18n/x2goclient_nb_no.ts |   49 +-
 res/i18n/x2goclient_nl.ts    | 1275 +++++++++++++++++++++--------------------
 res/i18n/x2goclient_pt.ts    | 1290 +++++++++++++++++++++---------------------
 res/i18n/x2goclient_ru.ts    | 1283 ++++++++++++++++++++---------------------
 res/i18n/x2goclient_sv.ts    | 1275 +++++++++++++++++++++--------------------
 res/i18n/x2goclient_tr.ts    | 1279 ++++++++++++++++++++---------------------
 res/i18n/x2goclient_zh_tw.ts | 1283 ++++++++++++++++++++---------------------
 14 files changed, 7236 insertions(+), 6928 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 078b072..f1e6287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,6 +100,7 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium
       chgrp.
     - src/onmainwindow.cpp: disable private host key permissions check in
       OpenSSH Server on Windows. Fixes: #1156.
+    - res/i18n/x2goclient_*.ts: update translation files.
   * x2goclient.spec:
     - Remove plugin references.
   * debian/rules:
diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts
index 3fc9ec8..2539e4b 100644
--- a/res/i18n/x2goclient_da.ts
+++ b/res/i18n/x2goclient_da.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="da_DK">
+<TS version="2.1" language="da_DK">
 <context>
     <name>AppDialog</name>
     <message>
@@ -269,88 +269,88 @@
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Vis ikon i ikon bakke</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Minimer til ikon bakke</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Skjul i ikon bakke når programmet lukkes</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Minimer til ikon bakke efter forbindelse til server</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Vis hovedvindue fra ikon bakke efter forbindelse er afbrudt</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Brug LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>Failover server 1 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>Failover server 2 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -363,12 +363,12 @@ can find updated versions on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -383,17 +383,17 @@ Some standard installation locations may be:
         <translation type="obsolete">X-server indstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11 applikation:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11 version:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>Find X11 applikation</translation>
     </message>
@@ -402,39 +402,39 @@ Some standard installation locations may be:
         <translation type="obsolete">Klienten's SSH port til filsystem-eksportering:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Start session indlagt i et website</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Avanceret indstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Standardindstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>&Annuller</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Udskrift</translation>
     </message>
@@ -459,17 +459,17 @@ Some standard installation locations may be:
         <translation type="obsolete">Der blev ikke fundet en X11 applikation i den specificerede sti</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Forbindelse</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Medie</translation>
     </message>
@@ -627,7 +627,7 @@ Some standard installation locations may be:
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Session's indstillinger</translation>
     </message>
@@ -1016,11 +1016,16 @@ Some standard installation locations may be:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
-        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <source>Enables broker logout button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/help.cpp" line="163"/>
+        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1044,12 +1049,12 @@ Some standard installation locations may be:
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
@@ -1062,7 +1067,7 @@ Some standard installation locations may be:
         <translation type="obsolete">Din session blev frakoblet. For at få adgang til din igangværende session, skal du gå til login siden eller trykke på "opdater" i din browser.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host nøgle for serveren er skiftet.
@@ -1081,7 +1086,7 @@ Den er nu: </translation>
         <translation type="obsolete">Kunne ikke finde kendte host fil. Hvis du accepterer serverens host nøgle, vil filen automatisk blive skabt</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Serveren er ukendt. Stoler du på denne host nøgle?
@@ -1092,22 +1097,22 @@ offentlig nøgle hash: </translation>
         <translation type="obsolete">Host nøgle bekræftelsen fejlede</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Godkendelses kode:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Indtast kodeord for at dekryptere en nøgle</translation>
     </message>
@@ -1116,12 +1121,12 @@ offentlig nøgle hash: </translation>
         <translation type="obsolete">Autentificering fejlede</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Serveren bruger et ugyldigt sikkerheds certifikat</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Du bør ikke tilføje en undtagelse hvis du bruger en internet forbindelse som du ikke fuldstændig stoler på eller som du ikke er vant til at se advarsler for denne server.</p></translation>
     </message>
@@ -1130,115 +1135,120 @@ offentlig nøgle hash: </translation>
         <translation type="obsolete">Sikker forbindelse fejlede</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Udstedt til:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Fælles Navn(CN)</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organisation(O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisations Enhed(OU)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Serie nummer	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Udstedt af:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Gyldighed:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Udstedt den</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>udløber den	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Fingeraftryk:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>Luk X2Go-Klienten</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Tilføj undtagelse</translation>
     </message>
@@ -1335,8 +1345,8 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Starter x2goclient...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -1345,34 +1355,34 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go Klient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>forbinder</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Internet browser</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>Email klient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
@@ -1381,12 +1391,12 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Starter x2goclient i flyttebar tilstand... data filsti er:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Indstillinger ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Support ...</translation>
     </message>
@@ -1399,13 +1409,13 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Startede  x2goclient.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>Kan ikke åbne oversætter:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Oversætter:</translation>
     </message>
@@ -1414,73 +1424,67 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Installeret.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Del mappe...</translation>
+        <translation type="vanished">Del mappe...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Afbryd</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Genoptag</translation>
+        <translation type="vanished">Genoptag</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>Løsriv X2Go vinduet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Minimere værktøjslinie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Session:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Afslut</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Ny session ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1489,7 +1493,7 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Sessionshåndtering...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1506,13 +1510,13 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">&forbindelses test...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Vis værktøjslinie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Om Qt</translation>
     </message>
@@ -1522,168 +1526,167 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Session</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Indstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Hjælp</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Login:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Handling fejlede</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Kodeord er ændret</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Forkert kodeord!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Forbinder til broker</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentifikation</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Gendan</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>Ikke forbundet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Udvikling</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Undervisning</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Netværk</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Værktøj</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Andet</translation>
     </message>
@@ -1700,9 +1703,9 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Lukket  x2goclient.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Venligst undersøg LDAP indstillinger</translation>
     </message>
@@ -1734,7 +1737,7 @@ Slå skjult tilstand til?</translation>
         <translation type="obsolete">X2Go Link til session</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Ingen X2Go sessioner Fundet, Lukker.</translation>
     </message>
@@ -1743,8 +1746,8 @@ Slå skjult tilstand til?</translation>
         <translation type="obsolete">Ugyldig værdi for "--clipboard" argumentet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>SSH Fejl</translation>
     </message>
@@ -1784,7 +1787,7 @@ Venligst forsprøg din system administrater i at give dig adgang til SSH service
         <translation type="obsolete">SSH daemon fejlede i at åbne programmet's offentlig vært's nøgle. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>SSH daemon fejlede i at åbne programmet's offentlig nøgle til brug for at eksporter mapper og printer.</translation>
@@ -1804,41 +1807,40 @@ autoriseret_nøgler filen.</translation>
         <translation type="obsolete">Er du sikker på at du vil slette denne session?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP forbindelse</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Forbindelse til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> på </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Starter forbindelse til server:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation>til</translation>
+        <translation type="vanished">til</translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -1849,12 +1851,12 @@ autoriseret_nøgler filen.</translation>
         <translation type="obsolete">Kunne ikke finde en SSH forbindelse.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Indtast kodeord for at dekryptere en nøgle</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Værts nøgle for serveren er ændret.
@@ -1873,7 +1875,7 @@ Den er nu: </translation>
         <translation type="obsolete">Kunne ikke finde kendt host fil. Hvis du accepterer serverens host nøgle, vil filen automatisk blive skabt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Serveren er ukendt. Stoler du på denne værts nøgle?
@@ -1884,7 +1886,7 @@ Offentlig nøgle hash: </translation>
         <translation type="obsolete">Værts nøgle bekræftelse fejlede</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Godkendelses kode:</translation>
     </message>
@@ -1900,18 +1902,18 @@ Af sikkerheds grunde anbefaler vi du stopper forbindelsen.
 Vil du afslutte forbindelsen? </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Hvis du acceptere den nye vært nøgle, er sikkerheden på din forbindelse muligt blevet kompromitteret.
@@ -1927,7 +1929,7 @@ Af sikkerhedsmæssige årsager, er det anbefalet at du stopper forbindelsen.
 Vil du afslutte forbindelsen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Godkendelse Fejlede:</translation>
     </message>
@@ -1936,7 +1938,7 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete">Godkendelse fejlede</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Indtast kodeord til SSH proxy</translation>
     </message>
@@ -1946,37 +1948,37 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete"><b>Forbindelsen mislykkedes</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Forkert kodeord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Forbindelse Fejlede: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation>Forkert kodeord.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>ukendt</translation>
     </message>
@@ -1989,41 +1991,41 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete">Server er ikke tilgængelig</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Vælg session:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>kører</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>suspenderet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Skrivebord</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>enkelt applikation</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>skygge session</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -2032,20 +2034,20 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete">Intet tilgængeligt skrivebord fundet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Vælg skrivebord:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
@@ -2062,51 +2064,51 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete"> bit og genstart din X server før du genoptager din x2go session.<br>Vil du fortsætte alligevel?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>suspenderer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>afbryder</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Forkert Kodeord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Ny session er startet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Session genoptaget</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Ikke i stand til at lave mappe:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Kunne ikke skrive filen:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Nødudgang.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Venter på at proxy afslutter.</translation>
     </message>
@@ -2115,14 +2117,14 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete">Fejlede med at afslutte proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Forkerte parameter:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Hjælp</translation>
     </message>
@@ -2135,13 +2137,13 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete">Denne mulighed er ikke til tilgængelig i denne version</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translatorcomment>Opdaterings Log</translatorcomment>
         <translation>Ændringslog</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Git Information</translation>
     </message>
@@ -2154,8 +2156,8 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete">Kunne ikke skrive fil:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>Tilkobl X2Go vindue</translation>
     </message>
@@ -2170,29 +2172,29 @@ Vil du afslutte forbindelsen?</translation>
         <translation type="obsolete">Kunne ikke oprette SSL Tunnel:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>Afsluttet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>starter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>fortsætter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Forbindelse fik timeout, afbryder</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>afbryder</translation>
     </message>
@@ -2203,20 +2205,20 @@ Unsaved documents will be lost</source>
 Ugemte dokumenter vil gå tabt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Session</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Skærmbillede</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Skabelsestid</translation>
     </message>
@@ -2229,7 +2231,7 @@ Ugemte dokumenter vil gå tabt</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (filen kan ikke åbnes)</translation>
     </message>
@@ -2294,7 +2296,7 @@ Ugemte dokumenter vil gå tabt</translation>
         <translation type="obsolete">Kan ikke åbne nøgle:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Support</translation>
     </message>
@@ -2323,7 +2325,7 @@ Ugemte dokumenter vil gå tabt</translation>
         <translation type="obsolete">Intet gyldigt kort fundet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Kort er ikke konfigureret.</translation>
     </message>
@@ -2332,9 +2334,8 @@ Ugemte dokumenter vil gå tabt</translation>
         <translation type="obsolete">Denne kort er ukendt af X2Go systemet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Ikke i stand til at lave fil: </translation>
+        <translation type="vanished">Ikke i stand til at lave fil: </translation>
     </message>
     <message>
         <source>Can't connect to X server
@@ -2355,8 +2356,8 @@ Please check your installation</source>
 Undersøg venligst din installation</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Kunne ikke udføre handling: </translation>
     </message>
@@ -2377,12 +2378,12 @@ Venligst opdater til en nyere version af x2goserver pakken</translation>
         <translation type="obsolete">Kunne ikke skrive :</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -2391,7 +2392,7 @@ Venligst opdater til en nyere version af x2goserver pakken</translation>
         <translation type="obsolete">Fejl ved hentning af vindue geomatri (vinduet lukkede)?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go Session</translation>
     </message>
@@ -2400,36 +2401,35 @@ Venligst opdater til en nyere version af x2goserver pakken</translation>
         <translation type="obsolete">Ugyldig værdi for "speed" argumentet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Kodeord:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Tastatur layout:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>Sessions ID:<br>Server:<br>Brugernavn:<br>Skærmbillede:<br>Skabelsestid:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Applikationer...</translation>
+        <translation type="vanished">Applikationer...</translation>
     </message>
     <message>
         <location filename="../../src/onmainwindow.cpp" line="61"/>
@@ -2437,100 +2437,105 @@ Venligst opdater til en nyere version af x2goserver pakken</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -2539,17 +2544,17 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -2557,309 +2562,337 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2868,87 +2901,87 @@ If the sftp-server binary is installed on your system, please report a bug menti
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2957,7 +2990,7 @@ These features require a running and functioning SSH server on your computer.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2965,7 +2998,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2973,14 +3006,14 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2988,7 +3021,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2996,27 +3029,22 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
-        <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation type="unfinished">
@@ -3025,182 +3053,174 @@ Please report a bug on:
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
-        <source>Check whether the package providing "scdaemon" is installed.
-The current search path is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Afbryd</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Vis detaljer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Fortsæt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Fuld adgang</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Kun synlig</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>Klient IP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>Sessions ID</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Bruger</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Kun mine skrivebord</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation type="unfinished"></translation>
@@ -3214,12 +3234,12 @@ du kan installere sshd med
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Gendan værktøjslinie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Klik på denne knap&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;for at gendanne værktøjslinien&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3456,80 +3476,80 @@ f.eks:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3598,127 +3618,127 @@ or
         <translation type="obsolete">Opret sessions ikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Fjern session</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Sessions handlinger</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Vælg type</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Vælg opløsning</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Til/fravælg lyd understøttelse</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Ny Session</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>kører</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>suspenderet</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP forbindelse</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Forbindelse til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Udgivet Programmer</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>Fuldskærm</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Skærmbillede </translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>vindue</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>Aktiveret</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>Deaktiveret</translation>
     </message>
@@ -3859,7 +3879,7 @@ Use X2Go Client's hidden mode?</source>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH port:</translation>
     </message>
@@ -3919,13 +3939,13 @@ Use X2Go Client's hidden mode?</source>
         <translation>RSA/DSA nøgle:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3958,46 +3978,46 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Forbind til Windows terminal server</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Forbind til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Brugerdefineret skrivebord</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Enkelt applikation</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Udgivet applikationer</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Avancerede indstillinger...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Sti til Program</translation>
     </message>
@@ -4006,23 +4026,23 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Direkt RDP Forbindelse</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP port:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Åben billede</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Billeder</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Åben nøglefil</translation>
     </message>
@@ -4037,26 +4057,26 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
@@ -4065,30 +4085,30 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">x2go klienten kører i bærbar tilstand. Du bør bruge en sti på din usb enhed så du kan få adgang til dine data uanset hvor du er</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop kommandolinie parametre:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Ny session</translation>
     </message>
@@ -4298,7 +4318,7 @@ lydsystemets forbindelse igennem firewalls</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -4307,8 +4327,8 @@ lydsystemets forbindelse igennem firewalls</translation>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>kodeord</translation>
     </message>
@@ -4426,9 +4446,9 @@ lydsystemets forbindelse igennem firewalls</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4438,73 +4458,73 @@ lydsystemets forbindelse igennem firewalls</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>%1 fejlede.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4558,7 +4578,7 @@ lydsystemets forbindelse igennem firewalls</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>kan ikke forbinde til</translation>
     </message>
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index 408a41d..521e7a6 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de">
+<TS version="2.1" language="de">
 <context>
     <name>AppDialog</name>
     <message>
@@ -267,7 +267,7 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Benutze LDAP</translation>
     </message>
@@ -276,22 +276,22 @@
         <translation type="obsolete">LDAP Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>A&bbrechen</translation>
     </message>
@@ -324,7 +324,7 @@
         <translation type="obsolete">Displaynummer:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Konfiguration</translation>
     </message>
@@ -381,12 +381,12 @@
         <translation type="obsolete">LDAP Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>URL von Failover-Server 1:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>URL von Failover-Server 2:</translation>
     </message>
@@ -395,17 +395,17 @@
         <translation type="obsolete">X-Server Konfiguration</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11 Applikation:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11-Version:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>Suche X11-Applikation</translation>
     </message>
@@ -419,43 +419,43 @@
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Sitzung innerhalb einer Webseite anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Symbol im Systemabschnitt der Kontrolleiste anzeigen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>In den Systemabschnitt der Kontrolleiste minimieren</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Statt Schließen in den Systemabschnitt der Kontrollleiste minimieren</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Bei Verbindung in den Systemabschnitt der Kontrollleiste minimieren</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Nach Verbindungsende wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation>X.Org-Server-Konfiguration</translation>
     </message>
@@ -464,14 +464,14 @@
         <translation type="obsolete">(lokaler) SSH-Daemon-Port für die Dateisystemfreigabe auf Clientseite:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Erweiterte Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Voreinstellungen</translation>
     </message>
@@ -488,32 +488,32 @@
         <translation type="obsolete"><font size="5">Sie müssen den X2GoClient neu starten, um die Änderungen zu aktivieren</font><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation>PulseAudio-Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation>PulseAudio deaktivieren</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation>Audio-Eingang deaktivieren</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation>Die Version von XQuartz ist zu alt.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation>Sie verwenden XQuartz (X-Window-System-Server für OS X) in der Version %1.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -534,12 +534,12 @@ können aktualisierte Versionen hier herunterladen:
 <center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation>Keine gültige XQuartz-Anwendung ausgewählt.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -556,17 +556,17 @@ Bitte versuchen Sie es erneut.
 <center><b>/Programme/MacPorts/X11.app</b></center></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Verbindung</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>E&in-/Ausgabe</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Medien</translation>
     </message>
@@ -982,7 +982,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Sitzungsvoreinstellungen - </translation>
     </message>
@@ -1409,11 +1409,16 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="163"/>
         <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
         <translation>Ein eigenes Hintergrundbild (im SVG-Format) für das Hauptfenster des X2GoClients verwenden. Wenn ein Verzeichnis angegeben wird, wird zufällig eine SVG-Datei aus diesem Verzeichnis ausgewählt.</translation>
     </message>
     <message>
-        <location filename="../../src/help.cpp" line="163"/>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Ein eigenes Symbolbild (im SVG-Format) als zusätzliche Branding-Möglichkeit in der linken unteren Ecke des Hauptfensters des X2GoClients verwenden (ersetzt das dort befindliche Standard-Symbolbild).</translation>
     </message>
@@ -1437,7 +1442,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/de</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host-Key des Servers hat sich geändert.
@@ -1456,7 +1461,7 @@ Er lautet jetzt: </translation>
         <translation type="obsolete">Die ,,Known Host''-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Der Server ist unbekannt. Vertrauen Sie diesem Host-Key?
@@ -1467,22 +1472,22 @@ Public key hash: </source>
         <translation type="obsolete">Hostkey Überprüfung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Bestätigungscode:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Bitte Kennwort eingeben, um den Key zu entschlüsseln</translation>
     </message>
@@ -1491,12 +1496,12 @@ Public key hash: </source>
         <translation type="obsolete">Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -1505,12 +1510,12 @@ Public key hash: </source>
         <translation type="obsolete">Anmeldung fehlgeschlagen!<br>Bitte noch einmal versuchen</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Server benutzt ein ungültiges Zertifikat.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Sie sollten keine Ausnahme setzen, wenn Sie sich in einem Netzwerk befinden, dem sich nicht vertrauen oder wenn Sie für diese Verbindung bereits eine Ausnahme akzeptiert haben.</p></translation>
     </message>
@@ -1519,12 +1524,12 @@ Public key hash: </source>
         <translation type="obsolete">Sichere Verbindung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation>Aus Sicherheitsgründen wird der Verbindungsversuch abgebrochen.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation>Der Host-Key des Servers konnte nicht gefunden werden, aber ein anderer Schlüsseltyp existiert. Ein Angreifer kann den Schlüssel verändert haben, um dem Client vorzutäuschen, dass der Schlüssel nicht existiert.</translation>
     </message>
@@ -1533,109 +1538,114 @@ Public key hash: </source>
         <translation type="obsolete">Die „Known Hosts“-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Die „Known Hosts“-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation>Host-Key-Überprüfung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation>Authentisierung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation>Anmeldung fehlgeschlagen!<br>Bitte noch einmal versuchen.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation>Sichere Verbindung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Ausgestellt für:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Ausgestellt von:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerabdrücke:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>X2GoClient beenden</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Ausnahme hinzufügen</translation>
     </message>
@@ -1736,8 +1746,8 @@ Bitte auf PulseAudio aktualisieren.</translation>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>de</translation>
     </message>
@@ -1746,30 +1756,30 @@ Bitte auf PulseAudio aktualisieren.</translation>
         <translation type="obsolete">pc105/de</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Support ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Sitzung:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Beenden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
@@ -1778,7 +1788,7 @@ Bitte auf PulseAudio aktualisieren.</translation>
         <translation type="obsolete">&Neue Sitzung ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
@@ -1787,7 +1797,7 @@ Bitte auf PulseAudio aktualisieren.</translation>
         <translation type="obsolete">Sitzungsverwaltung...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
@@ -1796,7 +1806,7 @@ Bitte auf PulseAudio aktualisieren.</translation>
         <translation type="obsolete">LDAP &Konfiguration ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Werkzeugleiste wieder anzeigen</translation>
     </message>
@@ -1805,12 +1815,12 @@ Bitte auf PulseAudio aktualisieren.</translation>
         <translation type="obsolete">Über X2GoClient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Über Qt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Sitzung</translation>
     </message>
@@ -1820,22 +1830,22 @@ Bitte auf PulseAudio aktualisieren.</translation>
         <translation type="obsolete">Strg +Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Sitzung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Hilfe</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Bestätigungscode:</translation>
     </message>
@@ -1851,8 +1861,8 @@ Aus Sicherheitsgründen ist es angeraten, die Verbindung zu beenden.
 Möchten Sie die Verbindung abbrechen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Wenn Sie den neuen Host-Key akzeptieren, kann das die Sicherheit Ihrer Verbindung gefährden.
@@ -1868,36 +1878,36 @@ Aus Sicherheitsgründen ist es angeraten, die Verbindung zu beenden.
 Möchten Sie die Verbindung abbrechen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Neue Sitzung gestartet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Sitzung fortgesetzt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Ordner kann nicht erstellt werden: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Datei kann nicht geschrieben werden: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Notbeendung.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Darauf warten, dass der Proxy sich beendet.</translation>
     </message>
@@ -1910,14 +1920,14 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">unerwarteter Wert "--clipboard"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Falscher Parameter: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
@@ -1930,12 +1940,12 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Option in diesem Build nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Changelog</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Git-Info</translation>
     </message>
@@ -1948,7 +1958,7 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Schlüssel kann nicht geöffnet werden:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Smartcard nicht konfiguriert.</translation>
     </message>
@@ -1957,151 +1967,147 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Fehler beim Ermitteln der Fenstergeometrie. (Fenster geschlossen?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Tastaturlayout:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Anwendungen...</translation>
+        <translation type="vanished">Anwendungen...</translation>
     </message>
     <message>
         <source>Invalid reply from broker</source>
         <translation type="obsolete">Ungültige Antwort vom Session-Broker</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> auf </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Benutzername:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Wähle Sitzung:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Fortfahren</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Anhalten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Display</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
@@ -2110,20 +2116,20 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Startzeit</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>Client-IP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>angehalten</translation>
     </message>
@@ -2142,16 +2148,16 @@ Möchten Sie die Verbindung abbrechen?</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>verbinde</translation>
     </message>
@@ -2161,24 +2167,24 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation>X2GoClient %1 wird gestartet ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation>Portabler X2GoClient wird gestartet. Datenverzeichnis ist: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation>Über X2GoClient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation>X2GoClient wurde gestartet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation> gefunden.</translation>
     </message>
@@ -2188,73 +2194,73 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">English language requested, not loading translator.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation>Kann Übersetzer nicht laden (nicht fatal): </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation>Versuche eine Sprache niedrigerer Präferenz zu laden, falls vorhanden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation>Sitzungsverwaltung ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation>&Desktopsymbol erzeugen ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation>&Kennwort für Session-Broker setzen ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation>&Verbindungstest ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation>Ordner freigeben ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation>Klick mit der linken Maustaste, um das Fenster zu verstecken und wiederherzustellen. Klick mit der rechten Maustaste zeigt das Kontextmenü.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation>X2GoClient wird geschlossen ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation>Alle Hooks, die beim Beenden von X2GoClient abgearbeitet werden sollten, wurden abgearbeitet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation>Broker-Authentisierung fehlgeschlagen!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation>Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation>Konnte keine SSH Verbindung finden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -2267,17 +2273,17 @@ Möchten Sie die Verbindung abbrechen?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation>Host-Key-Überprüfung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -2288,45 +2294,45 @@ Möchten Sie die Verbindung abbrechen?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Die „Known Hosts“-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation>Authentisierung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation><b>Verbindung fehlgeschlagen.</b>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation>Es konnte kein Server gefunden werden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation>Server nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation>Kein freigegebener Desktop gefunden.</translation>
     </message>
@@ -2339,87 +2345,87 @@ Möchten Sie die Verbindung abbrechen?
         <translation type="obsolete"> bit zu ändern und den verwendeten X.Org-Server neu zu starten, bevor Sie sich mit der Sitzung verbinden.<br />Trotzdem versuchen, die Sitzung fortzuführen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation>Kann keinen SSH-Tunnel für den Start der X2Go-Sitzung (NX) erstellen:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation>Kann keinen SSH-Tunnel für Audiodaten erstellen:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation>konnte nicht gestartet werden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation>Das bedeutet sehr wahrscheinlich, dass die ausführbare Datei nicht verfügbar ist.
 Der aktuelle Suchpfad lautet: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation>lieferte einen von null abweichenden Exit-Code zurück oder ist auf andere Weise abgestürzt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation>Ausführung fehlgeschlagen, der Exit-Code lautete: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation>startete nicht rechtzeitig.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation>Dieser Fehler sollte nie auftreten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation>hat eine Schreiboperation nicht akzeptiert.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation>Es läuft vermutlich nicht richtig, oder ist zwischendurch abgestürzt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation>Kann nicht von xmodmap lesen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation>ist ein unbekannter Fehler während des Starts oder während der Ausführung aufgetreten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation>trat ein undefinierter Fehler auf.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
@@ -2428,91 +2434,119 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
 Bitte melden Sie den Fehler wie auf der <a href="http://wiki.x2go.org/doku.php/wiki:bugs">Wikiseite zur Fehlerberichterstattung</a> beschrieben.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation>Konnte RDP oder XDMCP-Client nicht starten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation>Bitte die Sitzungseinstellungen überprüfen und sicherstellen, dass der ausgewählte Client auch auf dem System installiert ist.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation>Der Proxy hat sich nicht nach 3 Sekunden beendet. Proxy wird nun zwangsbeendet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation>Schließe den X2GoClient, weil er im versteckten Modus gestartet wurde.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation>Schließe den X2GoClient, weil der Parameter --close-disconnect angegeben wurde.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>starte</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>aktiviere</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Zeitüberschreitung, breche ab</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>breche ab</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation>Datei konnte nicht angelegt oder zum Anhängen geöffnet werden: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation>Kann Dateirechte nicht ändern: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation>Dies ist ein Fehler, weil sshd sich weigern würde, so eine Datei zu verwenden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation>Kann Verzeichnisrechte nicht ändern: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation>Dies ist ein Fehler, weil sshd sich weigern würde, so ein Verzeichnis zu verwenden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation>Kann das sftp-server-Binary nicht finden. Es ist weder im Paket, noch im $PATH, noch in zusätzlichen Verzeichnissen enthalten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2526,82 +2560,82 @@ Falls das sftp-server-Binary auf Ihrem System installiert ist, melden Sie den Fe
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation>Fehler bei der Auswahl des SSH-Key-Typs</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation>Unbekannter SSH-Key ausgewählt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation>Anwendung wird beendet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation>Fehler beim Erstellen des Basisverzeichnisses für den SSH-Key</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation>Kann SSH-Key-Basisverzeichnis '%1' nicht anlegen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation>Fehler beim Start von ssh-keygen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation>Kann das ssh-keygen-Binary nicht starten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation>ssh-keygen ist abgestürzt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation>Das ssh-keygen-Binary ist abgestürzt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation>Programmfehler, ssh-keygen betreffend</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation>Das ssh-keygen-Binary wurde nicht sauber beendet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation>Es wurde vermutlich mit unbekannten Parametern aufgerufen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation>Kann die neu erstellte %1-Public-Host-Key-Datei nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation>Die %1-Public-Host-Key-Datei ist leer.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2614,7 +2648,7 @@ Diese Funktionen setzen einen gestarteten und funktionstüchtigen SSH-Server auf
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2625,7 +2659,7 @@ Wenn Sie diese Fehlermeldung sehen, senden Sie bitte einen Fehlerbericht:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2635,15 +2669,15 @@ Please report a bug on:
 Bitte senden Sie einen Fehlerbericht:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2654,7 +2688,7 @@ Wenn Sie diese Fehlermeldung sehen, senden Sie bitte einen Fehlerbericht:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2665,19 +2699,19 @@ Bitte senden Sie einen Fehlerbericht:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation>Der SSH-Dienst konnte die authorized_keys-Datei
 der Anwendung nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation>libssh-Initialisierungsfehler</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation>Kann libssh nicht initialisieren.</translation>
     </message>
@@ -2686,7 +2720,7 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete"><b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
@@ -2695,7 +2729,7 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete">Zeige Details</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (kann Datei nicht öffnen)</translation>
     </message>
@@ -2740,7 +2774,7 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete">Liste aller Packmethoden:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Support</translation>
     </message>
@@ -2753,7 +2787,7 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete">Bitte überprüfen Sie die LDAP Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation>LDAP enthält keinen X2GoServer </translation>
     </message>
@@ -2772,17 +2806,17 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete">es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>Sitzungs-ID</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>anhalten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>beende</translation>
     </message>
@@ -2837,7 +2871,7 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete"><b>X2GoClient V. 2.0.1</b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vo [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Falsches Passwort!</b><br><br></translation>
     </message>
@@ -2874,9 +2908,8 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete">Usage: x2goclient [Options]			Options:			--help                           Print this message			--help-pack                      Print availabel pack methods			--no-menu                        Hide menu bar			--maximize                       Start maximized			--add-to-known-hosts             Add RSA key fingerprint to .ssh/known_hosts 			if authenticity of server can't be established			--ldap=<host:port:dn>            Start with LDAP Support [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Datei konnte nicht erzeugt werden: </translation>
+        <translation type="vanished">Datei konnte nicht erzeugt werden: </translation>
     </message>
     <message>
         <source>No valid card found</source>
@@ -2887,7 +2920,7 @@ der Anwendung nicht öffnen.</translation>
         <translation type="obsolete">Diese Karte ist dem X2Go-System unbekannt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Konfiguration ...</translation>
     </message>
@@ -2934,12 +2967,12 @@ Please check your settings</source>
         <translation type="obsolete">  bit zu ändern und den verwendeten X-server neu zu starten, bevor Sie sich mit der Sitzung verbinden. Trotzdem versuchen die Sitzung fortzuführen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
@@ -2956,42 +2989,42 @@ Please check your settings</source>
         <translation type="obsolete"></b><br> (C. 2006-2008 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kan [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Eingabeaufforderung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Desktopumgebung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>Shadow Session</translation>
     </message>
@@ -3000,28 +3033,28 @@ Please check your settings</source>
         <translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Befehl konnte nicht ausgeführt werden: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go Client</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Webbrowser</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>E-Mail-Programm</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Neue Sitzung ...</translation>
     </message>
@@ -3030,8 +3063,8 @@ Please check your settings</source>
         <translation type="obsolete">Sitzungsverwaltung...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Zeige Werkzeugleiste</translation>
     </message>
@@ -3040,9 +3073,9 @@ Please check your settings</source>
         <translation type="obsolete">Über X2GoClient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
     </message>
@@ -3055,16 +3088,16 @@ Please check your settings</source>
         <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Falsches Passwort!</b><br><br></translation>
     </message>
@@ -3073,15 +3106,15 @@ Please check your settings</source>
         <translation type="obsolete">es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <oldsource>Active connection</oldsource>
         <translation>Nicht verbunden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Startzeit</translation>
     </message>
@@ -3090,24 +3123,23 @@ Please check your settings</source>
         <translation type="obsolete">Ordner kann nicht erzeugt werden:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Bitte Kennwort eingeben, um den Schlüssel zu öffnen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Keine X2Go Sitzung gefunden, Programm wird geschlossen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Verbindung mit Server wird gestartet: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation> auf </translation>
+        <translation type="vanished"> auf </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -3118,7 +3150,7 @@ Please check your settings</source>
         <translation type="obsolete">Konnte keine SSH Verbindung finden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host-Key des Servers hat sich geändert.
@@ -3137,7 +3169,7 @@ Er lautet jetzt: </translation>
         <translation type="obsolete">Die ,,Known Host''-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Der Server ist unbekannt. Vertrauen Sie diesem Host-Key?
@@ -3148,7 +3180,7 @@ Hash des öffentlichen Schlüssels: </translation>
         <translation type="obsolete">Die Überprüfung des Host-Keys schlug fehl</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Anmeldung fehlgeschlagen: </translation>
     </message>
@@ -3157,23 +3189,23 @@ Hash des öffentlichen Schlüssels: </translation>
         <translation type="obsolete">Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Kennwort für SSH Proxy eingeben</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Verbindung fehlgeschlagen: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation> - Falsches Kennwort.</translation>
     </message>
@@ -3192,17 +3224,16 @@ Hash des öffentlichen Schlüssels: </translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>Sitzungs-ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Ordner freigeben...</translation>
+        <translation type="vanished">Ordner freigeben...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Zeige Details</translation>
     </message>
@@ -3239,13 +3270,13 @@ Bitte installieren sie eine neuere Version von x2goserver</translation>
         <translation type="obsolete">X2Go Client ist gestartet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>Kann Übersetzer nicht laden: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Übersetzung: </translation>
     </message>
@@ -3262,82 +3293,82 @@ Bitte installieren sie eine neuere Version von x2goserver</translation>
         <translation type="obsolete">&Verbindungstest...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Operation fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Das Kennwort wurde geändert</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Falsches Kennwort!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Authentifizierung</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Unterhaltungsmedien</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Entwicklung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Bildung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Spiele</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Internet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Büroprogramme</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>Systemwerkzeuge</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Dienstprogramme</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Sonstige</translation>
     </message>
@@ -3379,24 +3410,23 @@ Wollen Sie den versteckten Modus nutzen?</translation>
         <translation type="obsolete">Keine X2Go-Sitzungen gefunden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP-Verbindung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>Fenster abkoppeln</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>Fenster einbetten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>Beendet</translation>
     </message>
@@ -3416,18 +3446,17 @@ Please check your installation</source>
 Bitte überprüfen Sie Ihre Installation</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go-Sitzung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Symbole verstecken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
@@ -3514,13 +3543,13 @@ Bitte melden Sie den Fehler über:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation>Die Druck- und/oder Dateifreigabe in den Sitzungseinstellungen zu deaktivieren, wird diese Meldung verschwinden lassen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation>Der SSH-Daemon konnte seinen öffentlichen Host-Schlüssel nicht öffnen.</translation>
     </message>
@@ -3587,8 +3616,8 @@ Wenn Sie selbst der Systemadministrator sind, führen Sie bitte folgenden Befehl
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>SSH-Fehler</translation>
     </message>
@@ -3618,7 +3647,7 @@ service on your computer.</source>
         <translation type="obsolete">Der SSH-Dienst konnte den öffentlichen Host-Schlüssel der Anwendung nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>Der SSH-Dienst konnte den für Datei- und Druckfreigaben benötigten
@@ -3630,7 +3659,7 @@ authoized_keys file.</source>
         <translation type="obsolete">Der SSH-Dienst konnte die autorized_keys-Datei der Anwendung nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;zum Wiederherstellen&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;der Werkzeugleiste&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;hier klicken&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3647,43 +3676,48 @@ Sie können SSHD über folgenden Befehl installieren:
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation>XDM</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation>RDP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Desktopauswahl:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation>Die aktuell verwendete Farbtiefe unterscheidet sich von der der wiederherzustellenden Sitzung. Der Versuch, die Sitzung fortzuführen kann zu Fehlern führen, inbesondere dem <b>Verlust der ganzen Sitzung</b>! </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation>
@@ -3692,30 +3726,30 @@ Sie können SSHD über folgenden Befehl installieren:
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation><br />Wollen Sie diese Sitzung trotzdem wiederherstellen versuchen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation>PulseAudio läuft nicht</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation>Audioausgabe wird in dieser Sitzung deaktiviert. Bitte aktivieren Sie PulseAudio im Konfigurationsdialog oder deaktivieren Sie die Audiounterstützung in der Sitzungseinstellung</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation>Die Sitzung wird beendet. Sind Sie sicher?
 Ungespeicherte Dokumente gehen verloren.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
@@ -3724,87 +3758,87 @@ Ungespeicherte Dokumente gehen verloren.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation> (Datei existiert nicht)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation> (Verzeichnis existiert nicht)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation>Unerwarteter Wert für Parameter "--link".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation>Unerwarteter Wert für Parameter "--clipboard".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation>Unerwarteter Wert für Parameter "--sound".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation>Unerwarteter Wert für Parameter "--geometry".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation>Unerwarteter Wert für Parameter "--set-kbd".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation>Unerwarteter Wert für Parameter "--ldap".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation>Unerwarteter Wert für Parameter "--ldap1".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation>Unerwarteter Wert für Parameter "--ldap2".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation>Unerwarteter Wert für Parameter "--pack".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation>Liste aller Packmethoden:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation>Packmethoden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation>Option in diesem Build nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation>Verzeichnis kann nicht erstellt werden:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation>Schlüssel kann nicht geöffnet werden: </translation>
     </message>
@@ -3813,77 +3847,73 @@ Ungespeicherte Dokumente gehen verloren.</translation>
         <translation type="obsolete"><br> (C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>X2GoPlugin-Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="vanished"><br>X2GoPlugin-Modus wurde gefördert durch <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation><br>Dies ist ein Client für den Zugriff auf die netzwerkbasierte Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Verbindungen zu einem X2GoServer starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten Sie auf <a href="http://www [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation><b>X2GoClient V. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation>Bitte überprüfen Sie die LDAP-Einstellungen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Bitte überprüfen Sie, ob das Paket, das "scdaemon" bereitstellt, installiert ist.
+        <translation type="vanished">Bitte überprüfen Sie, ob das Paket, das "scdaemon" bereitstellt, installiert ist.
 Der aktuelle Suchpfad lautet: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation>ist bis jetzt noch nicht gestartet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation>Kann nicht von scdaemon lesen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation>Keine gültige Karte gefunden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation>Das X2Go-System kennt diese Karte nicht.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation>X.Org-Server lässt sich nicht starten.
 Bitte überprüfen Sie Ihre Installation.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation>Der gewählte Server unterstützt keinen Dateisystemexport via SSH-Tunnel.
 Bitte installieren Sie dort eine neuere Version des X2GoServer-Pakets.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation>Kann keinen SSH-Tunnel für die Druck- und Dateifreigabe erstellen:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation>Lesefehler:
@@ -3895,33 +3925,33 @@ Bitte installieren Sie dort eine neuere Version des X2GoServer-Pakets.</translat
         <translation type="obsolete">Schreibfehler:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation>Fehler beim Ermitteln der Fenstergeometrie. (Haben Sie das Fenster geschlossen?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation>Unerwarteter Wert für Parameter "speed"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation>Anwendungen...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Nur betrachten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -3930,24 +3960,23 @@ Bitte installieren Sie dort eine neuere Version des X2GoServer-Pakets.</translat
         <translation type="obsolete">Kein freigegebener Desktop gefunden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Vollzugriff</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Nur eigene Desktops</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Neu verbinden</translation>
+        <translation type="vanished">Neu verbinden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Verbinden mit Broker</translation>
     </message>
@@ -3964,12 +3993,12 @@ Bitte installieren Sie dort eine neuere Version des X2GoServer-Pakets.</translat
         <translation type="obsolete"><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -4226,7 +4255,7 @@ Beispiel:
         <translation>getcwd() schlug fehl!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation>PulseAudio konnte nicht gestartet werden!</translation>
     </message>
@@ -4243,75 +4272,75 @@ Wenn Sie das Installationspaket mit der vorkompilierten Version von der offiziel
 </translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation>Konnte Versionsnummer von PulseAudio nicht ermitteln!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation>Beim Parsen des Versionsstrings wurde auf der Suche nach der Hauptversionsnummer ein unerwartetes Zeichen entdeckt</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation>Beim Parsen des Versionsstrings wurde auf der Suche nach der Unterversionsnummer ein unerwartetes Zeichen entdeckt</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation>Beim Parsen des Versionsstrings wurde auf der Suche nach der Unter-Unterversionsnummer ein unerwartetes Zeichen entdeckt</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation>Hauptversionsnummer soll übersprungen werden. Irgendetwas ist hier falsch.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation>Kann Hauptversionsnummernstring nicht in Ganzzahl wandeln.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation>Kann Unterversionsnummernstring nicht in Ganzzahl wandeln.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation>Kann Unter-Unterversionsnummernstring nicht in Ganzzahl wandeln.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation>Auf unerwartetes Format gestoßen.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation>PulseAudio-Binary konnte nicht gestartet werden.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation>Kann Start-Ton nicht abspielen.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation>Sound-Unterstützung wird nicht verfügbar sein.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -4417,55 +4446,55 @@ oder
         <translation type="obsolete">Aktiviere Audiounterstützung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Veröffentlichte Anwendungen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Anzeige </translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>aktiviert</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>deaktiviert</translation>
     </message>
@@ -4474,8 +4503,8 @@ oder
         <translation type="obsolete">/usr/bin/startkde</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>Fenster</translation>
     </message>
@@ -4488,68 +4517,68 @@ oder
         <translation type="obsolete">Desktopsymbol erzeugen...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation>Sitzungsvoreinstellungen ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation>Desktopsymbol erzeugen ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Sitzung entfernen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Auflösung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Sound</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>angehalten</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP-Verbindung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -4703,7 +4732,7 @@ Wollen Sie den versteckten Modus verwenden?</translation>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH-Port:</translation>
     </message>
@@ -4791,35 +4820,35 @@ Wollen Sie den versteckten Modus verwenden?</translation>
         <translation type="obsolete">Verbindung mit Windows Terminalserver herstellen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Andere Desktopumgebung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Veröffentlichte Anwendungen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Befehl:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Erweiterte Einstellungen...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Pfad zum Programm</translation>
     </message>
@@ -4828,23 +4857,23 @@ Wollen Sie den versteckten Modus verwenden?</translation>
         <translation type="obsolete">Direkte RDP Verbindung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP port:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Öffne Bild</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Öffne Schlüssel</translation>
     </message>
@@ -4864,76 +4893,76 @@ Wollen Sie den versteckten Modus verwenden?</translation>
         <translation>SSH-Agent oder SSH-Standardschlüssel</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation>Verbindung mit Windows Terminalserver herstellen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation>Direkte RDP-Verbindung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation>X2Go Client wird gerade als portable Anwendung ausgeführt. Sie sollten einen Pfad auf dem USB-Medium wählen, um von überall aus auf Ihre Daten zugreifen zu können.</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation>Direkte XDMCP-Verbindung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation>direkte XDMCP-Verbindung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop Kommandozeilenoptionen:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP-Server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
@@ -5147,7 +5176,7 @@ sound system connections through firewalls</source>
         <translation>XDMCP-Client</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>de</translation>
     </message>
@@ -5156,8 +5185,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/de</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>Kennwort</translation>
     </message>
@@ -5279,9 +5308,9 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation>Kann SSH-Sitzung nicht erstellen.</translation>
     </message>
@@ -5291,57 +5320,57 @@ sound system connections through firewalls</source>
         <translation>Verwende Benutzername aus Environment.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation>Verbindung zu Proxy-Server nicht möglich.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation>Authentisierung fehlgeschlagen.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation>Konnte den SSH-Client nicht starten. Bitte überprüfen Sie Ihre Installation und die GSSApi-Konfiguration.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation>Überprüfen Sie die GSSApi-Konfiguration oder wählen Sie eine andere Authentisierungsmethode.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation>Sitzung wiederherstellen</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation>Kann Datei nicht öffnen </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation>Kann entfernte Datei nicht anlegen </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation>Kann in entfernte Datei nicht schreiben </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>%1 schlug fehl.</translation>
@@ -5355,12 +5384,12 @@ sound system connections through firewalls</source>
         <translation type="obsolete">channel_open_session schlug fehl.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation>Fehler beim Schreiben auf Socket.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation>Kann nicht aus Channel lesen.</translation>
     </message>
@@ -5369,7 +5398,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">channel_write schlug fehl.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation>Konnte nicht von TCP-Socket lesen.</translation>
     </message>
@@ -5423,7 +5452,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>Kann Verbindung nicht herstellen zu </translation>
     </message>
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index 5582e93..3629c33 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="es_ES">
+<TS version="2.1" language="es_ES">
 <context>
     <name>AppDialog</name>
     <message>
@@ -272,73 +272,73 @@
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Mostrar icono de notificación en la bandeja del sistema</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Mostrar como icono de notificación al minimizar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Mostrar icono de notificación al cerrar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Mostrar como icono de notificación cuando se establece la conexión</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Restaurar ventana al desconectar la conexión</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Usar LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>URL del servidor:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>URL del Servidor LDAP alternativo 1:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>URL del Servidor LDAP alternativo 2:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation>Opciones del servidor X.Org</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation>Configuración PulseAudio</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation>Desactivar PulseAudio</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation>Desactivar entrada de sonido</translation>
     </message>
@@ -359,17 +359,17 @@
         <translation type="obsolete"><font size="5">Debes reiniciar el cliente X2Go para aplicar los cambios</font><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation>Tu versión de XQuartz es demasiado vieja.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation>Estás usando la versión de XQuartz (Servidor X Window de OS X) %1.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -390,12 +390,12 @@ pueden encontrar versiones acutlizadas:
 <center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation>No se ha elegido una aplicaciones XQuartz válida.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -416,17 +416,17 @@ Algunas localizaciones habituales pueden ser:
         <translation type="obsolete">Configuración del servidor X</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>Aplicación X11:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>Versión de X11:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>Encontrar aplicación X11</translation>
     </message>
@@ -435,39 +435,39 @@ Algunas localizaciones habituales pueden ser:
         <translation type="obsolete">Puerto SSH del lado del cliente para exportar el sistema de archivos:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Iniciar sesión dentro del sitio web</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Opciones avanzadas</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Valores defecto</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&Ok</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>&Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Propiedades</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Impresión</translation>
     </message>
@@ -492,17 +492,17 @@ Algunas localizaciones habituales pueden ser:
         <translation type="obsolete">No se encontró una aplicación X11 válida en la ruta seleccionada</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Conexión</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>Entrada/Sal&ida</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Medios</translation>
     </message>
@@ -660,7 +660,7 @@ Algunas localizaciones habituales pueden ser:
         <translation>Valores por defecto</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Preferencias de la sesión - </translation>
     </message>
@@ -1039,11 +1039,16 @@ Algunas localizaciones habituales pueden ser:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="163"/>
         <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
         <translation>Usar una imagen de fodo personalizada (en formato SVG) para la ventana principal del cliente X2Go. Si se selecciona una carpeta con archivos SVG se elegirá uno de ellos aleatoriamente.</translation>
     </message>
     <message>
-        <location filename="../../src/help.cpp" line="163"/>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Usar un icono personalizado (en formato SVG) para reemplazar el original que se encuentra en la esquina inferior izquierda de la ventana principal del cliente X2Go.</translation>
     </message>
@@ -1067,12 +1072,12 @@ Algunas localizaciones habituales pueden ser:
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -1085,7 +1090,7 @@ Algunas localizaciones habituales pueden ser:
         <translation type="obsolete">Tu sesión se desconectó. Para tener acceso a tu sesión en ejecución vuelve a la página de inicio de sesión o usa al función "recargar" de tu navegador.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>La clave del servidor ha cambiado.
@@ -1104,7 +1109,7 @@ Ahora es: </translation>
         <translation type="obsolete">No se encontró el archivos de claves conocidas en este equipo. Si aceptas se creará en nuevo archivo de claves</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Este servidor es desconocido. ¿Confiar en su clave?
@@ -1115,22 +1120,22 @@ Hash de su clave pública: </translation>
         <translation type="obsolete">Falló la comprobación de la clave del equipo</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Código de verificación:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Introduce la frase de paso para desencriptar la clave</translation>
     </message>
@@ -1139,12 +1144,12 @@ Hash de su clave pública: </translation>
         <translation type="obsolete">Fallo de autenticación</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>El servidor usa un certificado de seguridad no válido.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>No deberías añadir una excepción de seguridad si estás usando una conexión a internet en la que no confías plenamente o si habitualmente no hay avisos de seguridad para este servidor.</p></translation>
     </message>
@@ -1153,119 +1158,124 @@ Hash de su clave pública: </translation>
         <translation type="obsolete">Fallo en la seguridad de la conexión</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation>Por motivos de seguridad, se cancelará la conexión actual.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation>La clave de equipo para esta servidor no se encontró o se encontró otro tipo. Un atacante podría haber cambiado la clave por defecto del servidor para engañar al cliente pensando que la clave no existe todavía.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>No se ha encontrado el archivo know-hosts. Si aceptas el archivo se creará automáticamente.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation>Falló la verificación de la clave equipo.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation>Falló la autenticación.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation>¡Falló el inicio de sesión!<br>Inténtalo de nuevo.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation>Falló la conexión segura.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Issued to:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Issued by:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerprints:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>Salir del cliente X2Go</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Añadir excepción</translation>
     </message>
@@ -1366,8 +1376,8 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">Iniciando el cliente X2Go...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>es</translation>
     </message>
@@ -1376,34 +1386,34 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">pc105/es</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>Cliente X2Go</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>conectando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Navegador web</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>Cliente de correo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
@@ -1412,12 +1422,12 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">Iniciando x2goclint en modo portable... el directorio de los datos es: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Preferencias ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Soporte ...</translation>
     </message>
@@ -1430,13 +1440,13 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">Cliente X2Go iniciado.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>No se puede cargar el traductor: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Traductor: </translation>
     </message>
@@ -1445,73 +1455,67 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete"> instalado.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Compartir carpeta...</translation>
+        <translation type="vanished">Compartir carpeta...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Reconectar</translation>
+        <translation type="vanished">Reconectar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>Abrir nueva ventana X2Go</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Minimizar barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Sesión:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Salir</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Nueva sesión ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1520,7 +1524,7 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">Gestión de sesiones...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1537,13 +1541,13 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">Test de &conectividad...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Mostrar barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Sobre Qt</translation>
     </message>
@@ -1553,168 +1557,167 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Sesión</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Opciones</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Ayuda</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Usuario:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Falló la operación</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Contraseña cambiada</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>¡Contraseña errónea!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Conectando al broker</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Autenticación</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Restaurar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>No conectado</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Educación</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Juegos</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Redes</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Ajustes</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Utilidades</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Otros</translation>
     </message>
@@ -1731,9 +1734,9 @@ Por favor actualiza a PulseAudio.</translation>
         <translation type="obsolete">x2goclient finalizado.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Comprueba los datos de conexión LDAP</translation>
     </message>
@@ -1765,7 +1768,7 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">Enlace a la sesión X2Go </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>No se han encontrado sesiones X2Go.</translation>
     </message>
@@ -1774,8 +1777,8 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">valor erróneo para el argumento "--clipboard"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>Error de SSH</translation>
     </message>
@@ -1817,7 +1820,7 @@ SSH en tu ordenador.</translation>
         <translation type="obsolete">El demonio SSH falló al abrir la clave pública del host de la aplicación.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>El demonio SSH falló al abrir la clave pública del host de la aplicación
@@ -1837,41 +1840,40 @@ authoized_keys file.</source>
         <translation type="obsolete">¿Eliminar esta sesión?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>Conexión RDP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Conectar al escritorio local</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> on </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Iniciando conección con el servidor: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation> a </translation>
+        <translation type="vanished"> a </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -1882,12 +1884,12 @@ authoized_keys file.</source>
         <translation type="obsolete">No se pudo encontrar la conexión SSH.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Introduce la frase de paso para desencriptar la clave</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>La clave del servidor ha cambiado.
@@ -1906,7 +1908,7 @@ Ahora es: </translation>
         <translation type="obsolete">No se encontró el archivos de claves en este equipo. Si aceptas se creará en nuevo archivo de claves</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Este servidor es desconocido. ¿Confiar en su clave?
@@ -1917,7 +1919,7 @@ Hash de su clave pública: </translation>
         <translation type="obsolete">Falló la comprobación de la clave del equipo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Código de verificación:</translation>
     </message>
@@ -1934,18 +1936,18 @@ Por razones de seguridad se recomienda finalizar la conexión.
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Si aceptas la nueva clave de seguridad para tu conexión la seguridad en la conexión podría comprometerse.
@@ -1961,7 +1963,7 @@ Por razones de seguridad se recomienda finalizar la conexión.
 ¿Finalizar la conexión?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Fallo en la autenticación: </translation>
     </message>
@@ -1970,7 +1972,7 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete">Falló la autenticación</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Introduce la contraseña para el proxy SSH</translation>
     </message>
@@ -1980,37 +1982,37 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete"><b>Error en la conexión</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Contraseña incorrecta</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Fallo en la conexión: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation> - Contraseña incorrecta.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
@@ -2023,41 +2025,41 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete">Servidor no disponible</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Seleccionar sesión:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>activa</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>suspendida</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Escritorio</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>aplicación</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>sesión tipo shadow</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
@@ -2066,20 +2068,20 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete">No se encontró ningún escritorio al que conectarse</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Elige escritorio:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Atención</translation>
     </message>
@@ -2096,51 +2098,51 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete"> bit y reiniciar tu servidor X antes de reconectar a esta sesión x2go. <br>¿Recuperar esta sesión?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>suspendiendo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>terminando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>¡Contraseña incorrecta!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Iniciada nueva sesión</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Sesión suspendida</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>No se ha podido crear la carpeta: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>No se ha podido guardar el archivo: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Salida de emergencia.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Esperando a la salida del proxy.</translation>
     </message>
@@ -2149,14 +2151,14 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete">Error, finalizando el proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Parámetro incorrecto: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
@@ -2169,12 +2171,12 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete">La opción no está disponible en esta versión</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Registro de cambios</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Información Git</translation>
     </message>
@@ -2187,8 +2189,8 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete">No se ha podido guardar el archivo:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>Añadir ventana X2Go</translation>
     </message>
@@ -2203,17 +2205,17 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete">No fue posible crear el tunel SSL:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>Finalizada</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>iniciando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translatorcomment>Not sure if trying to connect to a resumed session or the running session is being resumed.
 
@@ -2222,14 +2224,14 @@ Current translation is for trying to connect a resumed session. If not wil be be
         <translation>restaurando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Tiempo de conexión finalizado. Cancelando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>cancelando</translation>
     </message>
@@ -2240,20 +2242,20 @@ Unsaved documents will be lost</source>
 Los documentos no guardados se perderán</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Sesión</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Monitor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translatorcomment>Not sure if "creation time" means the date the session was created</translatorcomment>
         <translation>Sesión creada en</translation>
@@ -2266,7 +2268,7 @@ Los documentos no guardados se perderán</translation>
 :</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (no se puede abrir el archivo)</translation>
     </message>
@@ -2331,7 +2333,7 @@ Los documentos no guardados se perderán</translation>
         <translation type="obsolete">No se puede abrir la clave: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Soporte</translation>
     </message>
@@ -2360,7 +2362,7 @@ Los documentos no guardados se perderán</translation>
         <translation type="obsolete">No se encontró una semart card válida</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Tarjeta no configurada.</translation>
     </message>
@@ -2369,9 +2371,8 @@ Los documentos no guardados se perderán</translation>
         <translation type="obsolete">El sistema C2Go no reconocoe esta smart card</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Impoble crear el archivo: </translation>
+        <translation type="vanished">Impoble crear el archivo: </translation>
     </message>
     <message>
         <source>Can't connect to X server
@@ -2392,8 +2393,8 @@ Please check your installation</source>
 Comprueba la instalación del sistema</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Imposible ejecutar el comando: </translation>
     </message>
@@ -2414,12 +2415,12 @@ Actualiza el paquete x2goserver en el servidor</translation>
         <translation type="obsolete">Imposible escribir:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -2428,7 +2429,7 @@ Actualiza el paquete x2goserver en el servidor</translation>
         <translation type="obsolete">Fallo al obtener el tamaño de la ventana (¿está la ventana cerrada?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>Sesión X2Go</translation>
     </message>
@@ -2437,36 +2438,35 @@ Actualiza el paquete x2goserver en el servidor</translation>
         <translation type="obsolete">valor incorrecto para el argumento "velocidad"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Tipo de teclado:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>ID de Sesión:<br>Servidor:<br>Nombre de usuario:<br>Monitor:<br>Sesión creada en:<br>Estado:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Aplicaciones...</translation>
+        <translation type="vanished">Aplicaciones...</translation>
     </message>
     <message>
         <location filename="../../src/onmainwindow.cpp" line="61"/>
@@ -2474,24 +2474,24 @@ Actualiza el paquete x2goserver en el servidor</translation>
         <translation>Iniciando cliente X2Go %1...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation>Iniciando cliente X2Go en modo portable. La carpeta de datos es: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation>Acerca del cliente X2Go</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation>Cliente X2Go iniciado.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation> encontrado.</translation>
     </message>
@@ -2500,78 +2500,83 @@ Actualiza el paquete x2goserver en el servidor</translation>
         <translation type="obsolete">Lenguaje Inglés solicitado. No se carga el traductor.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation>Error no fatal: no se puede cargar el traductor: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation>Intentando cargar el lenguaje con la menor preferencia si existe.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation>Mantenimiento de sesión ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation>&Crear icono de sesión en el escritorio ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation>&Establecer contraseña para el broker ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation>Test de &conectividad ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation>Carpeta compartida ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation>Clic para ocultar o restaurar la ventana. Clic con el botón derecho para mostrar el menú contextual.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation>Cerrando el cliente X2Go ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation>Cliente X2Go finalizado. Cerrando vínculos.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation>¡Falló la autenticación del broker!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation>no se encontró el Servido X2Go en el entorno LDAP </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation>Error en la conexión: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation>No se pudo encontrar la conexión SSH.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -2584,17 +2589,17 @@ Por razones de seguridad se recomienda finalizar el intento de conexión.
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation>Falló la verificación de la clave del equipo.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -2605,55 +2610,55 @@ Por razones de seguridad se recomienda finalizar la conexión.
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>No se ha encontrado el archivo know-hosts. Si aceptas el archivo se creará automáticamente.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation>Falló la autenticación.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation>XDM</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation>RDP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation><b>Error en la conexión</b>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation>Servidor no disponible.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation>Servidor no disponible.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation>No se encontró ningún escritorio al que conectarse.</translation>
     </message>
@@ -2666,12 +2671,12 @@ Por razones de seguridad se recomienda finalizar la conexión.
         <translation type="obsolete"> bits y reiniciar tu servidor X.Org antes de reconectar a esta sesión X2Go.<br />¿Recuperar esta sesión?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation>La profundidad de color actual es diferente de la que tiene la sesión remota. Esto puede provocar problemas durante la reconexión a esta sesión y en la mayoría de los casos <b>se perderá la sesión remota</b> y ¡tendrás que iniciar una nueva! </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation>
@@ -2680,102 +2685,102 @@ Por razones de seguridad se recomienda finalizar la conexión.
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation><br />¿Aún así quieres recuperar esta sesión?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation>No se está ejecutando PulseAudio</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation>La salida de sonido se desactivará para esta sesion. Por favor, activa PulseAudio en el diálogo de configuración o desactiva el sonido en los parámetros de sesión</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation>No ha sido posible crear el túnel SSH para iniciar la sesión (NX):
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation>No fue posible crear el tunel SSL para los datos de sonido:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation>falló el inicio.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation>Habitualmente esto significa que el ejecutable no está disponible.
 La ruta actual de búsqueda es: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation>devuelve un código de salida distinto de cero o de error en otro caso.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation>Falló la ejecución, el código de salida fue: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation>no pudo empezar a tiempo.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation>Este error no debería haber pasado.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation>no se aceptó la operación de escritura.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation>Probablemente no se está ejectuando correctamente o hubo un fallo en medio.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation>Imposible leer desde xmodmap.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation>se encontró un error desconocido durante el inicio o la ejecución.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation>se ha producido un error no definido.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
@@ -2784,42 +2789,42 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
 Rellena un informe de error en <a href="http://wiki.x2go.org/doku.php/wiki:bugs">la página de notificación de errores</a>.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation>Fallo al iniciar el cliente RDP o XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation>Comprueba los parámetro de la sesión y asegura que el cliente seleccionado está instalado en tu sistema.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation>El proxy no finalizó después de 3 segundos. Finalizando el proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation>Finalizando el cliente X2Go porque empezó en modo oculto.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation>Finalizando el cliente X2Go porque se pasó el parámetro --close-disconnect.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation>¿Seguro que quieres finalizar la sesión?
 Los documentos no guardados se perderán.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
@@ -2828,122 +2833,150 @@ Los documentos no guardados se perderán.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation> (el archivo no existe)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation> (la carpeta no existe)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation>Valor incorrecto para el argumento "--link".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation>Valor incorrecto para el argumento "--clipboard".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation>Valor incorrecto para el argumento "--sound".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation>Valor incorrecto para el argumento "--geometry".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation>Valor incorrecto para el argumento "--set-kdb".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation>Valor incorrecto para el argumento "--ldap".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation>Valor incorrecto para el argumento "--ldap1".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation>Valor incorrecto para el argumento "--ldap2".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation>Valor incorrecto para el argumento "--pack".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation>Métodos de empaquetado disponibles:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation>Métodos de empaquetado</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation>La opción no está disponible en esta versión.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation>No se ha podido crear la carpeta:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation><br>(C) 2005-2017 de <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation>Fallo al crear o añadir al archivo: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation>Fallo al cambiar los permisos de acceso al archivo: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation>Este es un error porque el sshd impide el acceso al archivo.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation>Imposible cambiar los permisos del directorio: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation>Este error se ha producido porque el servicio sshd no permite el acceso al directorio.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation>Imposible encontrar el ejecutable del servidor sftp. No se encuentra el que viene incluído ni en otros directorios $PATH.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2956,86 +2989,86 @@ Si el ejecutable del servidro sftp está instalado en tu sistema, por favor repo
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation>Error de tipo de clave SSH</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation>Clave SSH desconocida.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation>Finalizadon aplicación.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation>Error al crear la clave SSH en el directorio predeterminado</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation>Fallo al crear la calve SSH en el directorio: '%1'.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation>fallo al ejecutar ssh-keygen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation>Fallo al ejecutar ssh-keygen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation>fallo durante la ejecución de ssh-keygen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation>fallo durante la ejecución de ssh-keygen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation>fallo durante la ejecución de ssh-keygen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation>La ejecución de ssh-keygen finalizó de manera anormal.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation>probablemente fue llamado sin argumentos.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation>Fallo al abrir el nuevo archivo de clave pública %1 generada en el lado del servidor remoto.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation>archivo de clave pública %1 en el lado del servidor remoto vacío.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation>fallo de inicialización en libssh</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation>Imposible iniciar libssh.</translation>
     </message>
@@ -3052,13 +3085,13 @@ Si el ejecutable del servidro sftp está instalado en tu sistema, por favor repo
         <translation type="obsolete">archivo de clave pública %1 en el lado del servidor remoto vacío.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation>No se puede abrir la clave: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -3071,7 +3104,7 @@ Estas características requieren la ejecución y el funcionamiento de un servido
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -3082,7 +3115,7 @@ Si ves este mensaje, repórtalo como un bug en:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -3093,14 +3126,14 @@ Por favor, reporta el bug en:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -3111,7 +3144,7 @@ Si ves este mensaje, por favor repórtalo en:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -3126,77 +3159,73 @@ Por favor reporta el bug en:
         <translation type="obsolete"><br>(C) 2005-2016 de <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>El modo X2GoPlugin fue patrocinado por <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
+        <translation type="vanished"><br>El modo X2GoPlugin fue patrocinado por <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation><br>Cliente para usar con el sistema de acceso remoto X2Go. Este cliente es capaz de conectar con él/los servidor/es X2Go y iniciar, parar, guardar y terminar (si están en ejecucion) sesiones de escritorio. El Cliente X2Go almacena diferentes conexiones a servidores y puede recuperar de manera automática datos de autenticación desde directorios LDAP. Además puede usarse como un sistema de inicio de sesión a pantalla completa (reemplazando a gestores de inicio d [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation><b>Cliente X2Go v. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation>Comprueba los datos de conexión LDAP.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Comprueba si el paquete que provee "scdaemon" está instalado.
+        <translation type="vanished">Comprueba si el paquete que provee "scdaemon" está instalado.
 La carpeta de búsqueda actual es: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation>no se pudo empezar todavía.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation>Imposible leer desde scdaemon.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation>No se encontró una tarjeta válida.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation>El sistema X2Go no reconocoe esta smart card.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation>No se puede iniciar el servidor X.Org.
 Comprueba la instalación del sistema.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation>El servidor remoto no soporta exportar el sistema de archivos a través del tunel SSH.
 Actualiza el paquete x2goserver en el servidor.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation>No ha sido posible crear el túnel SSH para las carpetas compartidas y la impresión remota:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation>No ha sido posible leer:
@@ -3209,92 +3238,92 @@ Actualiza el paquete x2goserver en el servidor.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation>Fallo al obtener el tamaño de la ventana (¿Has cerrado la ventana?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation>Valor incorrecto para el argumento "velocidad"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation>Aplicaciones...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Mostrar detalles</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Desconectar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Acceso completo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Sólo ver</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>IP del cliente</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>ID de la Sesión</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Sólo mis escritorios</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
@@ -3383,13 +3412,13 @@ Por favor, reporta el error en:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation>Desactivando la impresión remota o la compartición de archivos en los ajustes de la sesión eliminará este mensaje.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation>El demonio SSH falló al abrir su clave pública del equipo.</translation>
     </message>
@@ -3456,7 +3485,7 @@ Si tu eres el administrador del equipo ejecuta:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation>El demonio SSH falló al abrir el archivo
@@ -3471,12 +3500,12 @@ puedes instalar sshd con
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Restaurar barra de herramientas</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Haz clic en este botón&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;para restaurar la barra de herramientas&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3725,7 +3754,7 @@ Ejemplo:
         <translation>¡falló getcwd()!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation>¡No se pudo iniciar PulseAudio!</translation>
     </message>
@@ -3742,75 +3771,75 @@ Si has descargado el paquete pre compilado desde la web oficial, por favor repor
 </translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation>¡Error obteniendo la versión de PulseAudio!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation>Se encontró un carácter inexperado al analizar el número de versión mayor</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation>Se encontró un carácter inexperado al analizar el número de versión menor</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation>Se encontró un carácter inexperado al analizar el número de versión micro</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation>Se intentó saltar el número de versión. Algo está mal.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation>Fallo al convertir la versión mayor de texto a entero.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation>Fallo al convertir la versión menor de texto a entero.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation>Fallo al convertir la versión micro de texto a entero.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation>Formato inexperado.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation>Fallo al iniciar PulseAudio.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation>Fallo al lanzar el sonido de inicio.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation>El soporte de sonido no está disponible.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3914,127 +3943,127 @@ o
         <translation type="obsolete">Crear icono de sesión en el escritorio...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation>Preferencias de la sesión ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation>Crear icono de sesión en el escritorio ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Borrar sesión</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Acciones sobre la sesión</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Elegir tipo</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Elegir resolución</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Alternar entre soporte para sonido activo sí o no</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Nueva sesión</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>activa</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>suspendida</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>Conexión RDP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Conexión al escritorio local</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Aplicaciones publicadas</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>pantalla completa</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Monitor</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>ventana</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Máximo</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>Activo</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>Desactivado</translation>
     </message>
@@ -4177,7 +4206,7 @@ Use X2Go Client's hidden mode?</source>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>Puerto SSH:</translation>
     </message>
@@ -4237,13 +4266,13 @@ Use X2Go Client's hidden mode?</source>
         <translation>Clave RSA/DSA:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation>El cliente X2Go está ejecutándose en modo portable. Deberías usar una ruta hacia tu dispositivo USB donde poder usar tus datos en cualquier lugari.</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation>Conenxión directa XDMCP</translation>
     </message>
@@ -4276,46 +4305,46 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Conectar a Windows Terminal Server</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Conectar al escritorio local</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Escritorio personalizado</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Aplicación</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Aplicaciones publicadas</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Comando:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Opciones avanzadas...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Ruta al ejecutable</translation>
     </message>
@@ -4324,23 +4353,23 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Conexión RDP directa</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>Puerto RDP:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Abrir imagen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Imágenes</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Archivo con la clave open</translation>
     </message>
@@ -4355,26 +4384,26 @@ Use X2Go Client's hidden mode?</source>
         <translation>Agente SSH o clave SSH por defecto</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation>Conectar a Windows Terminal Server</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation>Conexión RDP directa</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Todos los archivos</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -4383,30 +4412,30 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">el cliente x2go está ejecutándose en modo portable. Debería usar una ruta hacia tu dispositivo usb donde poder usar tus datos dondequiera estés</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>Servidor XDMCP:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation>conección directa XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>opciones de línea de comando para rdesktop:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Nueva sesión</translation>
     </message>
@@ -4616,7 +4645,7 @@ el sonido en conexiones a través de firewalls</translation>
         <translation>cliente XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>es</translation>
     </message>
@@ -4625,8 +4654,8 @@ el sonido en conexiones a través de firewalls</translation>
         <translation type="obsolete">pc105/es</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>contraseña</translation>
     </message>
@@ -4748,9 +4777,9 @@ el sonido en conexiones a través de firewalls</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation>No se puede crear la sesión SSH.</translation>
     </message>
@@ -4760,57 +4789,57 @@ el sonido en conexiones a través de firewalls</translation>
         <translation>Usando el nombre de usuario del sistema.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation>No hay conexión con el servidor proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation>Falló la autenticación.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation>Fallo al iniciar el cliente SSH. Por favor comprueba tu instalación y la configuración GSSApi.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation>Comprueba tu configuración GSSApi o elije otro método de autenticación.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation>Reconectar a la sesión</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation>No se puede abrir el archivo </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation>No se puede crear el archivo remoto </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation>No se puede escribir en el archivo remoto </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>error en %1.</translation>
@@ -4824,12 +4853,12 @@ el sonido en conexiones a través de firewalls</translation>
         <translation type="obsolete">error en channel_open_session.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation>Error escribiendo en el socket.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation>Error leyendo el canal.</translation>
     </message>
@@ -4838,7 +4867,7 @@ el sonido en conexiones a través de firewalls</translation>
         <translation type="obsolete">error en channel_write.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation>Error leyendo el socket TCP.</translation>
     </message>
@@ -4892,7 +4921,7 @@ el sonido en conexiones a través de firewalls</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>no se puede conectar a </translation>
     </message>
diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts
index 9770da4..59e10ab 100644
--- a/res/i18n/x2goclient_et.ts
+++ b/res/i18n/x2goclient_et.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="et_EE">
+<TS version="2.1" language="et_EE">
 <context>
     <name>AppDialog</name>
     <message>
@@ -272,88 +272,88 @@
         <translation>Üldine</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Näita ikooni tegumiribal</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Peida tegumiribale kui minimeeritakse</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Peida tegumiribale kui suletakse</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Peida tegumiribale kui ühendus on loodud</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Too uuesti esile kui ühendus katkeb</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Kasuta LDAP-d</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>Serveri URL-aadress:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>Esimese varuserveri URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>Teise varuserveri URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation>X.Org Serveri seaded</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation>PulseAudio seaded</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation>Keela PulseAudio</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation>Keela heli sisend</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation>Sinu XQuartz versioon on liiga vana.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation>Sa kasutad XQuartz (X Window System Server for OS X) versiooni %1.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -374,12 +374,12 @@ leiavad uuendatud versiooni:
 <center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation>Ühtegi lubatud XQuartz programmi ei ole valitud.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -400,17 +400,17 @@ Mõned standardsed asukohad oleks:
         <translation type="obsolete">X-serveri seaded</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11-programm:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11-versioon:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>Otsi X11-rakendus</translation>
     </message>
@@ -419,39 +419,39 @@ Mõned standardsed asukohad oleks:
         <translation type="obsolete">Kliendi SSH-port mida kasutatakse failide ekspordil:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Käivita ühendus veebilehe sees</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Täpsemad valikud</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Vaikimisi omadused</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>&Loobu</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Seaded</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Printimine</translation>
     </message>
@@ -476,17 +476,17 @@ Mõned standardsed asukohad oleks:
         <translation type="obsolete">Valitud asukohast ei leita toimivat X11-rakendust</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Ühendus</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>&Sisend/Väljund</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Meedia</translation>
     </message>
@@ -644,7 +644,7 @@ Mõned standardsed asukohad oleks:
         <translation>Vaikimisi väärtused</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Sessiooni parameetrid -</translation>
     </message>
@@ -1023,11 +1023,16 @@ Mõned standardsed asukohad oleks:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="163"/>
         <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
         <translation>Kasuta omaloodud taustapilti (SVG formaadis) X2Go Client'i peaaknas. Kui on antud kataloog siis valitakse sealt juhuslik SVG fail.</translation>
     </message>
     <message>
-        <location filename="../../src/help.cpp" line="163"/>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Kasuta omaloodud ikooni (SVG formaadis) lisatunnusena vahetamaks vaikimisi alumises vasakus nurgas olevat.</translation>
     </message>
@@ -1043,7 +1048,7 @@ Mõned standardsed asukohad oleks:
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Serveri võti on muutunud.
@@ -1062,7 +1067,7 @@ See on nüüd:</translation>
         <translation type="obsolete">Ei leidu tuntud võtmete faili. Kui kinnitad selle serveri võtme, moodustame automaatselt ka tuntud võtmete faili</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Tundmatu server. Kas Sa usaldad tema võtit?
@@ -1073,22 +1078,22 @@ Tema avaliku võtme 'hash' on: </translation>
         <translation type="obsolete">Võtme kontroll ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Jah</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Kontrollkood:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anna võtme dekrüpteerimise salasõna</translation>
     </message>
@@ -1097,12 +1102,12 @@ Tema avaliku võtme 'hash' on: </translation>
         <translation type="obsolete">Autentimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
@@ -1111,12 +1116,12 @@ Tema avaliku võtme 'hash' on: </translation>
         <translation type="obsolete">Sisselogimine ebaõnnestus!<br>Palun ürita uuesti</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Serveri sertifikaat on vigane.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Sa ei tohiks lisada erandit kui Sa kasutad internetiühendust, mida sa täielikult ei usalda, või kui Sa pole harjunud saama pidevalt seda hoiatust sellelt serverilt.</p></translation>
     </message>
@@ -1125,119 +1130,124 @@ Tema avaliku võtme 'hash' on: </translation>
         <translation type="obsolete">Turvalise ühenduse loomine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation>Ühendus katkestatakse turvalisuse tõttu.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation>Serveri võtit ei leitud, aga leidus muu võti. Mõni häkker võib olla vahetanud oletusvõtme üritades petta kaugkasutajat et viimane arvaks, et võtit veel ei ole.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Ei leidu tuntud võtmete faili (known_hosts). Kui kinnitad selle serveri võtme, moodustame automaatselt ka tuntud võtmete faili.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation>Võtme kontroll ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation>Autentimine ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation>Sisselogimine ebaõnnestus!<br>Palun ürita uuesti.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation>Turvalise ühenduse loomine ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Antud:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organisatsioon (O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisatsiooni allüksus(OU)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Seeria number	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Väljaandja:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Kehtivus:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Välja antud	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>vananeb	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Sõrmejälg:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>Sulge X2Go Client</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Lisa erand</translation>
     </message>
@@ -1337,8 +1347,8 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">x2goclient käivitub...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -1347,34 +1357,34 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go Client</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>ühendan</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Veebilehitseja</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>E-mail kliendiprogramm</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
@@ -1383,12 +1393,12 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">Käivitan x2goclient-i 'mobiilses' olekus... Andmekataloog on:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Seaded...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Tugi ...</translation>
     </message>
@@ -1401,13 +1411,13 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">X2Go klient on käivitatud.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>Translaatori laadimine ei õnnestu:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Translaator: </translation>
     </message>
@@ -1416,78 +1426,71 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">installeeritud.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Jaga kataloogi...</translation>
+        <translation type="vanished">Jaga kataloogi...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Rakendused...</translation>
+        <translation type="vanished">Rakendused...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Peata</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Ühenda uuesti</translation>
+        <translation type="vanished">Ühenda uuesti</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>Haagi X2Go aken.lahti</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Minimiseeri töövahendid</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Sessioon:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Lõpeta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Lõpeta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Uus sessioon ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1496,7 +1499,7 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">Sessiooni haldamine...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1513,13 +1516,13 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">&Ühenduse test...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Näita töövahendite riba</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Qt andmed</translation>
     </message>
@@ -1534,24 +1537,24 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation>X2Go Client %1 käivitub...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation>Käivitan X2Go Client-i 'mobiilses' olekus... Andmekataloog on: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation>Teave X2Go Client kohta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation>X2Go Client on käivitatud.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation> leitud.</translation>
     </message>
@@ -1561,239 +1564,238 @@ Palun uuenda kasutamaks PulseAudio-t.</translation>
         <translation type="obsolete">Inglise keel on nõutud, translaatorit ei laeta.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation>Ei suuda laadida translaatorit: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation>Üritame laadida järgmise eelistuse keelt, kui eksisteerib.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation>Sessiooni haldamine ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation>&Tee sessiooni ikoon töölauale ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation>&Anna 'broker'-i salasõna ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation>&Ühenduvuse test ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Sessioon</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Valikud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Abi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Logi sisse:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Toiming ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Salasõna on vahetatud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Vale salasõna!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Ühendume 'broker'-iga</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentimine</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Taasta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>Ei ole ühendatud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Multimeedia</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Arendus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Õpetus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Mäng</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Graafika</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Võrk</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Office</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Seaded</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>Süsteem</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Abiprogramm</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Muu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation>Jaga kataloogi ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation>Vasak hiire nupp peidab või taastab akna. Parem nupp näitab menüüd.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation>Sulgen X2Go Client'i ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation>Lõpetanud X2Go Client suleb konksusid.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation>Brokeri autentimine ebaõnnestus!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation>X2Go Serverit ei leia LDAP-st </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation>Ühenduse viga: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation>Ei leia SSH-ühendust.</translation>
     </message>
@@ -1810,17 +1812,17 @@ Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation>Võtme kontroll ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -1831,45 +1833,45 @@ Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Ei leidu tuntud võtmete faili (known_host). Kui kinnitad selle serveri võtme, moodustame automaatselt ka tuntud võtmete faili.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation>Autentimine ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation><b>Ühendus ebaõnnestus</b>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation>Ühtegi serverit ei leidu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation>Server pole kättesaadav.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation>Ühtegi ligipääsetavat töölauda ei ledu.</translation>
     </message>
@@ -1882,7 +1884,7 @@ Kas Sa soovid ühenduse katkestada?
         <translation type="obsolete"> bitid ja käivitaksid X-serveri uuesti enne kui Sa ühendud uuesti selle x2go sessiooniga<br>Kas soovid vaatamata sllele jätkata?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -1895,22 +1897,22 @@ Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation>XDM</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation>RDP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation>Su praegune värvieraldus on erinev kui sessioonil. See võib põhjustada probleeme taasühendamisel ja enamusel juhtudest <b>ühendus kaob</b> ja sa pead alustama uuesti! </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation>
@@ -1919,102 +1921,102 @@ Kas Sa soovid ühenduse katkestada?
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation><br />Kas soovid sessiooni ikkagi taaskäivitada?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation>"PulseAudio" ei ole käivitunud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation>Audio väljund on sellel sessioonil keelatud. Palun luba PulseAudio heliseadete konfiguratsiionis</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation>Ei suuda luua SSH tunnelit X2Go sessiooni (NX) käivitamiseks:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation>Ei suuda luua SSH tunnelit audio jaoks:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation>käivitamine ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation>Ilmselt ei ole programm kättesaadav.
 Otsitakse kataloogist: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation>saadi mittenulline lõpetuskood või programm lõpetas mingil muul põhjusel töö.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation>Käivitamine ebaõnnestus. Vea kood on: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation>ei käivitunud mõistliku aja jooksul.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation>Sellist viga ei tohiks juhtuda.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation>ei lubanud kirjutamist.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation>See ilmselt ei tööta enam korrektselt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation>Ei suuda lugeda xmodmap'ist.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation>käivitamisel juhtus tundmatu viga.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation>ilmnes tundmatu viga.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
@@ -2023,42 +2025,42 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
 Teata veast <a href="http://wiki.x2go.org/doku.php/wiki:bugs">"bugs wiki page"</a>.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation>Ei õnnestu käivitada RDP või XDMCP klienti</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation>Kontrolli sessiooni seadeid ja veendu et valitud klient on paigaldatud.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation>Proxy ei lõpetanud 3 sekundi jooksul. Proxy tapetakse.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation>Sulen X2Go Cliendi kuna see oli käivitatud peidetud reziimis.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation>Sulen X2Go Cliendi kuna oli antud --close-disconnect parameeter.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation>kas oled kindel et tahad sulgeda?
 Avatud failid ei salvestu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
@@ -2067,106 +2069,134 @@ Avatud failid ei salvestu.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation> (faili ei leidu)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation> (kataloogi ei leidu)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation>Vale väärtus parameetril "--link".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation>Vale väärtus parameetril "--clipboard".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation>Vale väärtus parameetril "--sound".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation>Vale väärtus parameetril "--geometry".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation>Vale väärtus parameetril "--set-kbd".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation>Vale väärtus parameetril "--ldap".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation>Vale väärtus parameetril "--ldap1".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation>Vale väärtus parameetril "--ldap2".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation>Vale väärtus parameetril "--pack".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation><b>(C) 2005-2017 <b>tublid</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation><br>See moodul on vajalik et üheduda X2Go baseeruvate süsteemidega. See võimaldab ühenduda X2Go Serveri(te)ga ja alustada, lõpetada, jätkata ja katkestada sessioone. X2Go Client oskab kasutada ja automaatselt nõuda autentimisandmeid LDAP-serveritest. Lisaks võib seda kasutada kui üleekraani loginkuva (korvates sellega login süsteeme nagu näiteks XDM). Palun vaata <a href="http://www.x2go.org">projekti kodulehte</a> täpsema info saamiseks.< [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation>Ei suuda luua ega lisada faili: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation>Ei suuda muuta õigusi failile: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation>See on viga kuna sshd võib keelduda sellisest failist.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation>Ei suuda muuta õigusi kataloogile: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation>See on viga kuna sshd võib keelduda sellisest kataloogist.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation>Ei leia sftp-server programmi. Seda kas ei ole või ei leidu teda'$PATH ega lisakataloogides.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2179,82 +2209,82 @@ Kui Teie sftp-server on siiski juba installeeritud, palun teavitage sellisest ve
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation>SSH võtme tüübi valimise viga</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation>Valiti tundmatu SSH võti.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation>Programmi töö katkestamine.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation>SSH võtme baaskataloogi loomise viga</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation>Ei suuda luua SSH võtme baaskataloogi '%1'.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation>ssh-keygen käivitamise viga</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation>Ei suuda käivitada ssh-keygen programmi.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation>ssh-keygen jooksis kinni</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation>Ssh-keygen jooksis kinni.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation>ssh-keygen programmi viga</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation>Ssh-keygen ei lõpetanud korrektselt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation>Tundub et see oli käivitatud tundmatute parameetritega.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation>Ei õnnestu avada äsja genereeritud %1 avaliku võtme faili.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation>%1 public host key on tühi.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2267,7 +2297,7 @@ Need vajavad toimimiseks funktsioneerivat SSH serverit.
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2278,7 +2308,7 @@ Kui Te näete seda teadet, teavitage palun:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2289,15 +2319,15 @@ Palun teata veast:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2308,7 +2338,7 @@ Kui Te näete seda teadet, teavitage palun:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2319,19 +2349,19 @@ Palun teata veast:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation>SSH daemon ei suuda avada
 rakenduse 'authorized_keys' faili.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation>libssh initsialiseerimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation>Ei suuda initsialiseerida libssh.</translation>
     </message>
@@ -2348,9 +2378,9 @@ rakenduse 'authorized_keys' faili.</translation>
         <translation type="obsolete">X2Goclient on suletud.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Palun kontrolli LDAP-sätteid</translation>
     </message>
@@ -2379,7 +2409,7 @@ Kasuta x2goclient programmi peidetuna? </translation>
         <translation type="obsolete">X2Go viit sessioonile</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>X2Go -sessioone ei leidunud, suleme. </translation>
     </message>
@@ -2388,41 +2418,40 @@ Kasuta x2goclient programmi peidetuna? </translation>
         <translation type="obsolete">Kas oled kindel, et tahad kustutada selle sessiooni?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP -ühendus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Ühendus lokaalsele töölauale</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> sees </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Ühenduse loomine serveriga: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation> => </translation>
+        <translation type="vanished"> => </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -2433,12 +2462,17 @@ Kasuta x2goclient programmi peidetuna? </translation>
         <translation type="obsolete">Ei leia SSH-ühendust.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anna võtme salasõna</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Serveri avalik võti on muutunud.
@@ -2449,125 +2483,121 @@ See on nüüd:</translation>
         <translation type="obsolete">Vigane argumendi "--clipboard" väärtus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Abi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation>Võimalikud pakkimisviisid:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation>Pakkimisviisid</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation>See parameeter ei ole selles versioonis võimalik.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation>Ei suuda luua kataloogi:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation>Ei leia võtit: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>X2Go Plugin mode sai sponsoreeeritud <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a> poolt<br></translation>
+        <translation type="vanished"><br>X2Go Plugin mode sai sponsoreeeritud <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a> poolt<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation><b>X2Go Client v. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation>Palun kontrolli LDAP-sätteid.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Kontrolli kas "scdaemon" toetav lisamoodul on paigaldatud.
+        <translation type="vanished">Kontrolli kas "scdaemon" toetav lisamoodul on paigaldatud.
 Otsimiste on: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation>ei ole veel käivitunud.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation>Ei suuda lugeda scdaemon'ist.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation>Ei leia toimivat kaarti.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation>X2Go ei tunne seda kaarti.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation>Ei suuda käivitada X.Org Serverit.
 Palun kontrolli oma installeeringut.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation>Serveril puudub SSH tunneli kaudu failisüsteemi eksportimise tugi.
 Palun uuenda x2goserverit.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation>Ei suuda luua SSH tunnelit failide jagamiseks või pronteri jagamiseks:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation>Ei suuda lugeda:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation>Ei suuda määrata akna suurust. (Kas Te sulgesite akna?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation>"speed" argumendil on vale väärtus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation>Rakendused ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
@@ -2576,19 +2606,19 @@ Palun uuenda x2goserverit.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation>Sessioonis keelatud Kaugprintimine ja/või failide jagamine kirjutab selle üle.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation>SSH daemon ei suuda avada oma avalikku võtit.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>SSH Viga</translation>
     </message>
@@ -2629,7 +2659,7 @@ SSH service Sinu arvutisse.</translation>
         <translation type="obsolete">SSH daemon ei suuda avada rakenduse avalikku võtit.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>SSH daemon ei suuda avada rakenduse avalikku võtit
@@ -2654,7 +2684,7 @@ rakenduse 'authorized_keys' faili.</translation>
         <translation type="obsolete">Ei leidu tuntud võtmete faili (known_host). Kui kinnitad selle serveri võtme, moodustame automaatselt ka tuntud võtmete faili</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Tundmatu server. Kas Sa usaldad tema võtit.?
@@ -2669,7 +2699,7 @@ Tema avaliku võtme 'hash' on:</translation>
         <translation type="obsolete">Kui programm töötab näita ikooni tegumiribal</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Kontrollkood:</translation>
     </message>
@@ -2685,18 +2715,18 @@ Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Jah</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Kui sa kinnitad uue võtme võib Su ühendus muutuda ebaturvaliseks.
@@ -2713,7 +2743,7 @@ Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Autentimine ebaõnnestus:</translation>
     </message>
@@ -2722,7 +2752,7 @@ Kas Sa soovid ühenduse katkestada?
         <translation type="obsolete">Autentimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Anna SSH proxy salasõna</translation>
     </message>
@@ -2733,37 +2763,37 @@ Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Vale salasõna!</b><br /><br /></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Yhendus ebaõnnestus: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation>- Vale salasõna.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
@@ -2778,41 +2808,41 @@ Kas Sa soovid ühenduse katkestada?
         <translation type="obsolete">Server ei ole kättesaadav</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Vali sessioon:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>töötab</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>peatatud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Töölaud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>rakendus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>Varisessioon</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Info</translation>
     </message>
@@ -2821,20 +2851,20 @@ Kas Sa soovid ühenduse katkestada?
         <translation type="obsolete">Ühtegi ligipääsetavat töölauda ei ledu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Valik</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Vali töölaud:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
@@ -2851,47 +2881,47 @@ Kas Sa soovid ühenduse katkestada?
         <translation type="obsolete"> bitti ja käivitaksid X-serveri uuesti enne kui Sa ühendud uuesti selle x2go sessiooniga<br>Kas soovid jätkata vaatamata sllele?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>peatame</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>katkestame</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Vale salasõna!</b><br><br> </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Uus sessioon on käivitatud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Sessioon jätkub</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Kataloogi loomine ei õnnestu: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Ei õnnestu kirjutamine faili: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>Ühendu X2GO aknaga</translation>
     </message>
@@ -2906,12 +2936,12 @@ Kas Sa soovid ühenduse katkestada?
         <translation type="obsolete">Ei suuda luua SSL Tunnelit:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Hädaväljapääs.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Ootame kuni proxy lõpetab.</translation>
     </message>
@@ -2920,29 +2950,29 @@ Kas Sa soovid ühenduse katkestada?
         <translation type="obsolete">Ebaõnnestus, tapame proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>Lõpetatud</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>Käivitub</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>jätkab</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Ühendus aegus, katkestame</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>katkestame</translation>
     </message>
@@ -2953,20 +2983,20 @@ Unsaved documents will be lost</source>
 Avatud failid ei salvestu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Sessioon</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Ekraan</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Loomisaeg</translation>
     </message>
@@ -2979,7 +3009,7 @@ Avatud failid ei salvestu</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (ei saa avada faili)</translation>
     </message>
@@ -3024,9 +3054,9 @@ Avatud failid ei salvestu</translation>
         <translation type="obsolete">vale väärtus parameetril "--pack"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Vale parameeter: </translation>
     </message>
@@ -3047,12 +3077,12 @@ Avatud failid ei salvestu</translation>
         <translation type="obsolete">See seade ei ole võimalik selles versioonis</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Muutuste nimekiri</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Git'i info</translation>
     </message>
@@ -3069,7 +3099,7 @@ Avatud failid ei salvestu</translation>
         <translation type="obsolete">Võtme avamine ei õnnestu: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Abi</translation>
     </message>
@@ -3098,7 +3128,7 @@ Avatud failid ei salvestu</translation>
         <translation type="obsolete">Ei leia toimivat kaarti</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Kaart on puudulikult konfigureeritud.</translation>
     </message>
@@ -3107,9 +3137,8 @@ Avatud failid ei salvestu</translation>
         <translation type="obsolete">X2Go ei tunne seda kaarti</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Ei suuda luua faili:</translation>
+        <translation type="vanished">Ei suuda luua faili:</translation>
     </message>
     <message>
         <source>Can't connect to X server
@@ -3129,8 +3158,8 @@ Please check your installation</source>
 Palun kontrolli oma installeeringut</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Ei suuda käivitada:</translation>
     </message>
@@ -3153,12 +3182,12 @@ Uuenda x2goserver uuema vastu</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3167,7 +3196,7 @@ Uuenda x2goserver uuema vastu</translation>
         <translation type="obsolete">Akna geomeetriliste parameetrite lugemine ei õnnestu (Kas aken on äkki suletud)?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go Sessioon</translation>
     </message>
@@ -3176,99 +3205,99 @@ Uuenda x2goserver uuema vastu</translation>
         <translation type="obsolete">argumendil "speed" on vale väärtus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Salasõna:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Klaviatuuri asetus:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>Sessiooni ID:<br>Server:<br>Kasutajatunnus:<br>Ekraan:<br>Loomisaeg:<br>Olek:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Katkesta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Näita täpsemalt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Jätka</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Uus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Kõik õigused</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Ainult vaatlemine</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Olek</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Käsk</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>Kliendi IP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>Sessiooni ID</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Kasutaja</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Ainult oma töölauad</translation>
     </message>
@@ -3281,12 +3310,12 @@ võid installeerida selle kasutades käsku
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Taasta tegumiriba</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><b><b>&nbsp;&nbsp;&nbsp;Vajuta seda nuppu&nbsp;&nbsp;&nbsp;<b>&nbsp;&nbsp;&nbsp;et tööriistariba oleks jälle nähtav&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3535,32 +3564,32 @@ Näiteks:
         <translation>getcwd() ebaõnnestus!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation>Tundmatu sümbol minor versiooninumbris</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation>Tundmatu sümbol micro versiooninumbris</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation>Pean vahele jätma major versiooninumbri. Midagi on valesti.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation>"PulseAusio" käivitumine ebaõnnestus!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation>Heli ei ole võimalik.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3590,20 +3619,20 @@ Kui laadisid alla ametlikult kodulehelt siis palun teavita:
 </translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation>Viga PulseAudio versiooninumbri leidmisel!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation>Tundmatu sümbol versiooninumbris</translation>
     </message>
@@ -3623,32 +3652,32 @@ Kui laadisid alla ametlikult kodulehelt siis palun teavita:
         <translation type="obsolete">Pean vahele jätma peamise versiooninumbri. Midagi on valesti.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation>Ei suuda muuta peamist versiooninumbrit täisarvuks.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation>Ei suuda muuta keskmist versiooninumbrit täisarvuks.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation>Ei suuda muuta tagumist versiooninumbrit täisarvuks.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation>Tundmatu formaat.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation>Ei suuda käivitada PulseAudio programmi.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation>Ei suuda mängida alustusheli.</translation>
     </message>
@@ -3737,127 +3766,127 @@ või
         <translation type="obsolete">Tee sessioonist ikoon töölauale ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation>Sessiooni omadused ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation>Tee sessioonist ikoon töölauale ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Kustuta sessioon</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Sessiooni toimingud</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Vali tüüp</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Vali resolutsioon</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Hääle edastus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Uus sessioon</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>töötab</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>seisatud</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP -ühendus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Ühendus lokaalsele töölauale</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Võimalikud rakendused</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>täisekraan</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Ekraan</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>aken</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Maksimaalne</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>Lubatud</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>Keelatud</translation>
     </message>
@@ -4000,7 +4029,7 @@ Kasuta X2Go Client programmi peidetuna?</translation>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH .-port:</translation>
     </message>
@@ -4070,25 +4099,25 @@ Kasuta X2Go Client programmi peidetuna?</translation>
         <translation>SSH-agent või vaikimisi-SSH-võti</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation>Loo ühendus Windows terminal serveriga</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation>Otsene RDP ühendus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation>X2Go Client-rakendus töötab 'mobiilses' viisis. Kasuta oma usb-seadme asukohamäärangut et pääseksid oma andmetele ligi ükskõik kus sa ka poleks.</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation>Otsene XDMCP ühendus</translation>
     </message>
@@ -4121,46 +4150,46 @@ Kasuta X2Go Client programmi peidetuna?</translation>
         <translation type="obsolete">Loo ühendus Windows terminal serveriga</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Ühenda lokaalsele töölauale</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Isemääratud meetod</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Üks kindel rakendus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Lubatud rakendused</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Käsk:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Täpsemad valikud...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Programmi asukoht</translation>
     </message>
@@ -4169,20 +4198,20 @@ Kasuta X2Go Client programmi peidetuna?</translation>
         <translation type="obsolete">Otsene RDP ühendus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Ava võtmefail</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Kõik failid</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
@@ -4191,45 +4220,45 @@ Kasuta X2Go Client programmi peidetuna?</translation>
         <translation type="obsolete">x2goclient-rakendus töötab 'mobiilses' viisis. Kasuta oma usb-seadme asukohamäärangut et pääseksid oma andmetele ligi ükskõik kus sa ka poleks</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP-port:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Ava pilt</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Pildid</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP -server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation>otsene XDMCP ühendus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop -käsurea parameetrid:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Uus sessioon</translation>
     </message>
@@ -4438,7 +4467,7 @@ sound system connections through firewalls</source>
         <translation>XDMCP klient</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -4447,8 +4476,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>salasõna</translation>
     </message>
@@ -4569,35 +4598,35 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Libssh-teegi initsialiseerimise viga.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation>Ei õnnestu SSH kliendi käivitamine. Palun kontrolli oma installeerimist ja GSSApi konfiguratsiooni.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation>Kontrolli oma GSSApi konfiguratsiooni või vali mõni muu atentimismeetod.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>%1 ebaõnnestus.</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation>SSH-sessiooni loomine ei õnnestu.</translation>
     </message>
@@ -4607,18 +4636,18 @@ sound system connections through firewalls</source>
         <translation>Kasuta keskkonnas olevat kasutajanime.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation>Vaheserveriga ühendumise viga.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation>Autentimine ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation>Ühendu uuesti</translation>
     </message>
@@ -4633,17 +4662,17 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Kontrolli oma GSSApi konfiguratsiooni või vali mõni muu atentimismeetod.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation>Ei saa avada faili </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation>Ei saa luua serverile faili </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation>Ei suuda kirjutada serveri faili </translation>
     </message>
@@ -4656,12 +4685,12 @@ sound system connections through firewalls</source>
         <translation type="obsolete">channel_open_session ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation>Viga socket'isse kirjutamisel.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation>Kanali lugemisviga.</translation>
     </message>
@@ -4670,7 +4699,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">channel_write ebaõnnestus.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation>Viga TCP socket'ist lugemisel.</translation>
     </message>
@@ -4724,7 +4753,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>ei suuda ühenduda </translation>
     </message>
diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts
index 7f2072d..28b1afb 100644
--- a/res/i18n/x2goclient_fi.ts
+++ b/res/i18n/x2goclient_fi.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fi_FI">
+<TS version="2.1" language="fi_FI">
 <context>
     <name>AppDialog</name>
     <message>
@@ -272,73 +272,73 @@
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Näytä ikoni järjestelmäpalkissa</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Piilota järjestelmäpalkkiin kun minimoidaan</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Piilota järjestelmäpalkkiin kun suljettu</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Piilota järjestelmäpalkkiin kun yhteys on avattu</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Hae esille järjestelmäpalkista kun yhteys katkeaa</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Käytä LDAP-ta</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>Palvelimen URL-osoite:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>Varapalvelimen 1 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>Varapalvelimen 2 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation>X.Org asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation>PulseAudio asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation>Posta PulseAudio käytöstä</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation>Poista mikrofoni käytöstä</translation>
     </message>
@@ -359,17 +359,17 @@
         <translation type="obsolete"><font size="5">Käynnistä X2Go-yhteysohjelma muutosten aktivoimiseksi</font><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation>XQuartz versiosi on liian vanha.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation>Käytät XQuartz (X Window System Server for OS X) versiota %1.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -390,12 +390,12 @@ voivat hakea tuoreen version täältä:
 <center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation>XQuartz-sovelleusta ei ole valittu.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -416,17 +416,17 @@ Muutama standardiasennuksia löytyy täältä:
         <translation type="obsolete">X-palvelimen asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11-sovellus:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11-versio:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>Etsi X11-sovellus</translation>
     </message>
@@ -435,39 +435,39 @@ Muutama standardiasennuksia löytyy täältä:
         <translation type="obsolete">Etätyöaseman käyttämä levyjaon SSH-portti:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Käynnistä istunto web-palvelimessa</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Edistyneet toiminnot</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Oletusarvot</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>&Keskeytä</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Tulostaa</translation>
     </message>
@@ -492,17 +492,17 @@ Muutama standardiasennuksia löytyy täältä:
         <translation type="obsolete">Toimivaa X11-sovellusta ei löydy annetusta hakupolusta</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Yhteys</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Media</translation>
     </message>
@@ -660,7 +660,7 @@ Muutama standardiasennuksia löytyy täältä:
         <translation>Oletukset</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Istunnon oletusasetukset - </translation>
     </message>
@@ -1039,11 +1039,16 @@ Muutama standardiasennuksia löytyy täältä:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="163"/>
         <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
         <translation>Käytä räätälöitya taustakuvaa (SVG) X2Go-clientissä. Jos hakemisto annettu, käytetään satunnaisesti löydettyä kuvaa sen sijasta.</translation>
     </message>
     <message>
-        <location filename="../../src/help.cpp" line="163"/>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Käytä omaa ikonia (SVG) oletuksen sijasta X2Go-clientin ikkunaan alakulmassa.</translation>
     </message>
@@ -1059,7 +1064,7 @@ Muutama standardiasennuksia löytyy täältä:
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translatorcomment>tarkista</translatorcomment>
@@ -1079,7 +1084,7 @@ Se on nyt: </translation>
         <translation type="obsolete">Tunnetut työasemat sisältävää tiedostoa ei löytynyt. Jos hyväksyt palvelimen avaimen, tiedosto tehdäään automaattisesti</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Palvelin on tuntematon. Luotatko sen avaimeen?
@@ -1090,22 +1095,22 @@ Julkinen avain: </translation>
         <translation type="obsolete">Palvelimen avaimen todennus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Tarkistuskoodi:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anna avaimen salasana</translation>
     </message>
@@ -1114,12 +1119,12 @@ Julkinen avain: </translation>
         <translation type="obsolete">Autentikointi epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
@@ -1128,12 +1133,12 @@ Julkinen avain: </translation>
         <translation type="obsolete">Kirjautuminen epäonnistui!<br>Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Palvelimen sertifikaatti ei ole kunnossa.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Älä anna poikkeuslupaa jos käytät yhteyttä johon et täysin luota tai palvelin ei ole aiemmin antanut samaa virheilmoitusta.</p></translation>
     </message>
@@ -1142,119 +1147,124 @@ Julkinen avain: </translation>
         <translation type="obsolete">Turvallisen yhteyden avaus epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation>Turvallisuuden takia, yhteyden avaus keskeytetään.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation>Palvelimen tunnistusavainta ei löydy mutta toisenlainen löytyy. Hyökkääjä on ehkä vaihtanut oletusavaimen uskotallakseen asiakasohjelmallesi että avainta ei vielä ole.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Tunnettujen palvelinten nimitiedostoa ei löydy.Jos hyväksyt palvelimen tunnistusavaimen, nimitiedosto luodaan automaattisesti.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation>Palvelimen avaimen tarkistus epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation>Tunnistautuminen epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation>Kirjatuminen epäonnistui!<br>Yritä uudelleen.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation>Suojatun yhteyden avaus epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Annettu:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organisaatio(O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisaatioyksikkö(OU))	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Sarjanumero	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Myöntäjä:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Voimassaolo:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Myöntöpäivä	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>vanhenee	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Tiivisteet:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>Sulje X2Go-ohjelma</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Lisää poikkeus</translation>
     </message>
@@ -1355,8 +1365,8 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete">Käynnistää x2go-asiakasohjelman...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>fi</translation>
     </message>
@@ -1365,34 +1375,34 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>yhdistää</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Web-selain</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>Sähköpostiohjelma</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Pääte</translation>
     </message>
@@ -1401,12 +1411,12 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete">Käynnistää x2go-asiakasohjelman mobiiliversion...datakansio on:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Asetukset...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Neuvonta...</translation>
     </message>
@@ -1419,13 +1429,13 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete">Käynnistetty   x2go-asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>Kääntäjän käynnistys ei onnistu: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Kääntäjä: </translation>
     </message>
@@ -1434,78 +1444,71 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete"> asennettu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Jaa kansio...</translation>
+        <translation type="vanished">Jaa kansio...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Sovellukset...</translation>
+        <translation type="vanished">Sovellukset...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Pysäytä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Uusi yhteys</translation>
+        <translation type="vanished">Uusi yhteys</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>Siirrä X2Go-ikkunaa</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Minimoi toimintopalkki</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Istunto:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Lopeta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Uusi istunto...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1514,7 +1517,7 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete">Istunnon hallinta...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1531,13 +1534,13 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete">&Yhteystesti...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Näytä toimintopalkki</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Tietoja Qt:stä</translation>
     </message>
@@ -1552,24 +1555,24 @@ Päivitä PulseAudioon.</translation>
         <translation>X2Go-yhteysohjelma %1 käynnistyy...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation>X2Go-yhteysohjelma käynnistyy siirrettävässä moodissa. Datahakemisto on: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation>Tietoja X2Go-yhteysohjelmasta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation>X2Go-ohjelma käynnistyi.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation> löytyi.</translation>
     </message>
@@ -1578,244 +1581,248 @@ Päivitä PulseAudioon.</translation>
         <translation type="obsolete">English language requested, not loading translator.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation>Ei vakavaa: kielenvaihtaja ei käynnisty: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation>Yrittää käynnistää toissijaisen kielen tiedostot, jos saatavilla.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation>Istunnon hallinta ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation>&Luo istuntokuvake työpöydälle ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation>&Aseta istuntohallinnan salasana ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation>&Yhteystesti ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Istunto</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Valinnat</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Apua</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Kirjaudu:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Toiminto epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Salasana vaihdettu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Väärä salasana!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Yhdistää brokeriin</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentikointi</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Palauta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>Ei yhteyttä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Ääni ja video</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Ohjelmakehitys</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Ohjeet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Peli</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Grafiikka</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Toimisto</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Työkalu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Muuta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation>Jaa kansio ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation>Vasen klikkaus piilottaa tai palauttaa ikkunan. Oikea klikkaus näyttää toimintovalikon.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation>Suljetaan X2Go-asiakasohjelma ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation>X2Go yhteysohjelman sulkeminen valmis.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation>Istuntohallinnan tunnistautuminen epäonnistui!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation>X2Go-palvelinta ei löydy LDAP-rekisteristä </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation>Yhteydenottovirhe: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation>SSH-yhteyttä ei löytynyt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -1828,17 +1835,17 @@ Halutako katkaista yhteyden?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation>Palvelimen avaimen tarkistus epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -1849,65 +1856,65 @@ Halutako keskeyttää?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Tunnettujen palvelinten sijaintitiedostoa ei löydy.Jos hyväksyt palvelimen tunnistusavaimen, puuttuva tiedosto perustetaan automaattisesti.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation>Autentkointi epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation>XDM</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation>RDP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation><b>Yhteys katksesi.</b>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation>Palvelinta ei löydy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation>Palvelimeen ei pääse.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation>Toimivaa työpöytää ei löydy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation>Värikartta poikkaa istunnon kartasta. Se voi aiheuttaa ongellmia ja useimmiten <b>istunto katkeaa</b> ja joudut aloittamaan alusta! </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation>RDP tai XDMCP-clientin käynnistys epäonnistui</translation>
     </message>
@@ -1924,7 +1931,7 @@ Halutako keskeyttää?
         <translation type="obsolete">Värikartta poikkaa istunnon kartasta. Se voi aiheuttaa ongellmia ja useimmiten <b>istunto katkeaa</b> ja joudut aloittamaan alusta! </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation>
@@ -1933,102 +1940,102 @@ Halutako keskeyttää?
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation><br />Haluatko kuitenkin jatkaa tätä istunoa?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation>PulseAudio ei ole käynnissä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation>Mikrofonin on pois käytöstä tässä istunnossa. Voit käynnistää PulseAudion asetusvalikossa tai mykistää mikrofonin</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation>SSH-tunnelin avaus epäonnistui X2Go istuntoa varten / (NX) startup:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation>SSH-tunnelin avaus audiodataa varten epäonnistui:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation>ei käynnistynyt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation>Johtuu ilmeisesti siitä että ohjelma ei ole käytettävissä.
 Nykyinen hakupolku on: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation>palautti nollasta poikkeavan paluukoodin tai kaatui jotenkin muuten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation>Suoritus epäonnistui, paluukoodi oli: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation>ei käynnistynyt ajoissa.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation>Tätä virhettä ei pitäsi tapahtua.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation>kirjoittaminen oli estetty.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation>Joke ei toimi oikein tai kaatui aiemmin.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation>Ei pysty lukemaan xmodmap-ista.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation>tunnistamaton virhe käynnistymisen tai suorituksen aikana.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation>tunnistamaton virhe.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
@@ -2041,37 +2048,37 @@ Lähetä virheraportti kuten ohjeistettu sivulla <a href="http://wiki.x2
         <translation type="obsolete">RDP tai XMDCP-clientin käynnistys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation>Tarkista istunnon asetukset ja varmista että client-ohjelma on asennettu työasemaasi.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation>Välityspalvelin ei sulkeutunut kolmessa sekunnissa. Se tapetaan.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation>Suljetaan X2Go-asiakasohjelma koska oli käynnistetty piilomoodissa.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation>X2Go-asiakasohjelma suljetaan koska --close-disconnect parametri oli annettu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation>Haluatko varmati sulkea tämän istunnon?
 Tallentamattomat tiedot katoavat.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
@@ -2080,102 +2087,130 @@ Tallentamattomat tiedot katoavat.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation> (tiedostoa ei ole)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation> (polkua ei ole)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation>Virheellinen arvo ohjaimella "--link".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation>Virheellinen arvo ohjaimella "--clipboard".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation>Virheellinen arvo ohjaimella "--sound".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation>Virheellien arvo ohjaimella "--geometry".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation>Virheellinen arvo ohjaimella "--set-kbd".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation>Virheellinen arvo ohjaimella "--ldap".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation>Virheellinen arvo ohjaimella "--ldap1".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation>Virheellinen arvo ohjaimella "--ldap2".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation>Virheellinen arvo ohjaimella "--pack".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br>
 Suomenkielinen versio: Martti Pitkänen, martti at aplcomp.fi<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation>Ei pysty luomaan eikä lisäämäään tiedostoon: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation>Tiedoston käyttöoikeuksien muutos ei onnistu: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation>Tämä on virhe koska sshd kieltäisi tällaisen tiedoston.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation>Hakemiston oikeuksien muutos ei onnistu: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation>Tämä on virhe koska sshd kieltäisi tällaisen hakemiston.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation>Sftp palvelinohjelmaa ei löydy. Ei sisäänrakennettua versiota, eikä löydy $PATH muuttujan avullakaan.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2188,82 +2223,82 @@ Jos sftp-server on asennettu järjestelmääsi, raportoi virheestä ja ilmoita m
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation>SSH avaintyypin valintavirhe</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation>Tunnistamanton SSH avain valittu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation>Sovellus suljetaan.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation>SSH-avaimen kotihakemistoa ei pystytty luomaan</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation>Ei pystytty luomaan SSH avaimen kotihakemistoa '%1'.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation>ssh-keygen ei käynnisty</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation>Ei pystytty käynnistämään ssh-keygen ohjelmaa.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation>ssk-keygen kaatui</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation>ssh-keygen ohjelma kaatui.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation>ssh-keygen ohjelmassa oli virhe</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation>ssh-keygen ohjelma ei sulkeutunut oikein.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation>Sitä oli mahdollsesti käytetty väärillä argumenteilla.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation>Ei pysty avaamaan juuri generoitua %1 public host key tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation>%1 public host key tiedosto on tyhjä.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2276,7 +2311,7 @@ Nämä toiminnot vaativat että työasemassasi on käynnissä SSH server.
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2287,7 +2322,7 @@ Jos näet tämän iilmoituksen, ilmoita virheestä:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2298,15 +2333,15 @@ Ilmoita virheestä:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2317,7 +2352,7 @@ Jos näet tämän viestin ilmoita virheestä:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2328,19 +2363,19 @@ Ilmoita virheesta:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation>SSH prosessi ei pystynyt avaamaan sovelluksen
 authorized_keys-tiedostoa.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation>libssh käynistys epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation>Libssh ei käynnisty.</translation>
     </message>
@@ -2357,9 +2392,9 @@ authorized_keys-tiedostoa.</translation>
         <translation type="obsolete">X2Go-asiakasohjelman sulkeutui.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Tarkista LDAP-asetukset</translation>
     </message>
@@ -2388,7 +2423,7 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
         <translation type="obsolete">Linkki X2Go -istuntoon </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>X2Go-istuntoa ei löytynyt, sulkeutuu.</translation>
     </message>
@@ -2397,41 +2432,40 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
         <translation type="obsolete">Haluatko varmasti poistaa tämän istunnon?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP-yhteys</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Yhteys paikalliselle näytölle</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> käyttäen </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Käynnistää yhteyden palvelimeen: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation> kohteeseen </translation>
+        <translation type="vanished"> kohteeseen </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -2442,12 +2476,12 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
         <translation type="obsolete">Ei löydä SSH-yhteyttä.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anna avaimen salasana</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Palvelimen avain vaihtui.
@@ -2466,7 +2500,7 @@ Se on nyt: </translation>
         <translation type="obsolete">Tunnettut työasemat sisältävää tiedostoa ei ole. Jos hyväksyt yhteyden, kyseinen tiedosto luodaan</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Palvelin on tuntematon. Luotatko sen avaimeen?
@@ -2481,7 +2515,7 @@ Avaimen tiiviste: </translation>
         <translation type="obsolete">Näytä istunon ikoni kun se on aktiivinen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Tarkistenumero:</translation>
     </message>
@@ -2496,18 +2530,18 @@ Turvallisuuden takia on syytä katkaista yhteys.
 Halutko katkaista?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Jos hyväksyt uuden palvelinavaimen yhteytesti turvallisuus saattaa vaarantua.
@@ -2523,7 +2557,7 @@ Turvallisuuden takia on syytä katkaista yhteys.
 Haluatko katkaista?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Autentikointi epäonnistui: </translation>
     </message>
@@ -2532,7 +2566,7 @@ Haluatko katkaista?</translation>
         <translation type="obsolete">Autentikointi epäonnistui</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Anna salasana SSH-proxya varten</translation>
     </message>
@@ -2542,37 +2576,37 @@ Haluatko katkaista?</translation>
         <translation type="obsolete"><b>Yhteydenotto epäonnistui</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Väärä salasana!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Yhteys epäonnistui: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation> - Väärä salasana.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
@@ -2587,41 +2621,41 @@ Haluatko katkaista?</translation>
         <translation type="obsolete">Palvelinta ei saatavilla</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Valitse istunto:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>käynnissä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>pysäytetty</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Työpöytä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>erillinen sovellus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>varjoistunto</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Tietoja</translation>
     </message>
@@ -2630,20 +2664,20 @@ Haluatko katkaista?</translation>
         <translation type="obsolete">Työpöytää ei ole käytettävissä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Valinta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Valitse työpöytä:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
@@ -2661,47 +2695,47 @@ Haluatko katkaista?</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>pysäyttää</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>lopettaa</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Väärä salasana!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Uusi istunto käynnistyi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Istuntoa jatkettu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Kansion luonti ei onnistu: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Tiedostoon kirjoitus ei onnistu: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>Kytkeydy X2Go-ikkunaan</translation>
     </message>
@@ -2716,12 +2750,12 @@ Haluatko katkaista?</translation>
         <translation type="obsolete">SSL-tunnelin avaus ei onnistu:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Hätäkeskeytys.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Odottaa välityspalvelimen sulkeutumista.</translation>
     </message>
@@ -2730,29 +2764,29 @@ Haluatko katkaista?</translation>
         <translation type="obsolete">Epäonnistui, sulkee proxyn</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>Lopetettu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>käynnistyy</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>jatkaa</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Yhteys aikakatkaistu, keskeytyy</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>keskeytyy</translation>
     </message>
@@ -2763,20 +2797,20 @@ Unsaved documents will be lost</source>
 Avoimet tiedostot eivät talletu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Istunto</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Näyttö</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Luontiaika</translation>
     </message>
@@ -2788,7 +2822,7 @@ Avoimet tiedostot eivät talletu</translation>
 :</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (tiedosto ei aukea)</translation>
     </message>
@@ -2837,40 +2871,40 @@ Avoimet tiedostot eivät talletu</translation>
         <translation type="obsolete">Ohjaimella "--pack" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Väärä parametri: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Ohjeet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation>Valitavissa on nämä pakkausmenetelmät:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation>Pakkausmenetelmät</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation>Vaihtoehtoa ei ole tässä versiossa.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation>Hakemiston luonti ei onnistu:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation>Avaimen haku ei onnistu: </translation>
     </message>
@@ -2880,77 +2914,73 @@ Avoimet tiedostot eivät talletu</translation>
 Suomenkielinen versio: Martti Pitkänen, martti at aplcomp.fi<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>X2Go Plugin moodin sponsori <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
+        <translation type="vanished"><br>X2Go Plugin moodin sponsori <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation><br>Täällä asiakasohjelmalla voidaan kirjautua X2Go-palvelimeen ja käynnistää, pysäytää, jatkaa ja lopettaa etätyöpöytä-istuntoja. X2Go-ohjelma tallettaa kaikki yhteysasetukset ja se voi automaattisesti hakea tiedot autentikointia varten LDAP-hakemistoista. Lisäksi sitä voidaan käyttää kokotuutu-pohjaisen kirjautumisnäyttönä (korvaten login-managerin kuten esim. XDM). Sivulta <a href="http://www.x2go.org">x2go.org-projektin kotisivu</a> lö [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation><b>X2Go-asiakasohjelma v. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation>Tarkisa LDAP-asetukset.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Tarkista onko paketti joka sisältää ohjelman "scdaemon" asennettu.
+        <translation type="vanished">Tarkista onko paketti joka sisältää ohjelman "scdaemon" asennettu.
 Hakupolku on: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation>ei käynnistynyt vielä.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation>Ei vastausta ohjelmasta scdaemon.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation>Toimivaa kortta ei löytynyt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation>Tämä kortti ei toimi X2Go-järjestelmässä.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation>X.Org-ohjelma ei käynnisty.
 Tarkista installointi.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation>Etäpalvelin ei tue SSH-tunneloinnin kautta tapahtuvaa levyjakoa.
 Päivitä x2goserver paketti.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation>SSH-tunnelin luonti levyjakoa ja tulostusta varten ei onnistu:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation>Luku ei onnistu:
@@ -2963,22 +2993,22 @@ Päivitä x2goserver paketti.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation>Näytön geometrian luku ei onnistu. (Suljitko ikkunan?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation>Virheellinen arvo ohjaimella "speed"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation>Sovellukset ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
@@ -3067,13 +3097,13 @@ Lähetä virheraportti käyttäen:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation>Jos poistat etätulostuksen tai levyjaon istunnon asetuksista pääset eroon tästä ilmoituksesta.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation>SSH-prosessi ei pystynyt lukemaan omaa julkista avaintaan.</translation>
     </message>
@@ -3140,8 +3170,8 @@ Voit tehdä sen itse komennolla:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>SSH-virhe</translation>
     </message>
@@ -3184,7 +3214,7 @@ Pyydä IT -tukihenkilöä asentamaan SSH
         <translation type="obsolete">SSH -palvelu ei pystynyt selvittämään sovelluspalvelimen julkista avainta.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>SSH-palvelu ei pystynyt selvittämään sovelluksen julkista avainta
@@ -3213,12 +3243,12 @@ authoized_keys -tiedostoa.</translation>
         <translation type="obsolete">Vaihtoehtoa ei tässä versiossa</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Muutosluettelo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Git-tietoja</translation>
     </message>
@@ -3235,7 +3265,7 @@ authoized_keys -tiedostoa.</translation>
         <translation type="obsolete">Avaimen käyttöönotto ei onnistu:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Neuvonta</translation>
     </message>
@@ -3264,7 +3294,7 @@ authoized_keys -tiedostoa.</translation>
         <translation type="obsolete">Toimikortti puuttuu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Toimikortin asetukset puuttuvat.</translation>
     </message>
@@ -3273,9 +3303,8 @@ authoized_keys -tiedostoa.</translation>
         <translation type="obsolete">X2Go ei tunnista korttia</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Tiedoston luonti epäonnistui: </translation>
+        <translation type="vanished">Tiedoston luonti epäonnistui: </translation>
     </message>
     <message>
         <source>Can't connect to X server
@@ -3296,8 +3325,8 @@ Please check your installation</source>
 Tarkista asennuksen oikeellisuus</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Kännistys ei onnistu: </translation>
     </message>
@@ -3318,12 +3347,12 @@ Päivitä x2goserver palvelinohjelma</translation>
         <translation type="obsolete">Kirjoittaminen ei onnistu :</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3332,7 +3361,7 @@ Päivitä x2goserver palvelinohjelma</translation>
         <translation type="obsolete">Ikkunoinnin asetusten luku ei onnistu (ikkuna suljettu)?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go Istunto</translation>
     </message>
@@ -3341,99 +3370,99 @@ Päivitä x2goserver palvelinohjelma</translation>
         <translation type="obsolete">"speed" -astuksella on virheellinen arvo</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Salasana:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Näppäimistön tyyppi:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>Istunnon ID:<br>Palvelin:<br>Käyttäjätunnus:<br>Näyttö:<br>Luontiaika:<br>Tila:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Keskeytä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Näytä yksityiskohdat</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Jatka</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Kaikki oikeudet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Vain katselu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Komento</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Palvelin</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>Asiakasohjelman IP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>Isunnon ID</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Käyttäjä</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Vain omat työpöydät</translation>
     </message>
@@ -3446,12 +3475,12 @@ voit asentaa sshd komennolla
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Palauta toimintopalkki</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Klikkaa tätä nappulaa&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;jotta palkki näkyisi jälleen&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3705,7 +3734,7 @@ Esimerkki:
         <translation>getcwd() kaatui!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation>PulseAudio ei käynnistynyt!</translation>
     </message>
@@ -3722,75 +3751,75 @@ Jos latasit paketista, valmiin version viralliselta kotisivulat, ilmoita virhees
 </translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation>PulseAudion versionumeron luku ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation>Tunnistamaton merkki esti versionumeron lukemisen</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation>Tunnistamaton merkki esti versionumeron jälkiosan lukemisen</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation>Tunnistamaton merkki esti versionumeron lukemisen loppuun saakka</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation>Versionumerosta luettiin vain alkuosa.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation>Versiotietoa ei voitu muuttaa numeeriseksi.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation>Versionumeron loppuosaa ei voitu muuttaa numeeriseksi.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation>Version viimeistä osaa ei voitu muuttaa numeeriseksi.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation>Virheellinen muoto.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation>PulseAudio ei käynnisty.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation>Käynnistysääni ei toimi.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation>Äänen käyttö ei ole mahdollista.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3884,127 +3913,127 @@ tai
         <translation type="obsolete">Tee istunnosta ikoni työpöydällesi...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation>Istunnon oletusarvot ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation>Tee istuntokuvake työpöydälle ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Poista istunto</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Istunnon toiminnot</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Valitse tyyppi</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Valitse tarkkuus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Äänen päälleasetus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Uusi istunto</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>suorittaa</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>pysäytetty</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP-yhteys</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Yhteys palvelimen omaan näyttöön</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Julkaistut sovellukset</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>koko näyttö</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Näyttö </translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>ikkuna</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Maksimi</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>Päällä</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>Pois päältä</translation>
     </message>
@@ -4147,7 +4176,7 @@ Käytätkö X2Go-ohjelmaa piilomoodissa?</translation>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH-portti:</translation>
     </message>
@@ -4217,25 +4246,25 @@ Käytätkö X2Go-ohjelmaa piilomoodissa?</translation>
         <translation>SSH-agentti tai oletus-SSH-avain</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation>Yhistä Windows Terminal Serveriin</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation>Suora RDP-yhteys</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation>X2Go-yhteysohjelma tomii nyt siirrettävässä moodissa. Sinun pitää käyttää USB-laitteesi polkua jotta pääset käsiksi tietoihisi missä oletkin.</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation>Suora XDMCP yhteys</translation>
     </message>
@@ -4268,46 +4297,46 @@ Käytätkö X2Go-ohjelmaa piilomoodissa?</translation>
         <translation type="obsolete">Yhdista Windows terminal serveriin</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Yhdistä palvelimen omaan näyttöön</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Muokattu työpöytä</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Erillinen sovellus</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Julkaistut sovellukset</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Komento:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Edistyneet toiminnot...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Ohjelman hakupolku</translation>
     </message>
@@ -4316,20 +4345,20 @@ Käytätkö X2Go-ohjelmaa piilomoodissa?</translation>
         <translation type="obsolete">Suora RPP-yhteys</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Lue avain-tiedosto</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
@@ -4338,45 +4367,45 @@ Käytätkö X2Go-ohjelmaa piilomoodissa?</translation>
         <translation type="obsolete">x2go-asiakasohjelma on siirrettävässä moodissa. Käytä usb-laiteen hakupolkua jotta pääset joka paikasta käsiksi omiin tietoihisi</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP-portti:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Avaa kuva</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Kivat</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Palvelin:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP-palvelin:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation>suora XDMCP yhteys</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop-komentorivin optiot:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Uusi istunto</translation>
     </message>
@@ -4585,7 +4614,7 @@ sound system connections through firewalls</source>
         <translation>XDMCP asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>fi</translation>
     </message>
@@ -4594,8 +4623,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>salasana</translation>
     </message>
@@ -4717,9 +4746,9 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation>SSH-istunnon luonti epäonnistui.</translation>
     </message>
@@ -4729,57 +4758,57 @@ sound system connections through firewalls</source>
         <translation>Käyttäjätunnuksen mukaiset asetukset ovat käytössä.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation>Ei yhteyttä välityspalvelimeen.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation>Autentikointi epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation>SSH-asiakasohjelma ei käynnisty. Tarkista asennukset ja GSSApi configurointi.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation>Tarkista GSSApi-asetukset tai valitse toinen autentikointimentelmä.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation>Jatka istuntoa</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation>Tiedosto ei avaudu </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation>Tiedosto luonti palvelimeen ei onnistu </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation>Kirjoittaminen palvelimen tiedostoon ei onnistu </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>%1 epäonnistui.</translation>
@@ -4793,12 +4822,12 @@ sound system connections through firewalls</source>
         <translation type="obsolete">channel_open_session epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation>Sokettiin kirjoitus epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation>Kanavan luku epäonnistui.</translation>
     </message>
@@ -4807,7 +4836,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">channel_write epäonnistui.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation>TCP-soketin luku epäonnistui.</translation>
     </message>
@@ -4861,7 +4890,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>yhteys ei avaudu tähän kohteeseen </translation>
     </message>
diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts
index 0e10698..bdc6617 100644
--- a/res/i18n/x2goclient_fr.ts
+++ b/res/i18n/x2goclient_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="fr">
+<TS version="2.1" language="fr">
 <context>
     <name>AppDialog</name>
     <message>
@@ -852,6 +852,10 @@ Vous la trouverez peut-être dans l'un de ces emplacements standards :
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Utilise un icône personnalité (au format SVG) pour marquage additionnel pour remplacer l'original dans le coin inférieur gauche de la fenêtre principale de X2Go Client.</translation>
     </message>
+    <message>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HelpDialog</name>
@@ -1017,6 +1021,10 @@ Public key hash: </source>
         <source>Secure connection failed.</source>
         <translation>Echec de la connection sécurisée.</translation>
     </message>
+    <message>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InteractionDialog</name>
@@ -1138,7 +1146,7 @@ Veuillez passer à PulseAudio.</translation>
     </message>
     <message>
         <source>Share folder...</source>
-        <translation>Partager le dossier...</translation>
+        <translation type="vanished">Partager le dossier...</translation>
     </message>
     <message>
         <source>Suspend</source>
@@ -1150,7 +1158,7 @@ Veuillez passer à PulseAudio.</translation>
     </message>
     <message>
         <source>Reconnect</source>
-        <translation>Reconnecter</translation>
+        <translation type="vanished">Reconnecter</translation>
     </message>
     <message>
         <source>Detach X2Go window</source>
@@ -1558,7 +1566,7 @@ Hash de la clef publique : </translation>
     </message>
     <message>
         <source>Unable to create file: </source>
-        <translation>Impossible de créer le fichier : </translation>
+        <translation type="vanished">Impossible de créer le fichier : </translation>
     </message>
     <message>
         <source>Unable to execute: </source>
@@ -1590,7 +1598,7 @@ Hash de la clef publique : </translation>
     </message>
     <message>
         <source>Applications...</source>
-        <translation>Applications...</translation>
+        <translation type="vanished">Applications...</translation>
     </message>
     <message>
         <source>Abort</source>
@@ -1686,7 +1694,7 @@ Hash de la clef publique : </translation>
     </message>
     <message>
         <source> to </source>
-        <translation> vers </translation>
+        <translation type="vanished"> vers </translation>
     </message>
     <message>
         <source>Authentication failed: </source>
@@ -2072,7 +2080,7 @@ Les documents qui n'ont pas été sauvegardés seront perdus.</translation>
     </message>
     <message>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>le mode X2Go Plugin a été sponsorisé par <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
+        <translation type="vanished"><br>le mode X2Go Plugin a été sponsorisé par <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
     </message>
     <message>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
@@ -2089,7 +2097,7 @@ Les documents qui n'ont pas été sauvegardés seront perdus.</translation>
     <message>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Vérifiez si le paquet qui fournit "scdaemon" est installé.
+        <translation type="vanished">Vérifiez si le paquet qui fournit "scdaemon" est installé.
 Le chemin de recherche en vigueur est : </translation>
     </message>
     <message>
@@ -2511,6 +2519,31 @@ Veuillez rapporter le bug sur :
         <source>Unable to initialize libssh.</source>
         <translation>Impossible d'initialiser libssh.</translation>
     </message>
+    <message>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
diff --git a/res/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts
index 672bb0b..d1a7b24 100644
--- a/res/i18n/x2goclient_nb_no.ts
+++ b/res/i18n/x2goclient_nb_no.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="nb_NO">
+<TS version="2.1" language="nb_NO">
 <context>
     <name>AppDialog</name>
     <message>
@@ -867,6 +867,10 @@ Noen vanlige lokasjoner er:
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Bruk et eget ikon (SVG format) for egenreklame, bytter ut ikonet som er nede i venstre hjørne i X2Go klienten sitt hovedvindu.</translation>
     </message>
+    <message>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HelpDialog</name>
@@ -1049,6 +1053,10 @@ Offentlig nøkkel: </translation>
         <source>Secure connection failed.</source>
         <translation>Sikker tilkobling feilet.</translation>
     </message>
+    <message>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InteractionDialog</name>
@@ -1303,7 +1311,7 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>Applications...</source>
-        <translation>Applikasjoner...</translation>
+        <translation type="vanished">Applikasjoner...</translation>
     </message>
     <message>
         <source>Invalid reply from broker</source>
@@ -1597,7 +1605,7 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>Unable to create file: </source>
-        <translation>Klarer ikke å opprette filen: </translation>
+        <translation type="vanished">Klarer ikke å opprette filen: </translation>
     </message>
     <message>
         <source>No valid card found</source>
@@ -1785,7 +1793,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source> to </source>
-        <translation> til </translation>
+        <translation type="vanished"> til </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -1863,7 +1871,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Share folder...</source>
-        <translation>Del mappe...</translation>
+        <translation type="vanished">Del mappe...</translation>
     </message>
     <message>
         <source>Show details</source>
@@ -2123,7 +2131,7 @@ Du kan installere sshd med:
     </message>
     <message>
         <source>Reconnect</source>
-        <translation>Gjenoppkoble</translation>
+        <translation type="vanished">Gjenoppkoble</translation>
     </message>
     <message>
         <source>Connecting to broker</source>
@@ -2533,7 +2541,7 @@ Ulagrede data vil gå tapt.</translation>
     </message>
     <message>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>X2Go plugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
+        <translation type="vanished"><br>X2Go plugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
     </message>
     <message>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
@@ -2550,7 +2558,7 @@ Ulagrede data vil gå tapt.</translation>
     <message>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Sjekk om pakken som tilbyr "scdaemon" er installert.
+        <translation type="vanished">Sjekk om pakken som tilbyr "scdaemon" er installert.
 Søkebanen som er i bruk er: </translation>
     </message>
     <message>
@@ -2983,6 +2991,31 @@ Rapporter dette som en feil på:
         <source>Unable to initialize libssh.</source>
         <translation>Kunne ikke starte libssh.</translation>
     </message>
+    <message>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>PrintDialog</name>
diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts
index 85cefbb..51c4e4c 100644
--- a/res/i18n/x2goclient_nl.ts
+++ b/res/i18n/x2goclient_nl.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="nl_NL">
+<TS version="2.1" language="nl_NL">
 <context>
     <name>AppDialog</name>
     <message>
@@ -272,73 +272,73 @@
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Icoon in taakbalk weergeven</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>In taakbalk weergeven indien geminimaliseerd</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>In taakbalk weergeven indien gesloten</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>In taakbalk weergeven nadat verbinding tot stand gekomen is</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Vanaf taakbalk herstellen nadat sessie is verbroken</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Gebruik LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BasisDN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>Failover server 1 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>Failover server 2 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation>X.Org Server instellingen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation>PulseAudio instellingen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation>PulseAudio uitschakelen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation>Geluids invoer uitschakelen</translation>
     </message>
@@ -359,17 +359,17 @@
         <translation type="obsolete"><font size="5">U moet de X2Go client herstarten om de wijzigingen door te voeren</font><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation>Uw XQuartz versie is te oud.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation>U gebruikt de XQuartz (X-Window Server voor OS X) versie %1.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -390,12 +390,12 @@ kunnen de nieuwste versie downloaden via:
 <center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation>Geen geschikte XQuartz applicatie geselecteerd.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -416,17 +416,17 @@ Locaties voor installatie kunnen de volgende zijn:
         <translation type="obsolete">X-server instellingen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11 applicatie:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11 versie:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>X11 applicatie zoeken</translation>
     </message>
@@ -435,39 +435,39 @@ Locaties voor installatie kunnen de volgende zijn:
         <translation type="obsolete">Client SSH poort voor exporteren besstandssysteem:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Sessie starten ingesloten binnen website</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Uitgebreide opties</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Standaard</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>&Annuleren</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Printen</translation>
     </message>
@@ -493,17 +493,17 @@ Locaties voor installatie kunnen de volgende zijn:
         <translation type="obsolete">Geen geschikte X11 applicatie gevonden in geselecteerde pad</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Verbinding</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Media</translation>
     </message>
@@ -661,7 +661,7 @@ Locaties voor installatie kunnen de volgende zijn:
         <translation>Standaarden</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Sessie voorkeuren - </translation>
     </message>
@@ -1040,11 +1040,16 @@ Locaties voor installatie kunnen de volgende zijn:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="163"/>
         <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
         <translation>Gebruik een eigen achtergrondafbeelding (SVG formaat) voor het hoofdvenster van de X2Go Client. Als een directory is opgegeven, zal een willekeurig bestand gekozen worden.</translation>
     </message>
     <message>
-        <location filename="../../src/help.cpp" line="163"/>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Gebruik een eigen icoon (SVG formaat) voor het personaliseren en ter vervanging van het standaard icoon links onderin het hoofdvenster van de X2Go Client.</translation>
     </message>
@@ -1060,7 +1065,7 @@ Locaties voor installatie kunnen de volgende zijn:
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host sleutel van server aangepast.
@@ -1080,7 +1085,7 @@ serversleutel aangepast en wil uw client misleiden door deze te laten geloven da
         <translation type="obsolete">Kon het known host bestand niet vinden. Als u deze sleutel accepteert zal het bestand automatisch aangemaakt worden</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Deze server is onbekend. Wilt u deze host sleutel vertrouwen?
@@ -1091,22 +1096,22 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Verificatie van host sleutel mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Verificatiecode:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Ingeven wachtwoordzin om een sleutel te decoderen</translation>
     </message>
@@ -1115,12 +1120,12 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Authenticatie mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
@@ -1129,12 +1134,12 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Inloggen mislukt!<br>Opnieuw proberen aub</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Server gebruikt een ongeldig veiligheidscertificaat.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>U moet geen uitzondering toevoegen wanneer u een internetverbinding gebruikt die u niet geheel kunt vertrouwen, of wanneer u niet gewend bent om een waarschuwing te krijgen vanaf deze server.</p></translation>
     </message>
@@ -1143,119 +1148,124 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Veilige verbinding mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation>Vanwege veiligheidsredenen zal deze verbinding verbroken worden.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation>De host sleutel voor deze server is niet gevonden maar een ander type sleutel is aanwezig. Een aanvaller heeft mogelijk de standaard serversleutel aangepast en wil uw client misleiden door deze te laten geloven dat de sleutel niet bestaat.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Kon het known host bestand niet vinden. Als u deze sleutel accepteert zal het bestand automatisch aangemaakt worden.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation>Verificatie van host sleutel mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation>Authenticatie mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation>Inloggen mislukt!<br>Opnieuw proberen aub.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation>Veilige verbinding mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Uitgegeven aan:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organisatie(O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisatie eenheid(OU)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Serienummer	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Uitgegeven door:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Geldigheid:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Uitgegeven op	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>Verloopt op	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Vingerafdruk:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>Afsluiten X2Go Client</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Uitzondering toevoegen</translation>
     </message>
@@ -1356,40 +1366,40 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation type="obsolete">X2Goclient wordt gestart...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>us</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go Client</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>verbinden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Internetbrowser</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>Email client</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
@@ -1398,12 +1408,12 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation type="obsolete">x2goclient wordt gestart in portable modus... data directory is:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Instellingen ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Ondersteuning...</translation>
     </message>
@@ -1416,13 +1426,13 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation type="obsolete">Gestart  x2goclient.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>Kan vertaler niet laden:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Vertaler:</translation>
     </message>
@@ -1431,78 +1441,71 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation type="obsolete"> geïnstalleerd.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Gedeelde map...</translation>
+        <translation type="vanished">Gedeelde map...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Applicaties...</translation>
+        <translation type="vanished">Applicaties...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Onderbreken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Beëindigen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Opnieuw verbinden</translation>
+        <translation type="vanished">Opnieuw verbinden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>X2Go scherm losmaken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Taakbalk minimaliseren</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Sessie:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Afsluiten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Nieuwe sessie ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1511,7 +1514,7 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation type="obsolete">Sessiebeheer...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1528,13 +1531,13 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation type="obsolete">&Verbindingstest ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Taakbalk tonen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Over Qt</translation>
     </message>
@@ -1550,24 +1553,24 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation>X2Go Client %1 wordt gestart...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation>X2Go Client wordt gestart in portable modus... data directory is:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation>Over X2Go client</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation>X2Go client gestart.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation> gevonden.</translation>
     </message>
@@ -1576,244 +1579,248 @@ A.u.b upgraden naar PulseAudio.</translation>
         <translation type="obsolete">Engelse taal gekozen, vertaling niet geladen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation>Niet fatale fout: kan vertaling niet laden: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation>Geprobeerd een taal te laden die een lagere prioriteit heeft, indien beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation>Sessiebeheer...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation>&Sessie icoon aanmaken op bureaublad ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation>&Wachtwoord voor broker invoeren ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation>&Verbindingstest ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Sessie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Opties</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Help</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Inloggen:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Bewerking mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Wachtwoord veranderd</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Verkeerd wachtwoord!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Verbinden met broker</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Authenticatie</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Herstellen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>Niet verbonden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Ontwikkeling</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Educatie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Games</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Grafisch</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Gereedschap</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Overige</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation>Gedeelde map...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation>Linker muisknop voor verbergen/herstellen venster. Rechter muisknop om menu te tonen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation>X2Go client sluiten...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation>X2Go client afgesloten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation>Authenticatie met broker mislukt!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation>Geen X2Go server gevonden in LDAP </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation>Verbindingsfout: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation>Kon geen SSH verbinding vinden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -1826,17 +1833,17 @@ Wilt u de verbinding verbreken?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation>Verificatie van host sleutel mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -1847,55 +1854,55 @@ Wilt u de verbinding verbreken?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Kon het known host bestand niet vinden. Als u de host sleutel accepteert zal dit bestand automatisch aangemaakt worden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation>Authenticatie mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation>XDM</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation>RDP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation><b>Verbinding mislukt.</b>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation>Geen server beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation>Geen server beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation>Geen beschikbaar bureaubladomgeving gevonden.</translation>
     </message>
@@ -1908,12 +1915,12 @@ Wilt u de verbinding verbreken?
         <translation type="obsolete"> bits en uw X.Org Server te herstarten voordat u opnieuw verbinding maakt met deze X2Go sessie.<br />Deze sessie toch hervatten?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation>Uw huidige kleurdiepte verschilt van de sessie kleurdiepte. Dit kan problemen veroorzaken bij het opnieuw verbinden met deze sessie. In de meeste gevallen <b>zult u deze sessie verliezen</b> en moet u een nieuwe starten! </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation>
@@ -1922,102 +1929,102 @@ Wilt u de verbinding verbreken?
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation><br />Wilt u deze sessie toch hervatten?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation>PulseAudio is niet actief</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation>Uitvoer van geluid niet beschikbaar voor deze sessie. Activeer a.u.b. PulseAudio in het configuratie dialoogvenster of schakel geluid uit in de sessie instellingen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation>SSH tunnel voor deze X2Go sessie niet mogelijk (NX) startup:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation>Opzetten SSL tunnel niet mogelijk voor audio-data:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation>Starten mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation>Dit komt waarschijnlijk omdat de binary niet beschikbaar is.
 Het huidige pad is: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation>niet geldige exit code gegenereerd.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation>Uitvoeren mislukt, exit code was: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation>niet op tijd gestart.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation>Deze foutmelding zou niet mogen optreden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation>geen schrijf actie verwacht.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation>Draait waarschijnlijk niet correct of is inmiddels gecrashed.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation>Lezen van xmodmap niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation>er is een onbekende fout opgetreden tijdens opstarten of uitvoeren.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation>een onbekende fout is opgetreden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
@@ -2026,42 +2033,42 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
 U kunt deze fout melden zoals beschreven op deze <a href="http://wiki.x2go.org/doku.php/wiki:bugs">wiki pagina</a>.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation>Starten van RDP of XDMCP client mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation>Controleer de sessie instellingen en verzeker u ervan dat de geselecteerde client geïnstalleerd is op uw systeem.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation>Proxy niet afgesloten na 3 seconden. Stoppen van proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation>X2Go client zal worden afgesloten omdat het in de verborgen modus is gestart.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation>X2Go client zal worden afgesloten vanwege disconnect parameter.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation>Weet u zeker dat u deze sessie wilt beëindigen?
 Niet opgeslagen documenten zullen verloren gaan.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
@@ -2070,122 +2077,150 @@ Niet opgeslagen documenten zullen verloren gaan.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation> (bestand bestaat niet)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation> (directory bestaat niet)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation>Ongeldige waarde voor parameter "--link".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation>Ongeldige waarde voor parameter "--klembord".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation>Ongeldige waarde voor parameter "--geluid".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation>Ongeldige waarde voor parameter "--geometry".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation>Ongeldige waarde voor parameter "--set-kbd".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation>verkeerde waarde voor parameter "--ldap".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation>Ongeldige waarde voor parameter "--ldap1".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation>Ongeldige waarde voor parameter "--ldap2".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation>Ongeldige waarde voor parameter "--pack".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation>Beschikbare pack methodes:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation>Pack methodes</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation>Optie is niet beschikbaar in dit pakket.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation><br>Client voor gebruik van de X2Go netwerkgebasseerde computeromgeving. Met deze client maakt u verbinding met de X2Go server(s) en kunt u desktop-sessies starten, stoppen, hervatten en (actieve sessies) beeindigen. De X2Go Client slaat verschillende serververbindingen op in, en kan automatisch authenticatie data opvragen van, LDAP directories. Verder kan de client gebruikt worden als fullscreen inlog scherm (vervanging voor inlog managers als KDM, XDM etc.).  [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation>Aanmaken of toevoegen van bestand niet mogelijk: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation>Wijzigen van bestandsrechten niet mogeljk: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation>Dit is een fout omdat sshd een dergelijk bestand zou weigeren.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation>Wijzigen van rechten niet mogelijk voor directory: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation>Dit is een fout omdat sshd een dergelijke directory zou weigeren.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation>Kan de sftp-server binary niet vinden. Niet gebundeld, niet gevonden in $PATH of in overige directories.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2198,82 +2233,82 @@ Als de sftp-server binary wel is geïnstalleerd op uw systeem, geef dan aub een
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation>SSH sleutel type selectie fout</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation>Onbekende SSH sleutel geselecteerd.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation>Applicatie beëindigen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation>Aanmaken van SSH sleutel directory is mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation>Aanmaken van directory '%1' voor SSH sleutel niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation>Fout bij aanmaken ssh-keygen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation>Starten van ssh-keygen binary niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation>ssh-keygen gebroken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation>De ssh-keygen binary is gebroken.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation>ssh-keygen programma fout</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation>De ssh-keygen binary is niet juist afgesloten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation>Het programma is waarschijnlijk aangeroepen met onbekende argumenten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation>Niet mogelijk om de nieuw aangemaakte %1 publieke host sleutel aan te maken.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation>%1 publieke host sleutel bestand leeg.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2286,7 +2321,7 @@ Voor deze opties is het noodzakelijk dat er een SSH server actief is op uw syste
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2297,7 +2332,7 @@ Als u dit bericht ziet wilt u deze foutmelding dan aub kenbaar maken op:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2308,15 +2343,15 @@ Als u dit bericht ziet wilt u deze foutmelding dan aub kenbaar maken op:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2327,7 +2362,7 @@ Als u dit bericht ziet wilt u deze foutmelding dan aub kenbaar maken op:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2338,19 +2373,19 @@ Als u dit bericht ziet wilt u deze foutmelding dan aub kenbaar maken op:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation>SSH daemon kon het geautoriseerde sleutelbestand van
 deze applicatie niet openen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation>libssh initialisatie fout</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation>Initialiseren van libssh niet mogelijk.</translation>
     </message>
@@ -2367,9 +2402,9 @@ deze applicatie niet openen.</translation>
         <translation type="obsolete">x2goclient afgesloten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Controleer aub LDAP instellingen</translation>
     </message>
@@ -2402,7 +2437,7 @@ X2Goclient in verborgen modus gebruiken?</translation>
         <translation type="obsolete">X2Go link naar sessie </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Geen X2Go sessies gevonden, afsluiten.</translation>
     </message>
@@ -2411,41 +2446,40 @@ X2Goclient in verborgen modus gebruiken?</translation>
         <translation type="obsolete">Weet u zeker dat u deze sessie wilt verwijderen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP connectie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Connectie naar lokale desktop</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> aan </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Verbinden met server gestart: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation> naar </translation>
+        <translation type="vanished"> naar </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -2456,17 +2490,17 @@ X2Goclient in verborgen modus gebruiken?</translation>
         <translation type="obsolete">Kon geen SSH verbinding vinden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Verificatie code:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Wachtwoordzin ingeven om sleutel te decoderen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host sleutel voor de server is gewijzigd.
@@ -2488,18 +2522,18 @@ Wilt u de verbinding verbreken?</translation>
         <translation type="obsolete">Verificatie van host sleutel mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Als u de nieuwe host sleutel accepteert kan dit de beveiliging van uw verbinding schaden.
@@ -2520,14 +2554,14 @@ Wilt u de verbinding verbreken?</translation>
         <translation type="obsolete">Kon het known host bestand niet vinden. Als u de host sleutel accepteert zal dit bestand automatisch aangemaakt worden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Deze server is onbekend. Vertrouwt u de host sleutel?
 Publieke sleutel hash: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Authenticatie mislukt: </translation>
     </message>
@@ -2536,7 +2570,7 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Authenticatie mislukt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Wachtwoord ingeven voor SSH proxy</translation>
     </message>
@@ -2547,37 +2581,37 @@ Publieke sleutel hash: </translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Verkeerd wachtwoord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Verbinding mislukt: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation> - Verkeerd wachtwoord.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
@@ -2590,41 +2624,41 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Server niet beschikbaar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Selecteer sessie:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>actief</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>onderbroken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Bureaublad</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>enkele applicatie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>schaduw sessie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
@@ -2633,20 +2667,20 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Geen toegankelijk bureaublad gevonden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Selecteer bureaubladomgeving:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
@@ -2663,47 +2697,47 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">bit en uw X-server te herstarten voordat u opnieuw verbinding maakt met deze x2go sessie.<br>Deze sessie toch hervatten?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>onderbreken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>afsluiten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Verkeerd wachtwoord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Nieuwe sessie gestart</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Sessie hervat</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Aanmaken map niet mogelijk: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Aanmaken bestand niet mogelijk: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>X2Go scherm vastmaken</translation>
     </message>
@@ -2718,13 +2752,13 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Opzetten SSL tunnel niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translatorcomment>?</translatorcomment>
         <translation>Afsluiten bij noodgeval.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Wachten op afsluiten van proxy.</translation>
     </message>
@@ -2733,29 +2767,29 @@ Publieke sleutel hash: </translation>
         <translation type="obsolete">Mislukt, proxy wordt afgebroken.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>starten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>hervatten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Timeout bij verbinding, afbreken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>afbreken</translation>
     </message>
@@ -2766,20 +2800,20 @@ Unsaved documents will be lost</source>
 Niet opgeslagen documenten zullen verloren gaan</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Sessie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Beeldscherm</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Aanmaaktijd</translation>
     </message>
@@ -2792,7 +2826,7 @@ Niet opgeslagen documenten zullen verloren gaan</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (kan bestand niet openen)</translation>
     </message>
@@ -2841,14 +2875,14 @@ Niet opgeslagen documenten zullen verloren gaan</translation>
         <translation type="obsolete">verkeerde waarde voor argument"--pack"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Verkeerde parameter: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
@@ -2866,22 +2900,22 @@ Niet opgeslagen documenten zullen verloren gaan</translation>
         <translation type="obsolete">Optie is niet beschikbaar in deze uitgave</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Logboek met wijzigingen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Git info</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation>Aanmaken map niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation>Kan sleutel niet openen: </translation>
     </message>
@@ -2890,9 +2924,8 @@ Niet opgeslagen documenten zullen verloren gaan</translation>
         <translation type="obsolete"><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>X2Go Plugin mode is gesponsord door <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
+        <translation type="vanished"><br>X2Go Plugin mode is gesponsord door <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
     </message>
     <message>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
@@ -2900,67 +2933,64 @@ Niet opgeslagen documenten zullen verloren gaan</translation>
         <translation type="obsolete"><br>Client voor gebruik van de X2Go netwerkgebasseerde computeromgeving. Met deze client maakt u verbinding met de X2Go server(s) en kunt u desktop-sessies starten, stoppen, hervatten en (actieve sessies) beeindigen. De X2Go Client slaat verschillende serververbindingen op in, en kan automatisch authenticatie data opvragen van, LDAP directories. Verder kan de client gebruikt worden als fullscreen inlog scherm (vervanging voor inlog managers als  [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation><b>X2Go Client v. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation>Controleer aub LDAP instellingen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Controleer of het pakket dat voorziet in "scdaemon" geïnstalleerd is.
+        <translation type="vanished">Controleer of het pakket dat voorziet in "scdaemon" geïnstalleerd is.
 Huidige pad verwijzing is: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation>nog niet gestart.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation>Lezen van scdaemon niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation>Geen geldige kaart gevonden.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation>Deze kaart is onbekend binnen het X2Go systeem.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation>Kan X.Org Server niet starten.
 Controleer aub uw installatie.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation>De remote server ondersteund het exporteren van bestanden door een SSH tunnel niet.
 Aub uw x2goserver sofwarepakket updaten.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation>Opzetten van SSH tunnel voor delen van mappen en printer ondersteuning niet mogelijk:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation>Lezen niet mogelijk:
@@ -2973,22 +3003,22 @@ Aub uw x2goserver sofwarepakket updaten.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation>Fout bij opvragen venster geometrie (venster gesloten?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation>verkeerde waarde voor argument "snelheid"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation>Applicaties...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
@@ -3077,13 +3107,13 @@ Geef aub deze fout door via de X2Go bugtracker op:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation>Het uitschakelen van remote printen of delen van bestanden bij de sessie instellingen zal ervoor zorgen dat deze melding verdwijnt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation>SSH daemon kon de publieke sleutel van de applicatie niet openen.</translation>
     </message>
@@ -3150,8 +3180,8 @@ Als u zelf beheerdersrechten heeft op dit systeem, type dan het volgende command
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>SSH fout</translation>
     </message>
@@ -3192,7 +3222,7 @@ Vraag aub uw systeembeheerder om uw computer te voorzien van de SSH service.</tr
         <translation type="obsolete">SSH daemon kon de publieke sleutel van de applicatie niet openen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>SSH daemon kon de publieke sleutel van de applicatie die gebruikt wordt
@@ -3220,7 +3250,7 @@ authoized_keys file.</source>
         <translation type="obsolete">Kan sleutel niet openen: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Ondersteuning</translation>
     </message>
@@ -3249,7 +3279,7 @@ authoized_keys file.</source>
         <translation type="obsolete">Geen geldige kaart gevonden</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Kaart is niet geconfigureerd.</translation>
     </message>
@@ -3258,9 +3288,8 @@ authoized_keys file.</source>
         <translation type="obsolete">Deze kaart is onbekend binnen het X2Go systeem</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Bestand aanmaken niet mogelijk: </translation>
+        <translation type="vanished">Bestand aanmaken niet mogelijk: </translation>
     </message>
     <message>
         <source>Can't connect to X server
@@ -3281,8 +3310,8 @@ Please check your installation</source>
 Controleer aub uw installatie</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Uitvoeren niet mogelijk: </translation>
     </message>
@@ -3303,12 +3332,12 @@ Aub updaten naar het nieuwste x2goserver sofwarepakket</translation>
         <translation type="obsolete">Schrijven niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3317,7 +3346,7 @@ Aub updaten naar het nieuwste x2goserver sofwarepakket</translation>
         <translation type="obsolete">Fout bij opvragen venster geometrie (venster gesloten)?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go sessie</translation>
     </message>
@@ -3326,99 +3355,99 @@ Aub updaten naar het nieuwste x2goserver sofwarepakket</translation>
         <translation type="obsolete">verkeerde waarde voor argument"snelheid"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Toetsenbordindeling:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>Sessie ID:<br>Server:<br>Gebruikersnaam:<br>Scherm:<br>Aanmaaktijd:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Toon details</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Hervatten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Volledige toegang</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Alleen bekijken</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Commando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>Client IP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>Sessie ID</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Alleen mijn desktops</translation>
     </message>
@@ -3431,12 +3460,12 @@ u kunt sshd installeren met
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Taakbalk herstellen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Klik op deze button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;om de taakbalk te herstellen&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3678,80 +3707,80 @@ Voorbeeld:
         <translation>getcwd() mislukt!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation>Starten van PulseAudio mislukt!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation>Fout bij ophalen PulseAudio versie nummer!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation>Onverwacht karakter gevonden bij ontleden van versie string voor major versienummer</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation>Onverwacht karakter gevonden bij ontleden van versie string voor minor versienummer</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation>Onverwacht karakter gevonden bij ontleden van versie string voor micro versienummer</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation>Verondersteld om major versienummer over te slaan. Er is iets fout.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation>Converteren van major versienummer string naar geheel getal niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation>Converteren van minor versienummer string naar geheel getal niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation>Converteren van micro versienummer string naar geheel getal niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation>Onverwacht formaat gevonden.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation>Starten van PulseAudio binary niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation>Afspelen van opstartgeluid niet mogelijk.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation>Ondersteuning voor geluid niet beschikbaar.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3845,127 +3874,127 @@ or
         <translation type="obsolete">Sessie icoon aanmaken op bureaublad...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation>Sessie voorkeuren...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation>Sessie icoon aanmaken op bureaublad...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Sessie verwijderen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Sessie acties</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Selecteer type</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Selecteer resolutie</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Wissel geluidsondersteuning</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Nieuwe sessie</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>actief</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>onderbroken</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP connectie</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Verbinding naar lokaal bureaublad</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Gepubliceerde applicaties</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Scherm</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>venster</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Maximaal</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>Uitgeschakeld</translation>
     </message>
@@ -4108,7 +4137,7 @@ X2Go Client in verborgen modus gebruiken?</translation>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH poort:</translation>
     </message>
@@ -4178,25 +4207,25 @@ X2Go Client in verborgen modus gebruiken?</translation>
         <translation>SSH-agent of standaard SSH sleutel</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation>Verbinding maken met Windows terminal server</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation>Directe RDP verbinding</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation>X2Go Client is actief in portable modus. U moet een pad op uw USB device gebruiken om in staat te zijn uw bestanden te benaderen, waar u ook maar bent.</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation>Direct XDMCP connectie</translation>
     </message>
@@ -4229,46 +4258,46 @@ X2Go Client in verborgen modus gebruiken?</translation>
         <translation type="obsolete">Verbinding maken met Windows terminal server</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Verbinden met lokale bureaublad</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Aangepast bureaublad</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Enkele applicatie</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Gepubliceerde applicaties</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Commando:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Uitgebreide opties...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Pad naar exe bestand</translation>
     </message>
@@ -4277,20 +4306,20 @@ X2Go Client in verborgen modus gebruiken?</translation>
         <translation type="obsolete">Directe RDP verbinding</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Open sleutel bestand</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
@@ -4300,45 +4329,45 @@ X2Go Client in verborgen modus gebruiken?</translation>
 maar bent</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP poort:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Afbeeldingen</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation>direct XDMCP connectie</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop commandoregel opties:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Nieuwe sessie</translation>
     </message>
@@ -4535,13 +4564,13 @@ sound system connections through firewalls</source>
         <translation>XDMCP client</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>us</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>wachtwoord</translation>
     </message>
@@ -4639,7 +4668,7 @@ sound system connections through firewalls</source>
     <name>SshMasterConnection</name>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>Kan niet verbinden met </translation>
     </message>
@@ -4659,9 +4688,9 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation>Kan geen SSH sessie opzetten.</translation>
     </message>
@@ -4671,57 +4700,57 @@ sound system connections through firewalls</source>
         <translation>Gebruikt door systeem voorziene gebruikersnaam.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation>Kan niet verbinden met proxy server.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation>Authenticatie mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation>Starten van SSH client mislukt. Controleer aub uw installatie en GSSApi configuratie.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation>Controleer uw GSSApi configuratie of kies een andere authenticatie methode.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation>Sessie opnieuw verbinden</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation>Kan bestand niet openen </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation>Remote bestand aanmaken niet mogelijk </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation>Kan niet naar remote bestand schrijven </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>%1 mislukt.</translation>
@@ -4735,12 +4764,12 @@ sound system connections through firewalls</source>
         <translation type="obsolete">sessie_open_kanaal mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation>Fout bij schrijven naar socket.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation>Fout bij lezen van kanaal.</translation>
     </message>
@@ -4749,7 +4778,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">schrijven_kanaal mislukt.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation>Fout bij lezen TCP socket.</translation>
     </message>
diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts
index ae98b5d..417bacd 100644
--- a/res/i18n/x2goclient_pt.ts
+++ b/res/i18n/x2goclient_pt.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="pt_PT">
+<TS version="2.1" language="pt_PT">
 <context>
     <name>AppDialog</name>
     <message>
@@ -260,78 +260,78 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -344,12 +344,12 @@ can find updated versions on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -360,79 +360,79 @@ Some standard installation locations may be:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
@@ -586,7 +586,7 @@ Some standard installation locations may be:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation type="unfinished"></translation>
     </message>
@@ -945,11 +945,16 @@ Some standard installation locations may be:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
-        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <source>Enables broker logout button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/help.cpp" line="163"/>
+        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -965,167 +970,172 @@ Some standard installation locations may be:
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1217,153 +1227,134 @@ Please upgrade to PulseAudio.</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
-        <source>Share folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
-        <source>Applications...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
-        <source>Reconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1373,266 +1364,270 @@ Please upgrade to PulseAudio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -1641,17 +1636,17 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -1659,309 +1654,337 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -1970,106 +1993,101 @@ If the sftp-server binary is installed on your system, please report a bug menti
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
-        <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation type="unfinished">
@@ -2078,90 +2096,82 @@ If the sftp-server binary is installed on your system, please report a bug menti
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
-        <source>Check whether the package providing "scdaemon" is installed.
-The current search path is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2170,7 +2180,7 @@ These features require a running and functioning SSH server on your computer.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2178,7 +2188,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2186,14 +2196,14 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2201,7 +2211,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2209,503 +2219,493 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
-        <source> to </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
-        <source>Unable to create file: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation type="unfinished"></translation>
     </message>
@@ -2919,80 +2919,80 @@ Example:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3053,127 +3053,127 @@ or
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3298,7 +3298,7 @@ Use X2Go Client's hidden mode?</source>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3364,20 +3364,20 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3402,112 +3402,112 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3659,13 +3659,13 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3755,7 +3755,7 @@ Use X2Go Client's hidden mode?</source>
     <name>SshMasterConnection</name>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3771,9 +3771,9 @@ Use X2Go Client's hidden mode?</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3783,73 +3783,73 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts
index 3897806..9b830aa 100644
--- a/res/i18n/x2goclient_ru.ts
+++ b/res/i18n/x2goclient_ru.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="ru">
+<TS version="2.1" language="ru">
 <context>
     <name>AppDialog</name>
     <message>
@@ -263,7 +263,7 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Использовать LDAP</translation>
     </message>
@@ -272,12 +272,12 @@
         <translation type="obsolete">Установки LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>URL Сервера:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
@@ -326,17 +326,17 @@
         <translation type="obsolete">Рабочий каталог:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>О&тмена</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Установки</translation>
     </message>
@@ -385,12 +385,12 @@
         <translation type="obsolete">Установки LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>Failover Server 1 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>Failover Server 2 URL:</translation>
     </message>
@@ -399,17 +399,17 @@
         <translation type="obsolete">Установки X-Сервера</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>Версия X11:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>Поиск X11</translation>
     </message>
@@ -423,85 +423,85 @@
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Отображать сессию встроенной в веб страницу</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Отображать пиктограму в системном трее</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Спрятать в системный трей при сворачивании</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Спрятать в системный трей при закрытии</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Спрятать в системный трей после установки соединения</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Восстановить при разрыве соединения</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Продвинутые установки</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -514,12 +514,12 @@ can find updated versions on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -530,17 +530,17 @@ Some standard installation locations may be:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>С&оединение</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>&Ввод/Вывод</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Медиа</translation>
     </message>
@@ -980,7 +980,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Новая сессия</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Установки сессии - </translation>
     </message>
@@ -1391,11 +1391,16 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
-        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <source>Enables broker logout button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/help.cpp" line="163"/>
+        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1419,7 +1424,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/ru</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Ключ на сервере изменен:</translation>
@@ -1437,7 +1442,7 @@ It is now: </source>
         <translation type="obsolete">Не могу найти файл с ключами. Если вы примете этот ключ, файл будет создан автоматически</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Сервер не известен. Доверяете ли вы этому ключу?
@@ -1448,22 +1453,22 @@ Public key hash: </translation>
         <translation type="obsolete">Ошибка проверки ключа</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Код проверки:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Введите фразу-пароль для ключа</translation>
     </message>
@@ -1472,12 +1477,12 @@ Public key hash: </translation>
         <translation type="obsolete">Ошибка авторизации</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -1486,12 +1491,12 @@ Public key hash: </translation>
         <translation type="obsolete">Ошибка авторизации<br>Повторите попытку</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Сервер использует недостоверный SSL сертификат.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Вам не следует добавлять исключение если вы используете интернет соединение в котором вы не полностью уверены или если вы не должны были бы получить подобное предупрежедение при соединении с этим сервером</p></translation>
     </message>
@@ -1500,119 +1505,124 @@ Public key hash: </translation>
         <translation type="obsolete">Безопасное соединение невозможно</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Issued to:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Issued by:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerprints:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Добавить исключение</translation>
     </message>
@@ -1709,8 +1719,8 @@ Please upgrade to PulseAudio.</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>ru</translation>
     </message>
@@ -1719,30 +1729,30 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">pc105/ru</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Поддержка ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Сессия:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Выход</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
@@ -1751,7 +1761,7 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">&Новая сессия ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1760,36 +1770,36 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Управление сессиями...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Установки ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>Ошибка SSH</translation>
     </message>
@@ -1830,7 +1840,7 @@ service on your computer.</source>
         <translation type="obsolete">Серверу SSH не удалось открыть "public host key" приложения.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>Серверу SSH не удалось открыть "public host key" приложения используемый для экспорта ФС и принтеров.</translation>
@@ -1841,7 +1851,7 @@ authoized_keys file.</source>
         <translation type="obsolete">Серверу SSH не удалось открыть "authorized_keys" файл приложения.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Восстановить панель инструментов</translation>
     </message>
@@ -1850,12 +1860,12 @@ authoized_keys file.</source>
         <translation type="obsolete">О программе "X2GO Client"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Сессия</translation>
     </message>
@@ -1865,30 +1875,30 @@ authoized_keys file.</source>
         <translation type="obsolete">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Сессия</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Опции</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Помощь</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Пользователь:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Код проверки:</translation>
     </message>
@@ -1903,8 +1913,8 @@ Do you want to terminate the connection?
 Прервать соединение?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Если Вы продолжите, безопасность соединения может быть скомпрометированой. Обновить ключ?</translation>
@@ -1918,36 +1928,36 @@ Do you want to terminate the connection?
 Прекратить соединение?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Новая сессия запущенна</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Сессия восстановленна</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Невозможно создать каталог:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Невозможно записать файл:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Аварийный выход.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Ожидание завершения прокси.</translation>
     </message>
@@ -1960,14 +1970,14 @@ Do you want to terminate the connection?
         <translation type="obsolete">неверное значение для параметра "--clipboard"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Неверный параметр:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
@@ -1980,12 +1990,12 @@ Do you want to terminate the connection?
         <translation type="obsolete">Опция недоступна в этой сборке</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Изменения</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Информация Git</translation>
     </message>
@@ -1998,7 +2008,7 @@ Do you want to terminate the connection?
         <translation type="obsolete">Невозможно открыть ключ:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Карта не сконфигурирована.</translation>
     </message>
@@ -2007,83 +2017,81 @@ Do you want to terminate the connection?
         <translation type="obsolete">Ошибка чтения геометрии окна (окно закрыто)?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Раскладка Клавиатуры:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Приложения...</translation>
+        <translation type="vanished">Приложения...</translation>
     </message>
     <message>
         <source>Invalid reply from broker</source>
         <translation type="obsolete">Неверный ответ брокера</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -2092,7 +2100,7 @@ Do you want to terminate the connection?
         <translation type="obsolete">Проверте настройки LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation type="unfinished">Сервер X2Go не найден в LDAP </translation>
     </message>
@@ -2101,13 +2109,13 @@ Do you want to terminate the connection?
         <translation type="obsolete">Удалить сессию?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> на </translation>
     </message>
@@ -2117,7 +2125,7 @@ Do you want to terminate the connection?
         <translation type="obsolete"><b>Ошибка соединения</b><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Неверный пароль!</b><br><br></translation>
     </message>
@@ -2126,51 +2134,49 @@ Do you want to terminate the connection?
         <translation type="obsolete">Не доступен ни один сервер</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Сессия:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Завершить</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Новая</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Дисплей</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
@@ -2179,32 +2185,32 @@ Do you want to terminate the connection?
         <translation type="obsolete">Время создания</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>IP клиента</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>ID сессии</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>активна</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>прервана</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
@@ -2221,36 +2227,31 @@ Do you want to terminate the connection?
         <translation type="obsolete"> бит и перезапустить X-сервер до восстановления сессии.<br>Попробовать восстановить сессию не смотря на данное предупреждение?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
-        <source> to </source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Connection Error(</source>
         <translation type="obsolete">Ошибка соединения(</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Введите фразу-пароль для ключа</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Ключ на сервере изменен:</translation>
@@ -2268,14 +2269,14 @@ It is now: </source>
         <translation type="obsolete">Не могу найти файл с ключами. Если вы примете этот ключ, файл будет создан автоматически</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Сервер не известен. Доверяете ли вы этому ключу?
 Public key hash: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
@@ -2284,7 +2285,7 @@ Public key hash: </translation>
         <translation type="obsolete">Ошибка проверки ключа</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation></translation>
     </message>
@@ -2293,23 +2294,23 @@ Public key hash: </translation>
         <translation type="obsolete">Ошибка авторизации</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Введите пароль для SSH прокси</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation></translation>
     </message>
@@ -2318,12 +2319,12 @@ Public key hash: </translation>
         <translation type="obsolete">Сервер не доступен</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>прерывается</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>завершается</translation>
     </message>
@@ -2342,102 +2343,102 @@ Public key hash: </translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>соединение</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -2446,17 +2447,17 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -2464,167 +2465,167 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>запуск</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>восстановление</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Таймаут соединения, отмена</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>отмена</translation>
     </message>
@@ -2633,7 +2634,7 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
         <translation type="obsolete"><b>ID сессии:<br>Сервер:<br>Пользователь:<br>Дисплей:<br>Время создания:<br>Статус:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Отмена</translation>
     </message>
@@ -2653,7 +2654,7 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (невозможно открыть файл)</translation>
     </message>
@@ -2678,7 +2679,7 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
         <translation type="obsolete">Available pack methodes:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Поддержка</translation>
     </message>
@@ -2719,9 +2720,8 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
         <translation type="obsolete">Эта карта не сконфигурирована для использования с X2Go</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Невозможно создать файл: </translation>
+        <translation type="vanished">Невозможно создать файл: </translation>
     </message>
     <message>
         <source>Can't connect to X-Server</source>
@@ -2758,42 +2758,42 @@ Please check your settings</source>
         <translation type="obsolete">Почтовый клиент</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Оконный менеджер</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>приложение</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>теневая сессия</translation>
     </message>
@@ -2802,13 +2802,13 @@ Please check your settings</source>
         <translation type="obsolete"><br>Ошибка настроек "sudo"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Невозможно выполнить: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation></translation>
     </message>
@@ -2818,17 +2818,17 @@ Please check your settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Веб-броузер</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>Почтовый клиент</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Новая сессия ...</translation>
     </message>
@@ -2837,8 +2837,8 @@ Please check your settings</source>
         <translation type="obsolete">Управление сессиями...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Панель инструментов</translation>
     </message>
@@ -2847,9 +2847,9 @@ Please check your settings</source>
         <translation type="obsolete">О программе "X2GO Client"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Проверьте настройки LDAP</translation>
     </message>
@@ -2862,16 +2862,16 @@ Please check your settings</source>
         <translation type="obsolete">Удалить сессию?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Неверный пароль!</b><br><br></translation>
     </message>
@@ -2880,15 +2880,15 @@ Please check your settings</source>
         <translation type="obsolete">Не доступен ни один сервер</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <oldsource>Active connection</oldsource>
         <translation>Соединение не установлено</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Время создания</translation>
     </message>
@@ -2907,17 +2907,16 @@ Please check your settings</source>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>ID сессии:<br>Сервер:<br>Пользователь:<br>Дисплей:<br>Время создания:<br>Статус:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Экспорт каталога...</translation>
+        <translation type="vanished">Экспорт каталога...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Показать детали</translation>
     </message>
@@ -2942,13 +2941,13 @@ Please update to a newer x2goserver package</source>
         <translation type="obsolete">&Создать ярлык сессии на рабочем столе...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation></translation>
     </message>
@@ -2961,82 +2960,82 @@ Please update to a newer x2goserver package</source>
         <translation type="obsolete">&Тест соединения...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Пароль изменен</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Неверный пароль!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Авторизация</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Мультимедиа</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Разработка</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Обучение</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Игры</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Графика</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Установки</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Утилиты</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Другие</translation>
     </message>
@@ -3070,24 +3069,23 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">Сессия X2Go не найдена</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP соединение</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>Отсоединить окно</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>Присоединить окно</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>завершена</translation>
     </message>
@@ -3108,19 +3106,18 @@ Please check your installation</source>
 Переустановите X2Go Client</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>Сессия X2Go</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Свернуть панель</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -3129,7 +3126,7 @@ These features require a running and functioning SSH server on your computer.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -3137,7 +3134,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -3145,14 +3142,14 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -3160,7 +3157,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -3168,13 +3165,13 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Щелкните по этой иконке&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;чтобы восстановить панель инструментов&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3191,43 +3188,48 @@ you can install sshd with
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Выбрать десктоп:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation type="unfinished">
@@ -3237,161 +3239,190 @@ you can install sshd with
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -3400,194 +3431,181 @@ If the sftp-server binary is installed on your system, please report a bug menti
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
-        <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
-        <source>Check whether the package providing "scdaemon" is installed.
-The current search path is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Только смотреть</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -3596,24 +3614,23 @@ Please update your x2goserver package.</source>
         <translation type="obsolete">Доступный десктоп не найден</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Полный доступ</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Только мои десктопы</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Повторить соединение</translation>
+        <translation type="vanished">Повторить соединение</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Соединение с брокером</translation>
     </message>
@@ -3630,12 +3647,12 @@ Please update your x2goserver package.</source>
         <translation type="obsolete"><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для [...]
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1251</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>KOI8-R</translation>
     </message>
@@ -3879,80 +3896,80 @@ Example:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -4033,56 +4050,56 @@ or
         <translation type="obsolete">Активировать звук</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Новая сессия</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Удаленные приложения</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>Полноэкранная сессия</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Дисплей</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Максимальное</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>активирован</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>деактивирован</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>окно</translation>
     </message>
@@ -4095,73 +4112,73 @@ or
         <translation type="obsolete">Создать ярлык сессии на рабочем столе...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Удалить сессию</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Тип сессии</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Выбрать разрешение</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>активна</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>прервана</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP соединение</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -4313,7 +4330,7 @@ Use X2Go Client's hidden mode?</source>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH порт:</translation>
     </message>
@@ -4401,35 +4418,35 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Соединение с терминальным сервером Windows</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Другой оконный менеджер</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Приложение</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Удаленные приложения</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Команда:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Продвинутые установки...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Путь к исполняемому файлу</translation>
     </message>
@@ -4438,23 +4455,23 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Прямое RDP соединение</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP порт:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Открыть изображение</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Открыть файл с ключом</translation>
     </message>
@@ -4474,76 +4491,76 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Все файлы</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Сервер:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>Опции командной строки rdesktop:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Новая сессия</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>Сервер XDMCP:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -4757,7 +4774,7 @@ sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>ru</translation>
     </message>
@@ -4766,8 +4783,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/ru</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>пароль</translation>
     </message>
@@ -4885,9 +4902,9 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4897,73 +4914,73 @@ sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4985,7 +5002,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation></translation>
     </message>
diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts
index 2b3788c..73cb2e5 100644
--- a/res/i18n/x2goclient_sv.ts
+++ b/res/i18n/x2goclient_sv.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="sv_SE">
+<TS version="2.1" language="sv_SE">
 <context>
     <name>AppDialog</name>
     <message>
@@ -273,73 +273,73 @@
         <translation>Allmänna</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Visa ikon i systemfältet</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Dölj i systemfältet när minimerad</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Dölj i systemfältet när stängd</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Dölj i systemfältet när anslutning har upprättats</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Återställ från systemfältet när session kopplats från</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>Använd LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>Bas DN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>Redundant server 1 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>Redundant server 2 URL:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation>X.Org serverinställningar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation>PulseAudio inställningar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation>Deaktivera PulseAudio</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation>Deaktivera ljudinmatning</translation>
     </message>
@@ -360,17 +360,17 @@
         <translation type="obsolete"><font size="5">Du måste starta om X2Go-klienten för att ändringar ska aktiveras</font><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation>Din XQuartz-version är för gammal.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation>Du använder XQuartz (X Window System Server for OS X) version %1.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -393,12 +393,12 @@ kan hitta uppdaterade versioner här:
 <center><a href="https://www.xquartz.org/">https://www.xquartz.org/</a></center></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation>Ingen giltig XQuartz-applikation vald.</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -419,17 +419,17 @@ Några vanliga installationssökvägar är:
         <translation type="obsolete">X-server inställningar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11-applikation:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11-version:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>Hitta X11-applikation</translation>
     </message>
@@ -438,39 +438,39 @@ Några vanliga installationssökvägar är:
         <translation type="obsolete">SSH-port på klienten för export av filsystem:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Starta session inuti webbplats</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Avancerade alternativ</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Standardinställningar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Utskrifter</translation>
     </message>
@@ -495,17 +495,17 @@ Några vanliga installationssökvägar är:
         <translation type="obsolete">Ingen X11-applikation hittades i angiven sökväg</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Anslutning</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation>&In-/Utdata</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation>&Multimedia</translation>
     </message>
@@ -663,7 +663,7 @@ Några vanliga installationssökvägar är:
         <translation>Standardinställningar</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Sessionsinställningar - </translation>
     </message>
@@ -1042,11 +1042,16 @@ Några vanliga installationssökvägar är:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
+        <source>Enables broker logout button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="163"/>
         <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
         <translation>Använd anpassad bakgrundsbild (SVG-format) för X2Go Clients huvudfönster. Om en mapp anges så väljs en SVG-fil slumpvis från mappen.</translation>
     </message>
     <message>
-        <location filename="../../src/help.cpp" line="163"/>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation>Använd en anpassad ikon (SVG-format) som ersättning för standardikonen i nedre vänstra hörnet av X2Go Clients huvudfönster.</translation>
     </message>
@@ -1072,12 +1077,12 @@ Några vanliga installationssökvägar är:
         <translation type="obsolete">pc105/se</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
@@ -1090,7 +1095,7 @@ Några vanliga installationssökvägar är:
         <translation type="obsolete">Din session har kopplats från. För att återansluta sessionen, återgå till inloggningssidan eller ladda om sidan i webbläsaren.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Nyckel för server har ändrats.
@@ -1109,7 +1114,7 @@ Den är nu: </translation>
         <translation type="obsolete">Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Okänd server. Litar du på denna nyckel?
@@ -1120,22 +1125,22 @@ Publik nyckel: </translation>
         <translation type="obsolete">Verifiering av serverns nyckel misslyckades</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Verifieringskod:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Ange lösenord för att dekryptera nyckel</translation>
     </message>
@@ -1144,12 +1149,12 @@ Publik nyckel: </translation>
         <translation type="obsolete">Autentisering misslyckades</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Servern använder ett ogiltigt certifikat.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Du bör ej lägga till ett undantag om du inte använder en betrodd uppkoppling eller om du inte brukar få en varning för denna server.</p></translation>
     </message>
@@ -1158,118 +1163,123 @@ Publik nyckel: </translation>
         <translation type="obsolete">Säker anslutning misslyckades</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation>Anslutningen avbryts av säkerhetsskäl.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation>Servernyckeln för denna server hittades inte men en annan typ av nyckel finns. En angripare kan ha ändrat servernyckel för att lura klienten att nyckeln inte ännu finns.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation>Verifiering av serverns nyckel misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation>Autentisering misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation>Inloggning misslyckades!<br>Var god försök igen.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation>Säker anslutning misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Utgivet till:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation>Serienummer	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Utgivare:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Giltighetstid:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation>Utgivningsdatum	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation>giltigt till	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Fingeravtryck:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>Avsluta X2Go-klienten</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>Lägg till undantag</translation>
     </message>
@@ -1370,8 +1380,8 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete">Startar x2goclient...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>se</translation>
     </message>
@@ -1380,34 +1390,34 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete">pc105/se</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go-klient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>ansluter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Webbläsare</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>E-postklient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
@@ -1416,12 +1426,12 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete">Startar x2goclient i portabelt läge ... datakatalog är: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Inställningar...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Hjälp ...</translation>
     </message>
@@ -1434,13 +1444,13 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete">Startade x2goclient.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>Kan inte ladda översättare: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Översättare: </translation>
     </message>
@@ -1449,73 +1459,67 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete"> installerad.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Dela mapp ...</translation>
+        <translation type="vanished">Dela mapp ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Vila</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Återanslut</translation>
+        <translation type="vanished">Återanslut</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>Koppla lös X2Go-fönster</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Minimera verktygsrad</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Session:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Avsluta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Ny session...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1525,7 +1529,7 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete">S&essionshantering...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1542,13 +1546,13 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete">&Testa anslutning...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Visa verktygsrad</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Om Qt</translation>
     </message>
@@ -1563,24 +1567,24 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation>Startar X2Go-klient %1...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation>Startar X2Go-klient i portabelt läge. Datakatalog är: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation>Om X2Go-klient</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation>Startade X2Go-klient.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation> hittad.</translation>
     </message>
@@ -1589,244 +1593,248 @@ Var vänlig uppgradera till PulseAudio.</translation>
         <translation type="obsolete">Engelska begärt, laddar inte översättare.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation>Icke-kritiskt: kan inte ladda översättare: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation>Försöker ladda språk med lägre preferens, om det finns.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation>Sessionshantering...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation>S&kapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation>&Ange agentlösenord...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation>&Testa anslutning...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Session</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Alternativ</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Hjälp</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Användare:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>Operation misslyckades</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Lösenord ändrat</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Fel lösenord!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Ansluter till agent</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentisering</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Återställ</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>Ej ansluten</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Ljud och video</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Programmering</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Utbildning</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Verktyg</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Övrigt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation>Dela mapp ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation>Vänster musknapp för att dölja/återställa. Höger musknapp för att visa snabbmeny.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation>Stänger X2Go-klient...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation>Slutförde X2Go-klientens avslutshookar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation>Autentisering till agent misslyckades!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation>ingen X2Go-server hittades i LDAP </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation>Anslutningsfel: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation>Kunde inte hitta en SSH-anslutning.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -1839,17 +1847,17 @@ Vill du avsluta anslutningen?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation>Verifiering av serverns nyckel misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -1860,55 +1868,55 @@ Vill du avsluta anslutningen?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation>Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation>Autentisering misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation>XDM</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation>RDP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation><b>Anslutning misslyckades.</b>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation>Ingen server tillgänglig.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation>Server ej tillgänglig.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation>Inget tillgängligt Skrivbord hittades.</translation>
     </message>
@@ -1921,12 +1929,12 @@ Vill du avsluta anslutningen?
         <translation type="obsolete"> bitar och startar om X.Org-servern innan du återansluter till denna X2Go-session.<br>Återanslut session ändå?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation>Ditt nuvarande färgdjup avviker från sessionens färgdjup. Det kan orsaka problem vid återanslutning till denna session och oftast <b>tappar du sessionen</b> och måste starta en ny! </translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation>
@@ -1935,57 +1943,57 @@ Vill du avsluta anslutningen?
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation><br />Vill du återansluta ändå?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation>PulseAudio är inte aktivt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation>Ljudutmatning deaktiveras för denna session. Var vänlig aktivera PulseAudio i konfigurationen eller deaktivera ljud i sessionsinställningarna</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation>Start av RDP- eller XDMCP-klient misslyckades</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation>Kontrollera sessionsinställningar och verifiera att den valda klienten är installerad i ditt system.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation>Proxy avslutade inte efter 3 sekunder. Dödar proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation>Avslutar X2Go-klienten eftersom den startades i dolt läge.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation>Avslutar X2Go-klienten eftersom --close-disconnect angavs som inparameter.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation>Är du säker på att du vill avsluta sessionen?
 Data som ej sparats kommer att förloras.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
@@ -1994,122 +2002,150 @@ Data som ej sparats kommer att förloras.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation> (filen finns inte)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation> (mapp finns inte)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation>Fel värde för "--link".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation>Fel värde för argument "--clipboard".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation>Fel värde för "--sound".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation>Fel värde för "--geometry".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation>Fel värde för "--set-kbd".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation>Fel värde för "--ldap".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation>Fel värde för "--ldap1".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation>Fel värde för "--ldap2".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation>Fel värde för "--pack".</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation>Tillgängliga kompressionsmetoder:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation>Kompressionsmetoder</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation>Alternativet är inte tillgängligt i denna version.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation>Kunde ej skapa katalog:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation><br>(C) 2005-2017 av <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation>Kunde ej skapa eller lägga till fil: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation>Kunde ej ändra rättigheter på fil: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation>Detta är ett fel eftersom sshd skulle neka en sådan fil.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation>Kunde ej ändra rättigheter på katalog: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation>Detta är ett fel eftersom sshd skulle neka en sådan katalog.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation>Kunde ej hitta binär för sftp-server. Varken som medskickad eller i $PATH eller i ytterligare sökvägar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2122,87 +2158,87 @@ Om sftp-server finns installerat på ditt system, var vänlig rapportera felet (
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation>Ett fel uppstod vid val av nyckeltyp för SSH</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation>Okänd SSH-nyckel vald.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation>Avslutar applikation.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation>Ett fel uppstod vid skapande av katalog för SSH-nyckel</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation>Kunde ej skapa katalog '%1' för SSH-nyckel.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation>Ett fel uppstod när ssh-keygen skulle startas</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation>Kunde ej starta ssh-keygen.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation>ssh-keygen kraschade</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation>ssh-keygen kraschade.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation>ssh-keygen avslutades med felkod</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation>ssh-keygen avslutades inte korrekt.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation>Det var sannolikt anropat med okända inparametrar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation>Kunde ej öppna nyligen genererad %1 publik nyckelfil.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation>%1 publik nyckelfil tom.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation>Kan inte öppna nyckel: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2215,7 +2251,7 @@ Dessa funktioner kräver en aktiv och fungerande SSH-server på din dator.
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2226,7 +2262,7 @@ Om du ser detta meddelande, var vänlig rapportera en bug på:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2236,15 +2272,15 @@ Please report a bug on:
 Var vänlig rapportera en bug på:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2255,7 +2291,7 @@ Om du ser detta meddelande, var vänlig rapportera en bug på:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2266,12 +2302,12 @@ Var vänlig rapportera en bug på:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation>initaliseringsfel i libssh</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation>Kan ej initialisera libssh.</translation>
     </message>
@@ -2280,77 +2316,73 @@ Var vänlig rapportera en bug på:
         <translation type="obsolete"><br>(C) 2005-2016 av <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
         <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation><br>X2Go Plugin sponsrades av <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
+        <translation type="vanished"><br>X2Go Plugin sponsrades av <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation><br>Klient för X2Go. Denna klient kan ansluta till X2Go-servrar och starta/stoppa/återansluta/avsluta (aktiva) sessioner. X2Go-klienten kan spara anslutningsinställningar samt använda LDAP för autentisering. Klienten kan även användas som inloggningsskärm (ersättning för exempelvis XDM). Besök <a href="http://www.x2go.org">projektets hemsida på x2go.org</a> för vidare information.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation><b>X2Go-klient V. </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation>Kontrollera LDAP-inställningar.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
         <source>Check whether the package providing "scdaemon" is installed.
 The current search path is: </source>
-        <translation>Kontrollera om paket för "scdaemon" är installerat.
+        <translation type="vanished">Kontrollera om paket för "scdaemon" är installerat.
 Aktuell sökväg är: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation>har inte startat ännu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation>Kunde ej läsa från scdaemon.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation>Inget giltigt kort hittades.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation>Detta kort är okänt för X2Go-systemet.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation>Kan ej starta X.Org-server.
 Kontrollera installation.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation>Servern stöder ej filsystemsexport via SSH-tunnel.
 Uppdatera till en nyare version av x2goserver.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation>Kunde inte skapa SSH-tunnel för mappdelning och skrivarstöd:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation>Kunde ej läsa:
@@ -2363,22 +2395,22 @@ Uppdatera till en nyare version av x2goserver.</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation>Ett fel uppstod när fönstergeometri hämtades (fönster stängt?)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation>Fel värde för "speed"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation>Applikationer...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
@@ -2468,13 +2500,13 @@ Var vänlig rapportera en bugg på:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation>Deaktivering av fjärrutskrift eller mappdelning i sessionsinställningarna blockerar detta meddelande.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation>SSH kunde inte öppna sin publika nyckel.</translation>
     </message>
@@ -2541,7 +2573,7 @@ Om du är administratör, var vänlig kör:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation>SSH kunde inte öppna applikationens
@@ -2560,9 +2592,9 @@ authorized_keys-fil.</translation>
         <translation type="obsolete">Stängt x2goclient.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Kontrollera LDAP-inställningar</translation>
     </message>
@@ -2595,7 +2627,7 @@ Använd dolt läge?</translation>
         <translation type="obsolete">Länk till X2Go-session</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Inga X2Go-sessioner hittades, stänger.</translation>
     </message>
@@ -2604,8 +2636,8 @@ Använd dolt läge?</translation>
         <translation type="obsolete">fel värde för argument "--clipboard"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>SSH-fel</translation>
     </message>
@@ -2648,7 +2680,7 @@ på din dator.</translation>
         <translation type="obsolete">SSH kunde inte öppna applikationens publika servernyckel.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>SSH kunde inte öppna applikationens publika nyckel
@@ -2669,41 +2701,40 @@ authorized_keys-fil.</translation>
         <translation type="obsolete">Är du säker på att du vill radera denna session?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP-anslutning</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Anslutning till lokalt Skrivbord</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> på </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Startar anslutning till server: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation> till </translation>
+        <translation type="vanished"> till </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -2714,12 +2745,12 @@ authorized_keys-fil.</translation>
         <translation type="obsolete">Kunde inte hitta en SSH-anslutning.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Ange lösenord för att dekryptera nyckel</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Nyckel för server har ändrats.
@@ -2738,7 +2769,7 @@ Den är nu: </translation>
         <translation type="obsolete">Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Okänd server. Litar du på denna nyckel?
@@ -2749,7 +2780,7 @@ Publik nyckel: </translation>
         <translation type="obsolete">Verifiering av serverns nyckel misslyckades</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Verifieringskod:</translation>
     </message>
@@ -2766,18 +2797,18 @@ Vill du avsluta anslutningen?
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Om du accepterar den nya servernyckeln så kan säkerheten i anslutningen vara komprometterad.
@@ -2793,7 +2824,7 @@ Av säkerhetsskäl är det rekommenderat att du avslutar anslutningen.
 Vill du avsluta anslutningen?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Autentisering misslyckades: </translation>
     </message>
@@ -2802,7 +2833,7 @@ Vill du avsluta anslutningen?</translation>
         <translation type="obsolete">Autentisering misslyckades</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Ange lösenord för SSH-proxy</translation>
     </message>
@@ -2813,37 +2844,37 @@ Vill du avsluta anslutningen?</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Fel lösenord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Anslutning misslyckades: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation> - Fel lösenord.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>okänt</translation>
     </message>
@@ -2856,41 +2887,41 @@ Vill du avsluta anslutningen?</translation>
         <translation type="obsolete">Server ej tillgänglig</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Välj session:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>vilande</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Skrivbord</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>Applikation</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>Skuggsession</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -2899,20 +2930,20 @@ Vill du avsluta anslutningen?</translation>
         <translation type="obsolete">Inget tillgängligt Skrivbord hittades</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Välj Skrivbord:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
@@ -2929,126 +2960,126 @@ Vill du avsluta anslutningen?</translation>
         <translation type="obsolete"> bitar och startar om X-servern innan du återansluter till denna X2Go-session.<br>Återanslut session ändå?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>försätter i vila</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>avslutar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Fel lösenord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Ny session startad</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Session återupptagen</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Kunde ej skapa katalog: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Kunde ej skriva till fil: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation>Kunde inte skapa SSH-tunnel för X2Go-sessionsstart (NX):
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation>Kunde ej skapa SSH-tunnel för ljuddata:
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation>startade inte.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation>Det här betyder sannolikt att binären saknas.
 Aktuell sökväg är: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation>returnerade en felkod eller avslutades oväntat.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation>Exekvering misslyckades, felkod: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation>startade inte i tid.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation>Det här felet borde inte komma.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation>accepterade inte en skrivoperation.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation>Det är sannolikt inte igång eller har avslutats oväntat.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation>Kunde ej läsa från xmodmap.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation>påträffade ett okänt fel under uppstart eller exekvering.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation>ett odefinierat fel inträffade.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
@@ -3057,12 +3088,12 @@ File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.
 Lämna en buggrapport enligt <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Akut avslut.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Väntar på att proxy ska avslutas.</translation>
     </message>
@@ -3071,14 +3102,14 @@ Lämna en buggrapport enligt <a href="http://wiki.x2go.org/doku.php/wiki
         <translation type="obsolete">Misslyckades, dödar proxy.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Felaktig parameter: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Hjälp</translation>
     </message>
@@ -3091,12 +3122,12 @@ Lämna en buggrapport enligt <a href="http://wiki.x2go.org/doku.php/wiki
         <translation type="obsolete">Alternativet är inte tillgängligt i denna version</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Ändringslogg</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Git-information</translation>
     </message>
@@ -3109,8 +3140,8 @@ Lämna en buggrapport enligt <a href="http://wiki.x2go.org/doku.php/wiki
         <translation type="obsolete">Kunde ej skriva till fil:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>Koppla X2Go-fönster</translation>
     </message>
@@ -3127,29 +3158,29 @@ Lämna en buggrapport enligt <a href="http://wiki.x2go.org/doku.php/wiki
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>avslutad</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>startar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>återansluter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Anslutning passerade tidsgränsen, avbryter</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>avbryter</translation>
     </message>
@@ -3160,20 +3191,20 @@ Unsaved documents will be lost</source>
 Data som ej sparats kommer att förloras</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Session</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Display</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Skapad</translation>
     </message>
@@ -3186,7 +3217,7 @@ Data som ej sparats kommer att förloras</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (kan inte öppna fil)</translation>
     </message>
@@ -3251,7 +3282,7 @@ Data som ej sparats kommer att förloras</translation>
         <translation type="obsolete">Kan inte öppna nyckel: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Hjälp</translation>
     </message>
@@ -3280,7 +3311,7 @@ Data som ej sparats kommer att förloras</translation>
         <translation type="obsolete">Inget giltigt kort hittades</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Kort ej konfigurerat.</translation>
     </message>
@@ -3289,9 +3320,8 @@ Data som ej sparats kommer att förloras</translation>
         <translation type="obsolete">Kortet är okänt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Kunde ej skapa filen: </translation>
+        <translation type="vanished">Kunde ej skapa filen: </translation>
     </message>
     <message>
         <source>Can't start X server
@@ -3324,8 +3354,8 @@ Please check your installation</source>
 Kontrollera installation</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Kunde ej exekvera: </translation>
     </message>
@@ -3348,12 +3378,12 @@ Uppdatera till en nyare version av x2goserver</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3362,7 +3392,7 @@ Uppdatera till en nyare version av x2goserver</translation>
         <translation type="obsolete">Ett fel uppstod när fönstergeometri hämtades (fönster stängt)?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go-session</translation>
     </message>
@@ -3371,109 +3401,108 @@ Uppdatera till en nyare version av x2goserver</translation>
         <translation type="obsolete">fel värde för "speed"</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translatorcomment>Swenglish, but commonly used.</translatorcomment>
         <translation>Tangentbordslayout:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>Sessions-ID:<br>Server:<br>Användare:<br>Display:<br>Skapad:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Applikationer...</translation>
+        <translation type="vanished">Applikationer...</translation>
     </message>
     <message>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
         <translation type="obsolete"></b><br> (&copy; 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Visa detaljer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Återanslut</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Fullständig åtkomst</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Endast visa</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>Klient-IP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>Sessions-ID</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Användare</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Bara mina Skrivbord</translation>
     </message>
@@ -3486,12 +3515,12 @@ du kan installera sshd med (Debian/Ubuntu)
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Återställ verktygsrad</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Klicka denna knapp&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;för att återställa verktygsrad&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3749,7 +3778,7 @@ Exempel:
         <translation>getcwd() misslyckades!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation>PulseAudio startade inte!</translation>
     </message>
@@ -3766,75 +3795,75 @@ Om du laddade ner färdigbyggd version från den officiella hemsidan, var vänli
 </translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation>Ett fel uppstod när versionsnummer för PulseAudio skulle hämtas!</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation>Oväntat tecken när versionssträng för huvudversion kontrollerades</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation>Oväntat tecken när versionssträng för underversion kontrollerades</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation>Oväntat tecken när versionssträng för mikroversion kontrollerades</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation>Antas skippa huvudversionsnummer. Något är fel.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation>Kunde ej konvertera huvudversionssträng till heltal.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation>Kunde ej konvertera underversionssträng till heltal.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation>Kunde ej konvertera mikroversionssträng till heltal.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation>Oväntat format påträffat.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation>Kunde ej starta PulseAudio.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation>Kunde ej spela uppstartsljud.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation>Ljudstöd kommer inte att vara tillgängligt.</translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3951,127 +3980,127 @@ eller
         <translation type="obsolete">Skapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation>Sessionsinställningar...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation>Skapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Radera session</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Sessionshantering</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Välj typ</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Välj upplösning</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Växla ljudstöd</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Ny session</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>vilande</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP-anslutning</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Anslutning till lokalt Skrivbord</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Publicerade applikationer</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>Fullskärm</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Display </translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>fönster</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>Maximerad</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>På</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>Av</translation>
     </message>
@@ -4215,7 +4244,7 @@ Använd dolt läge?</translation>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH-port:</translation>
     </message>
@@ -4275,13 +4304,13 @@ Använd dolt läge?</translation>
         <translation>RSA-/DSA-nyckel:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation>X2Go-klienten körs i portabelt läge. Du bör använda en sökväg till en USB-enhet för att möjliggöra flyttbara inställningar.</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation>Direktanslutning via XDMCP</translation>
     </message>
@@ -4314,46 +4343,46 @@ Använd dolt läge?</translation>
         <translation type="obsolete">Anslut till Windows Terminal Server (RDP)</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Anslut till lokalt Skrivbord</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>Anpassat Skrivbord</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Applikation</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Publicerade applikationer</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Avancerade alternativ...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Sökväg till exekverbar fil</translation>
     </message>
@@ -4362,23 +4391,23 @@ Använd dolt läge?</translation>
         <translation type="obsolete">Direktanslutning via RDP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP-port:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Öppna bild</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Öppna nyckelfil</translation>
     </message>
@@ -4393,26 +4422,26 @@ Använd dolt läge?</translation>
         <translation>ssh-agent eller standard SSH-nyckel</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation>Anslut till Windows Terminal Server (RDP)</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation>Direktanslutning via RDP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Alla filer</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
@@ -4421,30 +4450,30 @@ Använd dolt läge?</translation>
         <translation type="obsolete">X2Go-klienten körs i portabelt läge. Du bör använda en sökväg till en USB-enhet för att möjliggöra flyttbara inställningar</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP-server:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation>direktanslutning via XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop kommandoradsalternativ:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Ny session</translation>
     </message>
@@ -4655,7 +4684,7 @@ ljudström genom brandväggar</translation>
         <translation>XDMCP-klient</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>se</translation>
     </message>
@@ -4664,8 +4693,8 @@ ljudström genom brandväggar</translation>
         <translation type="obsolete">pc105/se</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>lösenord</translation>
     </message>
@@ -4787,9 +4816,9 @@ ljudström genom brandväggar</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation>Kan ej skapa SSH-session.</translation>
     </message>
@@ -4799,57 +4828,57 @@ ljudström genom brandväggar</translation>
         <translation>Användarnamn från miljö används.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation>Kan ej ansluta till proxyserver.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation>Autentisering misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation>Start av SSH-klient misslyckades. Kontrollera din installation och GSSApi-konfiguration.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation>Kontrollera din GSSApi-konfiguration eller välj en annan autentiseringsmetod.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation>Återanslut session</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation>Kan inte öppna fil </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation>Kan inte skapa fjärrfil </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation>Kan inte skriva till fjärrfil </translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>%1 misslyckades.</translation>
@@ -4863,12 +4892,12 @@ ljudström genom brandväggar</translation>
         <translation type="obsolete">channel_open_session misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation>Ett fel uppstod vid skrivning till socket.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation>Ett fel uppstod när kanal skulle läsas.</translation>
     </message>
@@ -4877,7 +4906,7 @@ ljudström genom brandväggar</translation>
         <translation type="obsolete">channel_write misslyckades.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation>Ett fel uppstod när TCP-socket skulle läsas.</translation>
     </message>
@@ -4931,7 +4960,7 @@ ljudström genom brandväggar</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>kan inte ansluta till </translation>
     </message>
diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts
index 0732d43..e22dd65 100644
--- a/res/i18n/x2goclient_tr.ts
+++ b/res/i18n/x2goclient_tr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="tr">
+<TS version="2.1" language="tr">
 <context>
     <name>AppDialog</name>
     <message>
@@ -272,88 +272,88 @@
         <translation>Genel</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Sistem çekmecesinde simgeyi göster</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Küçültüldüğünde sistem çekmecesine gizle</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Kapatıldığında sistem çekmecesine gizle</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Bağlantı sağlandıktan sonra sistem çekmecesine gizle</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Bağlantı kesildikten sonra sistem çekmecesine gizle</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>LDAP Kullan</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation>Sunucu Adresi:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>Yük devretme sunucu 1 adresi:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>Yük devretme sunucu 2 adresi:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -366,12 +366,12 @@ can find updated versions on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -382,12 +382,12 @@ Some standard installation locations may be:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
@@ -396,17 +396,17 @@ Some standard installation locations may be:
         <translation type="obsolete">X-Sunucu ayarları</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11 uygulaması:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11 sürümü:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>X11 uygulaması bul</translation>
     </message>
@@ -415,39 +415,39 @@ Some standard installation locations may be:
         <translation type="obsolete">Dosya sistemi dışa aktarımı kullanımı için istemci tarafı SSH bağlantı noktası:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>Oturumu web sayfasına gömülü başlat</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>Gelişmiş seçenekler</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>Varsayılanlar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>&Tamam</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>&İptal</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>Yazdırılıyor</translation>
     </message>
@@ -472,7 +472,7 @@ Some standard installation locations may be:
         <translation type="obsolete">Seçilen yolda uygun bir X11 uygulaması bulunamadı</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>&Bağlantı</translation>
     </message>
@@ -634,7 +634,7 @@ Some standard installation locations may be:
         <translation>Varsayılanlar</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>Oturum tercihleri - </translation>
     </message>
@@ -1013,11 +1013,16 @@ Some standard installation locations may be:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
-        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <source>Enables broker logout button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/help.cpp" line="163"/>
+        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1033,7 +1038,7 @@ Some standard installation locations may be:
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Sunucu için konak anahtarı değişti.
@@ -1052,7 +1057,7 @@ It is now: </source>
         <translation type="obsolete">Bilinen istemciler dosyası bulunamadı. Eğer istemci anahtarını kabul ettiyseniz dosya burada otomatik olarak oluşturulacaktır</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Sunucu bilinmiyor. Konak anahtarına güveniyor musunuz?
@@ -1063,101 +1068,106 @@ Açık anahtar özeti: </translation>
         <translation type="obsolete">Makine anahtarının doğrulanması başarısız oldu</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation>Evet</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation>Hayır</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation>Doğrulama kodu:</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Bir anahtarı deşifrelemek için parolayı girin</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation type="unfinished">MD5     {5	?}</translation>
     </message>
@@ -1166,12 +1176,12 @@ Açık anahtar özeti: </translation>
         <translation type="obsolete">Kimlik doğrulaması başarısız</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
@@ -1180,12 +1190,12 @@ Açık anahtar özeti: </translation>
         <translation type="obsolete">Giriş başarısız oldu!<br>Lütfen tekrar deneyin</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Sunucu geçersiz bir güvenlik sertifikası kullanıyor.</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Tamamen güvendiğiniz bir internet bağlantısı kullanmıyorsanız veya bu sunucu için bir uyarı görmeye alışkın değilseniz bir istisna eklememelisiniz.</p></translation>
     </message>
@@ -1194,7 +1204,7 @@ Açık anahtar özeti: </translation>
         <translation type="obsolete">Güvenli bağlantı hatası</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation>Yayınlatan:
@@ -1218,14 +1228,14 @@ Açık anahtar özeti: </translation>
         <translation type="obsolete">Seri Numarası  </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation>Yayınlayan:
 </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation>Geçerlilik:
@@ -1241,7 +1251,7 @@ Açık anahtar özeti: </translation>
         <translation type="obsolete">Zaman aşımı tarihi </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation>Parmak izi:
@@ -1256,12 +1266,12 @@ Açık anahtar özeti: </translation>
         <translation type="obsolete">MD5    </translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation>X2Go İstemcisinden Çık</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation>İstisna ekle</translation>
     </message>
@@ -1358,40 +1368,40 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">x2goclient istemcisi başlatılıyor...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>tr</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go İstemcisi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>bağlanıyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>Internet tarayıcı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>E-posta istemcisi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>Uçbirim</translation>
     </message>
@@ -1400,12 +1410,12 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">x2goclient taşınabilir kipte başlatılıyor... veri dizini: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>&Ayarlar...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>Destek ...</translation>
     </message>
@@ -1418,13 +1428,13 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">x2goclient  başlatıldı.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation>Çevirici yüklenemiyor: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation>Çevirmen: </translation>
     </message>
@@ -1433,78 +1443,71 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete"> kuruldu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>Klasör paylaş...</translation>
+        <translation type="vanished">Klasör paylaş...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
         <source>Applications...</source>
-        <translation>Uygulamalar...</translation>
+        <translation type="vanished">Uygulamalar...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>Askıya Al</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>Sonlandır</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>Yeniden bağlan</translation>
+        <translation type="vanished">Yeniden bağlan</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>X2Go penceresini ayır</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>Araç çubuğunu küçült</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>Oturum:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>&Çıkış</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>Çık</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>&Yeni oturum ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1513,7 +1516,7 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">Oturum yönetimi...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -1530,13 +1533,13 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">&Bağlantı testi...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>Araç çubuğunu göster</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>Qt Hakkında</translation>
     </message>
@@ -1551,266 +1554,270 @@ Please upgrade to PulseAudio.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>&Oturum</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>&Seçenekler</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>&Yardım</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>Giriş:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>İşlem başarısız oldu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>Parola değiştirildi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>Yanlış parola!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>Aracıya bağlanıyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>Kimlik Doğrulama</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>Geri Yükle</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>Bağlı değil</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation>Çokluortam</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation>Geliştirme</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation>Eğitim</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation>Oyun</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation>Grafikler</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation>Ofis</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation>Araç</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation>Diğer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -1819,17 +1826,17 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -1837,309 +1844,336 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2148,106 +2182,101 @@ If the sftp-server binary is installed on your system, please report a bug menti
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
-        <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation type="unfinished">
@@ -2255,90 +2284,82 @@ If the sftp-server binary is installed on your system, please report a bug menti
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
-        <source>Check whether the package providing "scdaemon" is installed.
-The current search path is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -2347,7 +2368,7 @@ These features require a running and functioning SSH server on your computer.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -2355,7 +2376,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -2363,14 +2384,14 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -2378,7 +2399,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -2386,7 +2407,7 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation type="unfinished"></translation>
@@ -2404,9 +2425,9 @@ authorized_keys file.</source>
         <translation type="obsolete">x2goclient  kapatıldı.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>Lütfen LDAP ayarlarını kontrol edin</translation>
     </message>
@@ -2415,46 +2436,45 @@ authorized_keys file.</source>
         <translation type="obsolete">LDAP'ta X2Go sunucusu yok </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>X2Go oturumu bulunamadı, kapatılıyor.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP bağlantısı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>Yerel masa üstüne bağlantı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> üzerinde </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation>Sunucuya bağlantı başlatılıyor: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
         <source> to </source>
-        <translation> sunucusuna </translation>
+        <translation type="vanished"> sunucusuna </translation>
     </message>
     <message>
         <source>Connection Error(</source>
@@ -2465,17 +2485,17 @@ authorized_keys file.</source>
         <translation type="obsolete">Bir SSH bağlantısı bulunamadı.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation>Doğrulama kodu:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anahtarı deşifrelemek için parola girin</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Sunucunun konak anahtarı değişti.
@@ -2498,18 +2518,18 @@ Bağlantıyı sonlandırmak istiyor musunuz?
         <translation type="obsolete">Makine anahtarının doğrulanması başarısız oldu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>Evet</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>Hayır</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation>Yeni konak anahtarını kabul ederseniz bağlantınızın güvenliği tehlikede olabilir.
@@ -2530,14 +2550,14 @@ Bağlantıyı sonlandırmak istiyor musunuz?
         <translation type="obsolete">Bilinen istemciler dosyası bulunamadı. Eğer istemci anahtarını kabul ettiyseniz dosya burada otomatik olarak oluşturulacaktır</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Sunucu bilinmiyor. İstemci anahtarına güveniyor musunuz?
 Açık anahtarın özeti: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation>Kimlik doğrulama başarısız oldu: </translation>
     </message>
@@ -2546,7 +2566,7 @@ Açık anahtarın özeti: </translation>
         <translation type="obsolete">Kimlik doğrulama başarısız</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation>Vekil SSH için parola girin</translation>
     </message>
@@ -2557,37 +2577,37 @@ Açık anahtarın özeti: </translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Yanlış parola!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation>Bağlantı başarısız: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation> - Yanlış parola.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
@@ -2600,41 +2620,41 @@ Açık anahtarın özeti: </translation>
         <translation type="obsolete">Sunucu erişilebilir değil</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>Oturumu başlat:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>çalışıyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>bekletiliyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>Masaüstü</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>tek uygulama</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation>gölge oturumu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>Bilgi</translation>
     </message>
@@ -2643,20 +2663,20 @@ Açık anahtarın özeti: </translation>
         <translation type="obsolete">Erişilebilir masaüstü bulunamadı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>Masaüstü seçin:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
@@ -2673,47 +2693,47 @@ Açık anahtarın özeti: </translation>
         <translation type="obsolete"> bit ve bu x2go oturumuna yeniden bağlanmadan X sunucunuzu yeniden başlatın.<br>Oturuma yine de devam edilsin mi?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>bekletiliyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>sonlandırılıyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Hatalı Parola!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation>Yeni oturum başlatıldı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation>Oturuma geri dönüldü</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation>Klasör oluşturulamadı: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation>Dosya yazılamıyor: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>X2Go penceresine ekle</translation>
     </message>
@@ -2730,12 +2750,12 @@ Açık anahtarın özeti: </translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation>Acil çıkış.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Çıkış için vekil sunucu bekleniyor.</translation>
     </message>
@@ -2744,29 +2764,29 @@ Açık anahtarın özeti: </translation>
         <translation type="obsolete">Başarısız oldu, vekil sunucu durduruluyor.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>Tamamlandı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>başlatılıyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>devam ediliyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>Bağlantı zaman aşımına uğradı, iptal ediliyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>iptal ediliyor</translation>
     </message>
@@ -2777,20 +2797,20 @@ Unsaved documents will be lost</source>
 Kaydedilmemiş belgeler kaybolacak</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>Oturum</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>Oluşturma zamanı</translation>
     </message>
@@ -2803,7 +2823,7 @@ Kaydedilmemiş belgeler kaybolacak</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (dosya açılamıyor)</translation>
     </message>
@@ -2852,14 +2872,14 @@ Kaydedilmemiş belgeler kaybolacak</translation>
         <translation type="obsolete">"--pack" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation>Yanlış parametre: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation>Yardım</translation>
     </message>
@@ -2876,12 +2896,12 @@ Kaydedilmemiş belgeler kaybolacak</translation>
         <translation type="obsolete">Bu inşa için özellik kullanılabilir değil</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation>Değişim günlüğü</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation>Git Bilgisi</translation>
     </message>
@@ -2898,7 +2918,7 @@ Kaydedilmemiş belgeler kaybolacak</translation>
         <translation type="obsolete">Anahtar açılamıyor: </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>Destek</translation>
     </message>
@@ -2927,7 +2947,7 @@ Kaydedilmemiş belgeler kaybolacak</translation>
         <translation type="obsolete">Geçerli kart bulunamadı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation>Kart yapılandırılmadı.</translation>
     </message>
@@ -2936,9 +2956,8 @@ Kaydedilmemiş belgeler kaybolacak</translation>
         <translation type="obsolete">Kart X2Go sistemi tarafından bilinmiyor</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>Dosya oluşturulamadı: </translation>
+        <translation type="vanished">Dosya oluşturulamadı: </translation>
     </message>
     <message>
         <source>Can't connect to X server
@@ -2958,8 +2977,8 @@ Please check your installation</source>
         <translation type="obsolete">X Sunucusu başlatılamadı\Lütfen kurulumunuzu kontrol edin</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>Komut çalıştırılamadı: </translation>
     </message>
@@ -2982,12 +3001,12 @@ Lütfen x2goserver paketini daha yeni bir sürüme güncelleyin</translation>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -2996,7 +3015,7 @@ Lütfen x2goserver paketini daha yeni bir sürüme güncelleyin</translation>
         <translation type="obsolete">Pencere geometrisi alınırken hata (pencere kapalı mı)?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go Oturumu</translation>
     </message>
@@ -3005,128 +3024,128 @@ Lütfen x2goserver paketini daha yeni bir sürüme güncelleyin</translation>
         <translation type="obsolete">"speed" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>Parola:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>Klavye düzeni:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>Tamam</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>Oturum Kimliği:<br>Sunucu:<br>Kullanıcı adı:<br>Ekran:<br>Oluşturma zamanı:<br>Durum:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>Ayrıntıları göster</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>Devam et</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>Tam erişim</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>Sadece görüntüleme</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>Komut</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>Sunucu</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>İstemci IP adresi</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>Oturum Kimliği</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>Kullanıcı</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>Sadece beim masaüstlerimde</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation>SSH Hatası</translation>
     </message>
@@ -3169,7 +3188,7 @@ sağlamasını isteyin.</translation>
         <translation type="obsolete">SSH süreci uygulamanın açık konak anahtarını açmakta başarısız oldu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>SSH süreci uygulamanın klasörleri ve yazıcıları dışa aktarmak
@@ -3182,12 +3201,12 @@ authoized_keys file.</source>
 açmakta başarısız oldu.</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>Araç çubuğunu yeniden yükle</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Araç çubuğunu yeniden yüklemek için&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;bu düğmeye tıklayın&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3424,80 +3443,80 @@ Example:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3566,127 +3585,127 @@ or
         <translation type="obsolete">Masaüstünde oturum simgesi oluştur...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>Oturumu sil</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>Oturum eylemleri</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>Türü seçin</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>Çözünürlüğü seçin</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>Ses değiştirme desteği</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>Yeni Oturum</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>çalışıyor</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>bekletiliyor</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP bağlantısı</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>Yerel masaüstüne bağlantı</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation>Tanımlı uygulamalar</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>tam ekran</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>Göster </translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>pencere</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation>En Büyük</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>Etkin</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>Kapalı</translation>
     </message>
@@ -3827,7 +3846,7 @@ Use X2Go Client's hidden mode?</source>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH portu:</translation>
     </message>
@@ -3897,25 +3916,25 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3948,46 +3967,46 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Windows terminal sunucusuna bağlan</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>Yerel masaüstüne bağlan</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>kişisel masaüstü</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>Tek uygulama</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation>Tanımlı uygulamalar</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>Komut:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>Gelişmiş seçenekler...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>Çalıştırılabilir dosyanın yolu</translation>
     </message>
@@ -3996,20 +4015,20 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">Doğrudan RDP Bağlantısı</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>Anahtar dosyasını aç</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>Tüm dosyalar</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
@@ -4018,45 +4037,45 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">x2goclient taşınabilir kipte çalışıyor. İstediğiniz yerden verilerinize ulaşmak için usb aygıtınızın yolunu kullanmalısınız</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation>RDP portu:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>Resmi aç</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>Resimler</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>Sunucu:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP sunucusu:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop komut satırı seçenekleri:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>Yeni oturum</translation>
     </message>
@@ -4254,13 +4273,13 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>tr</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation>parola</translation>
     </message>
@@ -4358,7 +4377,7 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
     <name>SshMasterConnection</name>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>bağlanamıyor </translation>
     </message>
@@ -4374,9 +4393,9 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4386,73 +4405,73 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation>%1 başarısız oldu.</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts
index f820f01..3212ff0 100644
--- a/res/i18n/x2goclient_zh_tw.ts
+++ b/res/i18n/x2goclient_zh_tw.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_TW">
+<TS version="2.1" language="zh_TW">
 <context>
     <name>AppDialog</name>
     <message>
@@ -272,88 +272,88 @@
         <translation>一般設定</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="68"/>
+        <location filename="../../src/configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>在系統狀態列中顯示圖示</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>最小化時縮至系統狀態列</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>關閉時隱藏至系統狀態列</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="77"/>
+        <location filename="../../src/configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>連線建立後隱藏至系統狀態列</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="78"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>當工作階段斷線後從系統狀態列中還原</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="96"/>
+        <location filename="../../src/configdialog.cpp" line="92"/>
         <source>Use LDAP</source>
         <translation>使用LDAP</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="116"/>
         <source>Server URL:</source>
         <translation type="unfinished">伺服器網址:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="117"/>
         <source>BaseDN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="119"/>
         <source>Failover server 1 URL:</source>
         <translation>備援伺服器網1 網址:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="125"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>Failover server 2 URL:</source>
         <translation>備援伺服器網2 網址:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="207"/>
-        <location filename="../../src/configdialog.cpp" line="337"/>
+        <location filename="../../src/configdialog.cpp" line="203"/>
+        <location filename="../../src/configdialog.cpp" line="333"/>
         <source>X.Org Server settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="338"/>
         <source>PulseAudio settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="344"/>
+        <location filename="../../src/configdialog.cpp" line="340"/>
         <source>Disable PulseAudio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="345"/>
+        <location filename="../../src/configdialog.cpp" line="341"/>
         <source>Disable sound input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="568"/>
+        <location filename="../../src/configdialog.cpp" line="562"/>
         <source>Your XQuartz version is too old.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="569"/>
+        <location filename="../../src/configdialog.cpp" line="563"/>
         <source>Your are using XQuartz (X Window System Server for OS X) version %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="571"/>
+        <location filename="../../src/configdialog.cpp" line="565"/>
         <source>This version causes problems with X applications in 24bit color mode.
 You should update your X11 environment.
 
@@ -366,12 +366,12 @@ can find updated versions on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="597"/>
+        <location filename="../../src/configdialog.cpp" line="591"/>
         <source>No valid XQuartz application selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="598"/>
+        <location filename="../../src/configdialog.cpp" line="592"/>
         <source>You did not select a valid XQuartz application.
 Please try again.
 
@@ -386,17 +386,17 @@ Some standard installation locations may be:
         <translation type="obsolete">X伺服器設定</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="216"/>
+        <location filename="../../src/configdialog.cpp" line="212"/>
         <source>X11 application:</source>
         <translation>X11應用程式:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="227"/>
+        <location filename="../../src/configdialog.cpp" line="223"/>
         <source>X11 version:</source>
         <translation>X11版本:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="242"/>
+        <location filename="../../src/configdialog.cpp" line="238"/>
         <source>Find X11 application</source>
         <translation>尋找X11應用程式</translation>
     </message>
@@ -405,39 +405,39 @@ Some standard installation locations may be:
         <translation type="obsolete">檔案系統匯出時用戶端所使用的SSH連接埠:</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="250"/>
         <source>Start session embedded inside website</source>
         <translation>將工作階段嵌入至網站內</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="258"/>
-        <location filename="../../src/configdialog.cpp" line="642"/>
-        <location filename="../../src/configdialog.cpp" line="658"/>
+        <location filename="../../src/configdialog.cpp" line="254"/>
+        <location filename="../../src/configdialog.cpp" line="636"/>
+        <location filename="../../src/configdialog.cpp" line="652"/>
         <source>Advanced options</source>
         <translation>進階選項</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="288"/>
+        <location filename="../../src/configdialog.cpp" line="284"/>
         <source>Defaults</source>
         <translation>預設</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="289"/>
+        <location filename="../../src/configdialog.cpp" line="285"/>
         <source>&OK</source>
         <translation>確定(&O)</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="290"/>
+        <location filename="../../src/configdialog.cpp" line="286"/>
         <source>&Cancel</source>
         <translation>取消(&C)</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="313"/>
+        <location filename="../../src/configdialog.cpp" line="309"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="333"/>
+        <location filename="../../src/configdialog.cpp" line="329"/>
         <source>Printing</source>
         <translation>列印功能</translation>
     </message>
@@ -462,17 +462,17 @@ Some standard installation locations may be:
         <translation type="obsolete">在您選擇的路徑中沒有合適的X11應用程式</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="655"/>
+        <location filename="../../src/configdialog.cpp" line="649"/>
         <source>&Connection</source>
         <translation>連線(&C)</translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="656"/>
+        <location filename="../../src/configdialog.cpp" line="650"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/configdialog.cpp" line="657"/>
+        <location filename="../../src/configdialog.cpp" line="651"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
@@ -630,7 +630,7 @@ Some standard installation locations may be:
         <translation>預設值</translation>
     </message>
     <message>
-        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="128"/>
         <source>Session preferences - </source>
         <translation>工作階段偏好設定 - </translation>
     </message>
@@ -993,11 +993,16 @@ Some standard installation locations may be:
     </message>
     <message>
         <location filename="../../src/help.cpp" line="162"/>
-        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <source>Enables broker logout button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../src/help.cpp" line="163"/>
+        <source>Use a custom/branded background image (SVG format) for X2Go Client's main window. If a directory is given, will randomly pick an SVG file inside of it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/help.cpp" line="164"/>
         <source>Use a custom icon (SVG format) for additional branding to replace the default in the lower left corner of X2Go Client's main window.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1021,12 +1026,12 @@ Some standard installation locations may be:
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="426"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="448"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="468"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="483"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="497"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="513"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="432"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="455"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="475"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="504"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="520"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
@@ -1039,7 +1044,7 @@ Some standard installation locations may be:
         <translation type="obsolete">您的工作階段已中斷連線。請返回登入畫面或是在瀏覽器中重新載入頁面以重新連回之前的工作階段。</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="146"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation type="unfinished">主機的SSH密鑰已經更換。
@@ -1058,7 +1063,7 @@ It is now: </source>
         <translation type="obsolete">目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰,這個檔案將會自動被建立。</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="191"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation type="unfinished">此為未知的伺服器,您要選擇信任此主機密鑰嗎?
@@ -1069,145 +1074,150 @@ Public key hash: </source>
         <translation type="obsolete">主機密鑰驗證任失敗</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>Yes</source>
         <translation type="unfinished">是</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
         <source>No</source>
         <translation type="unfinished">否</translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="219"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="225"/>
         <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="223"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="221"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="610"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="617"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>伺服使器使用了不合法的安全憑證</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="613"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="620"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="145"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="147"/>
         <source>For security reasons, the connection attempt will be aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="158"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="160"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="184"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="186"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="193"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="195"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="260"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="229"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="266"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="427"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="433"/>
         <source>Login failed!<br>Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Secure connection failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="630"/>
         <source>Issued to:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="648"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="631"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="655"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="638"/>
-        <location filename="../../src/httpbrokerclient.cpp" line="662"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="669"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="645"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="652"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="647"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="654"/>
         <source>Issued by:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="670"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="677"/>
         <source>Validity:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="671"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="678"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="672"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="679"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="673"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="680"/>
         <source>Fingerprints:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="674"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="681"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="676"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="683"/>
         <source>MD5	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="682"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="689"/>
         <source>Exit X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/httpbrokerclient.cpp" line="684"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="691"/>
         <source>Add exception</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1300,8 +1310,8 @@ Please upgrade to PulseAudio.</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="107"/>
-        <location filename="../../src/onmainwindow.cpp" line="7536"/>
+        <location filename="../../src/onmainwindow.cpp" line="108"/>
+        <location filename="../../src/onmainwindow.cpp" line="7441"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -1310,44 +1320,44 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="188"/>
+        <location filename="../../src/onmainwindow.cpp" line="185"/>
         <source>X2Go Client</source>
         <translation>X2Go用戶端</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="209"/>
-        <location filename="../../src/onmainwindow.cpp" line="3400"/>
-        <location filename="../../src/onmainwindow.cpp" line="6380"/>
+        <location filename="../../src/onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="3286"/>
+        <location filename="../../src/onmainwindow.cpp" line="6293"/>
         <source>connecting</source>
         <translation>正在連線</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="220"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Internet browser</source>
         <translation>網頁瀏覽器</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="221"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>Email client</source>
         <translation>電子郵件軟體</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="222"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="223"/>
+        <location filename="../../src/onmainwindow.cpp" line="220"/>
         <source>Terminal</source>
         <translation>終端機</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="427"/>
+        <location filename="../../src/onmainwindow.cpp" line="419"/>
         <source>&Settings ...</source>
         <translation>設定(&S) ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="431"/>
+        <location filename="../../src/onmainwindow.cpp" line="423"/>
         <source>Support ...</source>
         <translation>支援 ...</translation>
     </message>
@@ -1356,84 +1366,78 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">關於X2GO用戶端</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="631"/>
+        <location filename="../../src/onmainwindow.cpp" line="663"/>
         <source>Can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source>Translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="707"/>
         <source>Share folder...</source>
-        <translation>共享資料夾...</translation>
+        <translation type="vanished">共享資料夾...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="713"/>
-        <location filename="../../src/onmainwindow.cpp" line="1224"/>
-        <location filename="../../src/onmainwindow.cpp" line="6436"/>
-        <location filename="../../src/onmainwindow.cpp" line="12322"/>
+        <location filename="../../src/onmainwindow.cpp" line="1120"/>
+        <location filename="../../src/onmainwindow.cpp" line="6347"/>
+        <location filename="../../src/onmainwindow.cpp" line="12183"/>
         <source>Suspend</source>
         <translation>暫停</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="716"/>
-        <location filename="../../src/onmainwindow.cpp" line="1225"/>
-        <location filename="../../src/onmainwindow.cpp" line="12160"/>
-        <location filename="../../src/onmainwindow.cpp" line="12324"/>
+        <location filename="../../src/onmainwindow.cpp" line="1121"/>
+        <location filename="../../src/onmainwindow.cpp" line="12021"/>
+        <location filename="../../src/onmainwindow.cpp" line="12185"/>
         <source>Terminate</source>
         <translation>終止</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="718"/>
         <source>Reconnect</source>
-        <translation>重新連線</translation>
+        <translation type="vanished">重新連線</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="722"/>
-        <location filename="../../src/onmainwindow.cpp" line="11499"/>
+        <location filename="../../src/onmainwindow.cpp" line="11367"/>
         <source>Detach X2Go window</source>
         <translation>脫離X2Go視窗</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="725"/>
-        <location filename="../../src/onmainwindow.cpp" line="12670"/>
+        <location filename="../../src/onmainwindow.cpp" line="12531"/>
         <source>Minimize toolbar</source>
         <translation>將工具列最小化</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="841"/>
-        <location filename="../../src/onmainwindow.cpp" line="2314"/>
-        <location filename="../../src/onmainwindow.cpp" line="8926"/>
+        <location filename="../../src/onmainwindow.cpp" line="738"/>
+        <location filename="../../src/onmainwindow.cpp" line="2191"/>
+        <location filename="../../src/onmainwindow.cpp" line="8859"/>
         <source>Session:</source>
         <translation>工作階段:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="902"/>
+        <location filename="../../src/onmainwindow.cpp" line="799"/>
         <source>&Quit</source>
         <translation>離開(&Q)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="903"/>
+        <location filename="../../src/onmainwindow.cpp" line="800"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="904"/>
-        <location filename="../../src/onmainwindow.cpp" line="1248"/>
+        <location filename="../../src/onmainwindow.cpp" line="801"/>
+        <location filename="../../src/onmainwindow.cpp" line="1144"/>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="907"/>
+        <location filename="../../src/onmainwindow.cpp" line="804"/>
         <source>&New session ...</source>
         <translation>新增工作階段(&N) ...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="908"/>
+        <location filename="../../src/onmainwindow.cpp" line="805"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1442,7 +1446,7 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">工作階段管理員...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="914"/>
+        <location filename="../../src/onmainwindow.cpp" line="811"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1459,179 +1463,178 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">連線能力測試(&C)...</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="951"/>
-        <location filename="../../src/onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="848"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
         <source>Show toolbar</source>
         <translation>顯示工具列</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="957"/>
+        <location filename="../../src/onmainwindow.cpp" line="854"/>
         <source>About Qt</source>
         <translation>關於Qt</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="976"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>&Session</source>
         <translation>工作階段(&S)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="979"/>
+        <location filename="../../src/onmainwindow.cpp" line="876"/>
         <source>&Options</source>
         <translation>選項(&O)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1001"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
         <source>&Help</source>
         <translation>幫助(&H)</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1040"/>
-        <location filename="../../src/onmainwindow.cpp" line="2307"/>
-        <location filename="../../src/onmainwindow.cpp" line="8919"/>
-        <location filename="../../src/onmainwindow.cpp" line="11948"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <location filename="../../src/onmainwindow.cpp" line="2184"/>
+        <location filename="../../src/onmainwindow.cpp" line="8852"/>
+        <location filename="../../src/onmainwindow.cpp" line="11809"/>
         <source>Login:</source>
         <translation>登入:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
-        <location filename="../../src/onmainwindow.cpp" line="1942"/>
-        <location filename="../../src/onmainwindow.cpp" line="1971"/>
-        <location filename="../../src/onmainwindow.cpp" line="1979"/>
-        <location filename="../../src/onmainwindow.cpp" line="2127"/>
-        <location filename="../../src/onmainwindow.cpp" line="2154"/>
-        <location filename="../../src/onmainwindow.cpp" line="2157"/>
-        <location filename="../../src/onmainwindow.cpp" line="2371"/>
-        <location filename="../../src/onmainwindow.cpp" line="2553"/>
-        <location filename="../../src/onmainwindow.cpp" line="2569"/>
-        <location filename="../../src/onmainwindow.cpp" line="2583"/>
-        <location filename="../../src/onmainwindow.cpp" line="2617"/>
-        <location filename="../../src/onmainwindow.cpp" line="2662"/>
-        <location filename="../../src/onmainwindow.cpp" line="3925"/>
-        <location filename="../../src/onmainwindow.cpp" line="4150"/>
-        <location filename="../../src/onmainwindow.cpp" line="4159"/>
-        <location filename="../../src/onmainwindow.cpp" line="4524"/>
-        <location filename="../../src/onmainwindow.cpp" line="5088"/>
-        <location filename="../../src/onmainwindow.cpp" line="5169"/>
-        <location filename="../../src/onmainwindow.cpp" line="5238"/>
-        <location filename="../../src/onmainwindow.cpp" line="5268"/>
-        <location filename="../../src/onmainwindow.cpp" line="5312"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
-        <location filename="../../src/onmainwindow.cpp" line="5939"/>
-        <location filename="../../src/onmainwindow.cpp" line="7117"/>
-        <location filename="../../src/onmainwindow.cpp" line="7147"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="8106"/>
-        <location filename="../../src/onmainwindow.cpp" line="8188"/>
-        <location filename="../../src/onmainwindow.cpp" line="8458"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
+        <location filename="../../src/onmainwindow.cpp" line="1819"/>
+        <location filename="../../src/onmainwindow.cpp" line="1848"/>
+        <location filename="../../src/onmainwindow.cpp" line="1856"/>
+        <location filename="../../src/onmainwindow.cpp" line="2004"/>
+        <location filename="../../src/onmainwindow.cpp" line="2031"/>
+        <location filename="../../src/onmainwindow.cpp" line="2034"/>
+        <location filename="../../src/onmainwindow.cpp" line="2248"/>
+        <location filename="../../src/onmainwindow.cpp" line="2430"/>
+        <location filename="../../src/onmainwindow.cpp" line="2446"/>
+        <location filename="../../src/onmainwindow.cpp" line="2460"/>
+        <location filename="../../src/onmainwindow.cpp" line="2494"/>
+        <location filename="../../src/onmainwindow.cpp" line="2539"/>
+        <location filename="../../src/onmainwindow.cpp" line="3818"/>
+        <location filename="../../src/onmainwindow.cpp" line="4045"/>
+        <location filename="../../src/onmainwindow.cpp" line="4054"/>
+        <location filename="../../src/onmainwindow.cpp" line="4434"/>
+        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="5093"/>
+        <location filename="../../src/onmainwindow.cpp" line="5162"/>
+        <location filename="../../src/onmainwindow.cpp" line="5192"/>
+        <location filename="../../src/onmainwindow.cpp" line="5236"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
+        <location filename="../../src/onmainwindow.cpp" line="5857"/>
+        <location filename="../../src/onmainwindow.cpp" line="7017"/>
+        <location filename="../../src/onmainwindow.cpp" line="7047"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="8043"/>
+        <location filename="../../src/onmainwindow.cpp" line="8125"/>
+        <location filename="../../src/onmainwindow.cpp" line="8395"/>
+        <location filename="../../src/onmainwindow.cpp" line="8446"/>
         <location filename="../../src/onmainwindow.cpp" line="8509"/>
-        <location filename="../../src/onmainwindow.cpp" line="8572"/>
-        <location filename="../../src/onmainwindow.cpp" line="8870"/>
-        <location filename="../../src/onmainwindow.cpp" line="8872"/>
-        <location filename="../../src/onmainwindow.cpp" line="9218"/>
-        <location filename="../../src/onmainwindow.cpp" line="9274"/>
-        <location filename="../../src/onmainwindow.cpp" line="9302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9754"/>
-        <location filename="../../src/onmainwindow.cpp" line="9773"/>
-        <location filename="../../src/onmainwindow.cpp" line="9832"/>
-        <location filename="../../src/onmainwindow.cpp" line="9860"/>
-        <location filename="../../src/onmainwindow.cpp" line="9882"/>
-        <location filename="../../src/onmainwindow.cpp" line="9903"/>
-        <location filename="../../src/onmainwindow.cpp" line="9921"/>
+        <location filename="../../src/onmainwindow.cpp" line="8803"/>
+        <location filename="../../src/onmainwindow.cpp" line="8805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9095"/>
+        <location filename="../../src/onmainwindow.cpp" line="9151"/>
+        <location filename="../../src/onmainwindow.cpp" line="9515"/>
+        <location filename="../../src/onmainwindow.cpp" line="9534"/>
+        <location filename="../../src/onmainwindow.cpp" line="9593"/>
+        <location filename="../../src/onmainwindow.cpp" line="9621"/>
+        <location filename="../../src/onmainwindow.cpp" line="9643"/>
+        <location filename="../../src/onmainwindow.cpp" line="9664"/>
+        <location filename="../../src/onmainwindow.cpp" line="9682"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1061"/>
+        <location filename="../../src/onmainwindow.cpp" line="958"/>
         <source>Operation failed</source>
         <translation>更改密碼失敗</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1065"/>
+        <location filename="../../src/onmainwindow.cpp" line="962"/>
         <source>Password changed</source>
         <translation>密碼已更改成功</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1090"/>
+        <location filename="../../src/onmainwindow.cpp" line="987"/>
         <source>Wrong password!</source>
         <translation>輸入了錯誤的密碼!</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1094"/>
-        <location filename="../../src/onmainwindow.cpp" line="3434"/>
-        <location filename="../../src/onmainwindow.cpp" line="12842"/>
+        <location filename="../../src/onmainwindow.cpp" line="991"/>
+        <location filename="../../src/onmainwindow.cpp" line="3320"/>
+        <location filename="../../src/onmainwindow.cpp" line="12703"/>
         <source>Connecting to broker</source>
         <translation>連線至連線代理伺服器</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1143"/>
+        <location filename="../../src/onmainwindow.cpp" line="1040"/>
         <source><b>Authentication</b></source>
         <translation><b>身份驗證</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1193"/>
+        <location filename="../../src/onmainwindow.cpp" line="1089"/>
         <source>Restore</source>
         <translation>還原</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1195"/>
-        <location filename="../../src/onmainwindow.cpp" line="6232"/>
+        <location filename="../../src/onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="6148"/>
         <source>Not connected</source>
         <translation>尚未連線</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1197"/>
+        <location filename="../../src/onmainwindow.cpp" line="1093"/>
         <source>Multimedia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1199"/>
+        <location filename="../../src/onmainwindow.cpp" line="1095"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1201"/>
+        <location filename="../../src/onmainwindow.cpp" line="1097"/>
         <source>Education</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1203"/>
+        <location filename="../../src/onmainwindow.cpp" line="1099"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1205"/>
+        <location filename="../../src/onmainwindow.cpp" line="1101"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1207"/>
+        <location filename="../../src/onmainwindow.cpp" line="1103"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1209"/>
+        <location filename="../../src/onmainwindow.cpp" line="1105"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1211"/>
+        <location filename="../../src/onmainwindow.cpp" line="1107"/>
         <source>Settings</source>
         <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1213"/>
+        <location filename="../../src/onmainwindow.cpp" line="1109"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1215"/>
+        <location filename="../../src/onmainwindow.cpp" line="1111"/>
         <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1217"/>
+        <location filename="../../src/onmainwindow.cpp" line="1113"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1640,9 +1643,9 @@ Please upgrade to PulseAudio.</source>
         <translation type="obsolete">按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1943"/>
-        <location filename="../../src/onmainwindow.cpp" line="2128"/>
-        <location filename="../../src/onmainwindow.cpp" line="2158"/>
+        <location filename="../../src/onmainwindow.cpp" line="1820"/>
+        <location filename="../../src/onmainwindow.cpp" line="2005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2035"/>
         <source>Please check LDAP settings</source>
         <translation>請確認LDAP的設定</translation>
     </message>
@@ -1671,13 +1674,13 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">X2Go工作階段的連結</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2369"/>
+        <location filename="../../src/onmainwindow.cpp" line="2246"/>
         <source>No X2Go sessions found, closing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12544"/>
-        <location filename="../../src/onmainwindow.cpp" line="12575"/>
+        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="12436"/>
         <source>You have enabled Remote Printing or File Sharing.
 These features require a running and functioning SSH server on your computer.
 <b>Printing and File Sharing will be disabled for this session.</b>
@@ -1686,7 +1689,7 @@ These features require a running and functioning SSH server on your computer.
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12548"/>
+        <location filename="../../src/onmainwindow.cpp" line="12409"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server.
 
 If you see this message, please report a bug on:
@@ -1694,7 +1697,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12553"/>
+        <location filename="../../src/onmainwindow.cpp" line="12414"/>
         <source>The SSH server failed to start.
 
 Please report a bug on:
@@ -1702,14 +1705,14 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12557"/>
-        <location filename="../../src/onmainwindow.cpp" line="12589"/>
+        <location filename="../../src/onmainwindow.cpp" line="12418"/>
+        <location filename="../../src/onmainwindow.cpp" line="12450"/>
         <source><center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12579"/>
+        <location filename="../../src/onmainwindow.cpp" line="12440"/>
         <source>Normally, this should not happen as X2Go Client for Windows ships its own internal SSH server and automatically generates the required keys.
 
 If you see this message, please report a bug on:
@@ -1717,7 +1720,7 @@ If you see this message, please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12585"/>
+        <location filename="../../src/onmainwindow.cpp" line="12446"/>
         <source>X2Go Client was unable to create SSH host keys.
 
 Please report a bug on:
@@ -1725,13 +1728,13 @@ Please report a bug on:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12605"/>
-        <location filename="../../src/onmainwindow.cpp" line="12616"/>
+        <location filename="../../src/onmainwindow.cpp" line="12466"/>
+        <location filename="../../src/onmainwindow.cpp" line="12477"/>
         <source>SSH Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12606"/>
+        <location filename="../../src/onmainwindow.cpp" line="12467"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation type="unfinished"></translation>
@@ -1745,49 +1748,44 @@ used for exporting folders and printers.</source>
         <translation type="obsolete">您確定要刪除此工作階段嗎?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2791"/>
-        <location filename="../../src/onmainwindow.cpp" line="6940"/>
+        <location filename="../../src/onmainwindow.cpp" line="2668"/>
+        <location filename="../../src/onmainwindow.cpp" line="6836"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2878"/>
+        <location filename="../../src/onmainwindow.cpp" line="2755"/>
         <source>RDP connection</source>
         <translation>RDP連線</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2882"/>
-        <location filename="../../src/onmainwindow.cpp" line="3652"/>
+        <location filename="../../src/onmainwindow.cpp" line="2759"/>
+        <location filename="../../src/onmainwindow.cpp" line="3538"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2886"/>
+        <location filename="../../src/onmainwindow.cpp" line="2763"/>
         <source>Connection to local desktop</source>
         <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2890"/>
+        <location filename="../../src/onmainwindow.cpp" line="2767"/>
         <source> on </source>
         <translation> 於 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2949"/>
+        <location filename="../../src/onmainwindow.cpp" line="2826"/>
         <source>Starting connection to server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="2958"/>
-        <source> to </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="3173"/>
+        <location filename="../../src/onmainwindow.cpp" line="3049"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3237"/>
+        <location filename="../../src/onmainwindow.cpp" line="3123"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>主機的SSH密鑰已經更換。
@@ -1806,7 +1804,7 @@ It is now: </source>
         <translation type="obsolete">目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰,這個檔案將會自動被建立。</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3309"/>
+        <location filename="../../src/onmainwindow.cpp" line="3195"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>此為未知的伺服器,您要選擇信任此主機密鑰嗎?
@@ -1817,29 +1815,29 @@ Public key hash: </source>
         <translation type="obsolete">主機密鑰驗證任失敗</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3169"/>
+        <location filename="../../src/onmainwindow.cpp" line="3053"/>
         <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5025"/>
+        <location filename="../../src/onmainwindow.cpp" line="4949"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5026"/>
+        <location filename="../../src/onmainwindow.cpp" line="4950"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3259"/>
-        <location filename="../../src/onmainwindow.cpp" line="3287"/>
+        <location filename="../../src/onmainwindow.cpp" line="3145"/>
+        <location filename="../../src/onmainwindow.cpp" line="3173"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3354"/>
+        <location filename="../../src/onmainwindow.cpp" line="3240"/>
         <source>Authentication failed: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -1848,7 +1846,7 @@ Do you want to update the host key?</source>
         <translation type="obsolete">認證失敗</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3894"/>
+        <location filename="../../src/onmainwindow.cpp" line="3787"/>
         <source>Enter password for SSH proxy</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1859,37 +1857,37 @@ Do you want to update the host key?</source>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3919"/>
-        <location filename="../../src/onmainwindow.cpp" line="5165"/>
-        <location filename="../../src/onmainwindow.cpp" line="5264"/>
-        <location filename="../../src/onmainwindow.cpp" line="7114"/>
-        <location filename="../../src/onmainwindow.cpp" line="7144"/>
-        <location filename="../../src/onmainwindow.cpp" line="8102"/>
-        <location filename="../../src/onmainwindow.cpp" line="8184"/>
-        <location filename="../../src/onmainwindow.cpp" line="8503"/>
-        <location filename="../../src/onmainwindow.cpp" line="8568"/>
-        <location filename="../../src/onmainwindow.cpp" line="9750"/>
+        <location filename="../../src/onmainwindow.cpp" line="3812"/>
+        <location filename="../../src/onmainwindow.cpp" line="5089"/>
+        <location filename="../../src/onmainwindow.cpp" line="5188"/>
+        <location filename="../../src/onmainwindow.cpp" line="7014"/>
+        <location filename="../../src/onmainwindow.cpp" line="7044"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8121"/>
+        <location filename="../../src/onmainwindow.cpp" line="8440"/>
+        <location filename="../../src/onmainwindow.cpp" line="8505"/>
+        <location filename="../../src/onmainwindow.cpp" line="9511"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3931"/>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="3936"/>
-        <location filename="../../src/onmainwindow.cpp" line="8515"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
-        <location filename="../../src/onmainwindow.cpp" line="8520"/>
+        <location filename="../../src/onmainwindow.cpp" line="3824"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="3829"/>
+        <location filename="../../src/onmainwindow.cpp" line="8452"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="8457"/>
         <source>Connection failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3934"/>
-        <location filename="../../src/onmainwindow.cpp" line="8518"/>
+        <location filename="../../src/onmainwindow.cpp" line="3827"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
         <source> - Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4083"/>
+        <location filename="../../src/onmainwindow.cpp" line="3976"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
@@ -1902,41 +1900,41 @@ Do you want to update the host key?</source>
         <translation type="obsolete">伺服器不存在|</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4811"/>
-        <location filename="../../src/onmainwindow.cpp" line="12313"/>
+        <location filename="../../src/onmainwindow.cpp" line="4735"/>
+        <location filename="../../src/onmainwindow.cpp" line="12174"/>
         <source>Select session:</source>
         <translation>請選擇工作階段:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4831"/>
-        <location filename="../../src/onmainwindow.cpp" line="4964"/>
-        <location filename="../../src/onmainwindow.cpp" line="6400"/>
+        <location filename="../../src/onmainwindow.cpp" line="4755"/>
+        <location filename="../../src/onmainwindow.cpp" line="4888"/>
+        <location filename="../../src/onmainwindow.cpp" line="6313"/>
         <source>running</source>
         <translation>正在執行中</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4833"/>
-        <location filename="../../src/onmainwindow.cpp" line="5181"/>
+        <location filename="../../src/onmainwindow.cpp" line="4757"/>
+        <location filename="../../src/onmainwindow.cpp" line="5105"/>
         <source>suspended</source>
         <translation>已暫停</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4763"/>
         <source>Desktop</source>
         <translation>桌面</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4841"/>
+        <location filename="../../src/onmainwindow.cpp" line="4765"/>
         <source>single application</source>
         <translation>單一的應用程式</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4843"/>
+        <location filename="../../src/onmainwindow.cpp" line="4767"/>
         <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4876"/>
+        <location filename="../../src/onmainwindow.cpp" line="4800"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
@@ -1945,20 +1943,20 @@ Do you want to update the host key?</source>
         <translation type="obsolete">目前沒有找到可訪問的工作桌面</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4890"/>
-        <location filename="../../src/onmainwindow.cpp" line="12774"/>
+        <location filename="../../src/onmainwindow.cpp" line="4814"/>
+        <location filename="../../src/onmainwindow.cpp" line="12635"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4897"/>
+        <location filename="../../src/onmainwindow.cpp" line="4821"/>
         <source>Select desktop:</source>
         <translation>請選擇工作桌面:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5011"/>
-        <location filename="../../src/onmainwindow.cpp" line="5969"/>
-        <location filename="../../src/onmainwindow.cpp" line="6659"/>
+        <location filename="../../src/onmainwindow.cpp" line="4935"/>
+        <location filename="../../src/onmainwindow.cpp" line="5887"/>
+        <location filename="../../src/onmainwindow.cpp" line="6559"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
@@ -1975,73 +1973,73 @@ Do you want to update the host key?</source>
         <translation type="obsolete">位元並且重新啟動X-server,之後再重新連接這一個工作階段。<br>請問您無論如何都要恢復此工作階段的連線嗎?</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5115"/>
+        <location filename="../../src/onmainwindow.cpp" line="5039"/>
         <source>suspending</source>
         <translation>正在暫停工作中</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5150"/>
+        <location filename="../../src/onmainwindow.cpp" line="5074"/>
         <source>terminating</source>
         <translation>正在中止工作中</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5297"/>
+        <location filename="../../src/onmainwindow.cpp" line="5221"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5465"/>
-        <location filename="../../src/onmainwindow.cpp" line="5467"/>
+        <location filename="../../src/onmainwindow.cpp" line="5389"/>
+        <location filename="../../src/onmainwindow.cpp" line="5391"/>
         <source>New session started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5504"/>
-        <location filename="../../src/onmainwindow.cpp" line="5506"/>
+        <location filename="../../src/onmainwindow.cpp" line="5428"/>
+        <location filename="../../src/onmainwindow.cpp" line="5430"/>
         <source>Session resumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5743"/>
-        <location filename="../../src/onmainwindow.cpp" line="5747"/>
+        <location filename="../../src/onmainwindow.cpp" line="5667"/>
+        <location filename="../../src/onmainwindow.cpp" line="5671"/>
         <source>Unable to create folder: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5773"/>
-        <location filename="../../src/onmainwindow.cpp" line="5777"/>
+        <location filename="../../src/onmainwindow.cpp" line="5697"/>
+        <location filename="../../src/onmainwindow.cpp" line="5701"/>
         <source>Unable to write file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6244"/>
+        <location filename="../../src/onmainwindow.cpp" line="6159"/>
         <source>Emergency exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6253"/>
+        <location filename="../../src/onmainwindow.cpp" line="6167"/>
         <source>Waiting for proxy to exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7986"/>
-        <location filename="../../src/onmainwindow.cpp" line="7990"/>
-        <location filename="../../src/onmainwindow.cpp" line="7995"/>
+        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7927"/>
+        <location filename="../../src/onmainwindow.cpp" line="7932"/>
         <source>Wrong parameter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8004"/>
+        <location filename="../../src/onmainwindow.cpp" line="7941"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8067"/>
+        <location filename="../../src/onmainwindow.cpp" line="8004"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8077"/>
+        <location filename="../../src/onmainwindow.cpp" line="8014"/>
         <source>Git Info</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2054,8 +2052,8 @@ Do you want to update the host key?</source>
         <translation type="obsolete">檔案無法寫入:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5911"/>
-        <location filename="../../src/onmainwindow.cpp" line="11474"/>
+        <location filename="../../src/onmainwindow.cpp" line="5829"/>
+        <location filename="../../src/onmainwindow.cpp" line="11342"/>
         <source>Attach X2Go window</source>
         <translation>連接X2Go視窗</translation>
     </message>
@@ -2071,29 +2069,29 @@ Do you want to update the host key?</source>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6349"/>
+        <location filename="../../src/onmainwindow.cpp" line="6262"/>
         <source>Finished</source>
         <translation>已完成</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6389"/>
+        <location filename="../../src/onmainwindow.cpp" line="6302"/>
         <source>starting</source>
         <translation>正在開始</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6393"/>
+        <location filename="../../src/onmainwindow.cpp" line="6306"/>
         <source>resuming</source>
         <translation>正在還原</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6465"/>
-        <location filename="../../src/onmainwindow.cpp" line="6786"/>
-        <location filename="../../src/onmainwindow.cpp" line="6805"/>
+        <location filename="../../src/onmainwindow.cpp" line="6376"/>
+        <location filename="../../src/onmainwindow.cpp" line="6682"/>
+        <location filename="../../src/onmainwindow.cpp" line="6701"/>
         <source>Connection timeout, aborting</source>
         <translation>連線超時,中止中</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6466"/>
+        <location filename="../../src/onmainwindow.cpp" line="6377"/>
         <source>aborting</source>
         <translation>中止中</translation>
     </message>
@@ -2103,20 +2101,20 @@ Unsaved documents will be lost</source>
         <translation type="obsolete">您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6754"/>
+        <location filename="../../src/onmainwindow.cpp" line="6652"/>
         <source>Session</source>
         <translation>工作階段</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6756"/>
-        <location filename="../../src/onmainwindow.cpp" line="12394"/>
-        <location filename="../../src/onmainwindow.cpp" line="12416"/>
+        <location filename="../../src/onmainwindow.cpp" line="6654"/>
+        <location filename="../../src/onmainwindow.cpp" line="12255"/>
+        <location filename="../../src/onmainwindow.cpp" line="12277"/>
         <source>Display</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6758"/>
-        <location filename="../../src/onmainwindow.cpp" line="12405"/>
+        <location filename="../../src/onmainwindow.cpp" line="6656"/>
+        <location filename="../../src/onmainwindow.cpp" line="12266"/>
         <source>Creation time</source>
         <translation>創建時間</translation>
     </message>
@@ -2129,7 +2127,7 @@ Unsaved documents will be lost</source>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7692"/>
+        <location filename="../../src/onmainwindow.cpp" line="7597"/>
         <source> (can't open file)</source>
         <translation> (無法開啟檔案)</translation>
     </message>
@@ -2186,7 +2184,7 @@ Unsaved documents will be lost</source>
         <translation type="obsolete">可用的包裝方法:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8802"/>
+        <location filename="../../src/onmainwindow.cpp" line="8739"/>
         <source>Support</source>
         <translation>支援</translation>
     </message>
@@ -2207,7 +2205,7 @@ Unsaved documents will be lost</source>
         <translation type="obsolete">沒有發現合法的卡片</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <location filename="../../src/onmainwindow.cpp" line="9148"/>
         <source>Card not configured.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2216,9 +2214,8 @@ Unsaved documents will be lost</source>
         <translation type="obsolete">X2Go系統無法辨識此張卡片</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9303"/>
         <source>Unable to create file: </source>
-        <translation>檔案無法創建:</translation>
+        <translation type="vanished">檔案無法創建:</translation>
     </message>
     <message>
         <source>Can't connect to X-Server</source>
@@ -2245,8 +2242,8 @@ Please check your installation</source>
 請檢查X伺服器安是否有安裝正確</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9769"/>
-        <location filename="../../src/onmainwindow.cpp" line="9774"/>
+        <location filename="../../src/onmainwindow.cpp" line="9530"/>
+        <location filename="../../src/onmainwindow.cpp" line="9535"/>
         <source>Unable to execute: </source>
         <translation>無法執行:</translation>
     </message>
@@ -2268,17 +2265,17 @@ Please update to a newer x2goserver package</source>
 </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10020"/>
+        <location filename="../../src/onmainwindow.cpp" line="9781"/>
         <source>WINDOWS-1252</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10032"/>
+        <location filename="../../src/onmainwindow.cpp" line="9793"/>
         <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11568"/>
+        <location filename="../../src/onmainwindow.cpp" line="11429"/>
         <source>X2Go Session</source>
         <translation>X2Go工作階段</translation>
     </message>
@@ -2287,137 +2284,137 @@ Please update to a newer x2goserver package</source>
         <translation type="obsolete">錯誤的"speed"參數值</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11949"/>
+        <location filename="../../src/onmainwindow.cpp" line="11810"/>
         <source>Password:</source>
         <translation>密碼:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11950"/>
+        <location filename="../../src/onmainwindow.cpp" line="11811"/>
         <source>Keyboard layout:</source>
         <translation>鑑盤佈局:</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11991"/>
+        <location filename="../../src/onmainwindow.cpp" line="11852"/>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11993"/>
-        <location filename="../../src/onmainwindow.cpp" line="12317"/>
-        <location filename="../../src/onmainwindow.cpp" line="12319"/>
+        <location filename="../../src/onmainwindow.cpp" line="11854"/>
+        <location filename="../../src/onmainwindow.cpp" line="12178"/>
+        <location filename="../../src/onmainwindow.cpp" line="12180"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12130"/>
+        <location filename="../../src/onmainwindow.cpp" line="11991"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation><b>工作階段識別碼:<br>伺服器:<br>使用者名稱:<br>顯示:<br>創建時間:<br>狀態:</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="710"/>
-        <source>Applications...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../../src/onmainwindow.cpp" line="61"/>
         <source>Starting X2Go Client %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="286"/>
+        <location filename="../../src/onmainwindow.cpp" line="278"/>
         <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="438"/>
-        <location filename="../../src/onmainwindow.cpp" line="8827"/>
+        <location filename="../../src/onmainwindow.cpp" line="430"/>
+        <location filename="../../src/onmainwindow.cpp" line="8760"/>
         <source>About X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="545"/>
+        <location filename="../../src/onmainwindow.cpp" line="562"/>
         <source>Started X2Go Client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="627"/>
-        <location filename="../../src/onmainwindow.cpp" line="655"/>
+        <location filename="../../src/onmainwindow.cpp" line="659"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
         <source> found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="661"/>
+        <location filename="../../src/onmainwindow.cpp" line="693"/>
         <source>Non-fatal: can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="662"/>
+        <location filename="../../src/onmainwindow.cpp" line="694"/>
         <source>Trying to load language with lower preference, if existent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="913"/>
+        <location filename="../../src/onmainwindow.cpp" line="810"/>
         <source>Session management ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="924"/>
+        <location filename="../../src/onmainwindow.cpp" line="821"/>
         <source>&Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="933"/>
+        <location filename="../../src/onmainwindow.cpp" line="830"/>
         <source>&Set broker password ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="944"/>
+        <location filename="../../src/onmainwindow.cpp" line="841"/>
         <source>&Connectivity test ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1223"/>
-        <location filename="../../src/onmainwindow.cpp" line="12147"/>
+        <location filename="../../src/onmainwindow.cpp" line="1119"/>
+        <location filename="../../src/onmainwindow.cpp" line="12008"/>
         <source>Share folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1259"/>
+        <location filename="../../src/onmainwindow.cpp" line="1155"/>
         <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1445"/>
+        <location filename="../../src/onmainwindow.cpp" line="1340"/>
         <source>Closing X2Go Client ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1621"/>
+        <location filename="../../src/onmainwindow.cpp" line="1498"/>
         <source>Finished X2Go Client closing hooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1894"/>
+        <location filename="../../src/onmainwindow.cpp" line="1771"/>
         <source>Broker authentication failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="1978"/>
+        <location filename="../../src/onmainwindow.cpp" line="1855"/>
         <source>no X2Go Server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <location filename="../../src/onmainwindow.cpp" line="2879"/>
         <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3081"/>
+        <location filename="../../src/onmainwindow.cpp" line="2960"/>
         <source>Couldn't find an SSH connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3238"/>
+        <location filename="../../src/onmainwindow.cpp" line="3057"/>
+        <source>Enter user account password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3124"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection attempt.
@@ -2426,17 +2423,17 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3242"/>
-        <location filename="../../src/onmainwindow.cpp" line="3253"/>
-        <location filename="../../src/onmainwindow.cpp" line="3270"/>
-        <location filename="../../src/onmainwindow.cpp" line="3281"/>
-        <location filename="../../src/onmainwindow.cpp" line="3313"/>
-        <location filename="../../src/onmainwindow.cpp" line="3325"/>
+        <location filename="../../src/onmainwindow.cpp" line="3128"/>
+        <location filename="../../src/onmainwindow.cpp" line="3139"/>
+        <location filename="../../src/onmainwindow.cpp" line="3156"/>
+        <location filename="../../src/onmainwindow.cpp" line="3167"/>
+        <location filename="../../src/onmainwindow.cpp" line="3199"/>
+        <location filename="../../src/onmainwindow.cpp" line="3211"/>
         <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3265"/>
+        <location filename="../../src/onmainwindow.cpp" line="3151"/>
         <source>The host key for this server was not found but another type of key exists. An attacker might have changed the default server key to trick your client into thinking the key does not exist yet.
 For security reasons, it is recommended to stop the connection attempt.
 Do you want to terminate the connection?
@@ -2444,309 +2441,336 @@ Do you want to terminate the connection?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3304"/>
+        <location filename="../../src/onmainwindow.cpp" line="3190"/>
         <source>Could not find known hosts file. If you accept the host key here, the file will be automatically created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3359"/>
+        <location filename="../../src/onmainwindow.cpp" line="3245"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3651"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
         <source>XDM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3657"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
         <source>RDP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="3916"/>
-        <location filename="../../src/onmainwindow.cpp" line="5162"/>
-        <location filename="../../src/onmainwindow.cpp" line="5261"/>
-        <location filename="../../src/onmainwindow.cpp" line="5294"/>
-        <location filename="../../src/onmainwindow.cpp" line="8099"/>
-        <location filename="../../src/onmainwindow.cpp" line="8181"/>
-        <location filename="../../src/onmainwindow.cpp" line="8500"/>
-        <location filename="../../src/onmainwindow.cpp" line="8564"/>
-        <location filename="../../src/onmainwindow.cpp" line="9747"/>
+        <location filename="../../src/onmainwindow.cpp" line="3809"/>
+        <location filename="../../src/onmainwindow.cpp" line="5086"/>
+        <location filename="../../src/onmainwindow.cpp" line="5185"/>
+        <location filename="../../src/onmainwindow.cpp" line="5218"/>
+        <location filename="../../src/onmainwindow.cpp" line="8036"/>
+        <location filename="../../src/onmainwindow.cpp" line="8118"/>
+        <location filename="../../src/onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8501"/>
+        <location filename="../../src/onmainwindow.cpp" line="9508"/>
         <source><b>Connection failed.</b>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4151"/>
+        <location filename="../../src/onmainwindow.cpp" line="4046"/>
         <source>No server available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4160"/>
-        <location filename="../../src/onmainwindow.cpp" line="4525"/>
-        <location filename="../../src/onmainwindow.cpp" line="5089"/>
-        <location filename="../../src/onmainwindow.cpp" line="5239"/>
+        <location filename="../../src/onmainwindow.cpp" line="4055"/>
+        <location filename="../../src/onmainwindow.cpp" line="4435"/>
+        <location filename="../../src/onmainwindow.cpp" line="5013"/>
+        <location filename="../../src/onmainwindow.cpp" line="5163"/>
         <source>Server not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="4877"/>
+        <location filename="../../src/onmainwindow.cpp" line="4801"/>
         <source>No accessible desktop found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5408"/>
+        <location filename="../../src/onmainwindow.cpp" line="5332"/>
         <source>PulseAudio is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5409"/>
+        <location filename="../../src/onmainwindow.cpp" line="5333"/>
         <source>Sound output will be disabled for this session. Please enable PulseAudio in the configuration dialog or disable sound in the session settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5937"/>
+        <location filename="../../src/onmainwindow.cpp" line="5855"/>
         <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5967"/>
+        <location filename="../../src/onmainwindow.cpp" line="5885"/>
         <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6093"/>
-        <location filename="../../src/onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="6016"/>
+        <location filename="../../src/onmainwindow.cpp" line="9025"/>
         <source>failed to start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6094"/>
+        <location filename="../../src/onmainwindow.cpp" line="6017"/>
         <source>This likely means the binary is not available.
 The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6108"/>
+        <location filename="../../src/onmainwindow.cpp" line="6031"/>
         <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6109"/>
+        <location filename="../../src/onmainwindow.cpp" line="6032"/>
         <source>Execution failed, exit code was: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6114"/>
+        <location filename="../../src/onmainwindow.cpp" line="6037"/>
         <source>didn't start up in time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6115"/>
-        <location filename="../../src/onmainwindow.cpp" line="9162"/>
+        <location filename="../../src/onmainwindow.cpp" line="6038"/>
+        <location filename="../../src/onmainwindow.cpp" line="9039"/>
         <source>This error shouldn't come up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6119"/>
-        <location filename="../../src/onmainwindow.cpp" line="9166"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="9043"/>
         <source>didn't accept a write operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6120"/>
-        <location filename="../../src/onmainwindow.cpp" line="6125"/>
-        <location filename="../../src/onmainwindow.cpp" line="9167"/>
-        <location filename="../../src/onmainwindow.cpp" line="9172"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <location filename="../../src/onmainwindow.cpp" line="6048"/>
+        <location filename="../../src/onmainwindow.cpp" line="9044"/>
+        <location filename="../../src/onmainwindow.cpp" line="9049"/>
         <source>It is probably not running correctly or crashed in-between.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6124"/>
+        <location filename="../../src/onmainwindow.cpp" line="6047"/>
         <source>Unable to read from xmodmap.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6129"/>
-        <location filename="../../src/onmainwindow.cpp" line="9176"/>
+        <location filename="../../src/onmainwindow.cpp" line="6052"/>
+        <location filename="../../src/onmainwindow.cpp" line="9053"/>
         <source>encountered an unknown error during start up or execution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6133"/>
-        <location filename="../../src/onmainwindow.cpp" line="9180"/>
+        <location filename="../../src/onmainwindow.cpp" line="6056"/>
+        <location filename="../../src/onmainwindow.cpp" line="9057"/>
         <source>experienced an undefined error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6142"/>
-        <location filename="../../src/onmainwindow.cpp" line="9189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6065"/>
+        <location filename="../../src/onmainwindow.cpp" line="9066"/>
         <source>X2Go Client will now terminate.
 
 File a bug report as outlined on the <a href="http://wiki.x2go.org/doku.php/wiki:bugs">bugs wiki page</a>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6155"/>
+        <location filename="../../src/onmainwindow.cpp" line="6078"/>
         <source>Failed to start RDP or XDMCP client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6156"/>
+        <location filename="../../src/onmainwindow.cpp" line="6079"/>
         <source>Check session settings and ensure that selected client is installed on your system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6256"/>
+        <location filename="../../src/onmainwindow.cpp" line="6170"/>
         <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6302"/>
-        <location filename="../../src/onmainwindow.cpp" line="9784"/>
+        <location filename="../../src/onmainwindow.cpp" line="6215"/>
+        <location filename="../../src/onmainwindow.cpp" line="9545"/>
         <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6307"/>
-        <location filename="../../src/onmainwindow.cpp" line="9789"/>
+        <location filename="../../src/onmainwindow.cpp" line="6220"/>
+        <location filename="../../src/onmainwindow.cpp" line="9550"/>
         <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="6660"/>
+        <location filename="../../src/onmainwindow.cpp" line="6560"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7111"/>
-        <location filename="../../src/onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7011"/>
+        <location filename="../../src/onmainwindow.cpp" line="7041"/>
         <source><b>Connection failed.</b>
 :
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7704"/>
-        <location filename="../../src/onmainwindow.cpp" line="7715"/>
-        <location filename="../../src/onmainwindow.cpp" line="7726"/>
-        <location filename="../../src/onmainwindow.cpp" line="7765"/>
+        <location filename="../../src/onmainwindow.cpp" line="7609"/>
+        <location filename="../../src/onmainwindow.cpp" line="7620"/>
+        <location filename="../../src/onmainwindow.cpp" line="7631"/>
+        <location filename="../../src/onmainwindow.cpp" line="7670"/>
         <source> (file does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7753"/>
+        <location filename="../../src/onmainwindow.cpp" line="7658"/>
         <source> (directory does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7791"/>
+        <location filename="../../src/onmainwindow.cpp" line="7728"/>
         <source>Invalid value for parameter "--link".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7808"/>
+        <location filename="../../src/onmainwindow.cpp" line="7745"/>
         <source>Invalid value for parameter "--clipboard".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7824"/>
+        <location filename="../../src/onmainwindow.cpp" line="7761"/>
         <source>Invalid value for parameter "--sound".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7840"/>
-        <location filename="../../src/onmainwindow.cpp" line="7850"/>
+        <location filename="../../src/onmainwindow.cpp" line="7777"/>
+        <location filename="../../src/onmainwindow.cpp" line="7787"/>
         <source>Invalid value for parameter "--geometry".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7867"/>
+        <location filename="../../src/onmainwindow.cpp" line="7804"/>
         <source>Invalid value for parameter "--set-kbd".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7883"/>
+        <location filename="../../src/onmainwindow.cpp" line="7820"/>
         <source>Invalid value for parameter "--ldap".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7904"/>
+        <location filename="../../src/onmainwindow.cpp" line="7841"/>
         <source>Invalid value for parameter "--ldap1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7923"/>
+        <location filename="../../src/onmainwindow.cpp" line="7860"/>
         <source>Invalid value for parameter "--ldap2".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="7977"/>
+        <location filename="../../src/onmainwindow.cpp" line="7914"/>
         <source>Invalid value for parameter "--pack".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8012"/>
+        <location filename="../../src/onmainwindow.cpp" line="7949"/>
         <source>Available pack methods:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8034"/>
+        <location filename="../../src/onmainwindow.cpp" line="7971"/>
         <source>Pack Methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8064"/>
-        <location filename="../../src/onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8001"/>
+        <location filename="../../src/onmainwindow.cpp" line="8011"/>
         <source>Option is not available in this build.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8456"/>
+        <location filename="../../src/onmainwindow.cpp" line="8393"/>
         <source>Unable to create directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8807"/>
+        <location filename="../../src/onmainwindow.cpp" line="8744"/>
         <source><br>(C) 2005-2017 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9881"/>
+        <location filename="../../src/onmainwindow.cpp" line="9026"/>
+        <source>Check whether the package providing "pcsc_scan" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9642"/>
         <source>Unable to create or append to file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9901"/>
+        <location filename="../../src/onmainwindow.cpp" line="9662"/>
         <source>Unable to change the permissions of file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9902"/>
+        <location filename="../../src/onmainwindow.cpp" line="9663"/>
         <source>This is an error because sshd would deny such a file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9919"/>
+        <location filename="../../src/onmainwindow.cpp" line="9680"/>
         <source>Unable to change the permissions of directory: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9920"/>
+        <location filename="../../src/onmainwindow.cpp" line="9681"/>
         <source>This is an error because sshd would deny such a directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10620"/>
+        <location filename="../../src/onmainwindow.cpp" line="10120"/>
+        <location filename="../../src/onmainwindow.cpp" line="10203"/>
+        <source>Can't start X.Org Server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10122"/>
+        <location filename="../../src/onmainwindow.cpp" line="10153"/>
+        <location filename="../../src/onmainwindow.cpp" line="10205"/>
+        <source>Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../../src/onmainwindow.cpp" line="10151"/>
+        <source>X.Org Server did not launch correctly after %n tries.</source>
+        <comment>%n will be substituted with the current number of tries</comment>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10480"/>
         <source>Unable to find the sftp-server binary. Neither bundled, nor found in $PATH nor additional directories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10621"/>
+        <location filename="../../src/onmainwindow.cpp" line="10481"/>
         <source>If you are using a Linux-based operating system, please ask your system administrator to install the package containing the sftp-server binary. Common names are <b>openssh</b>, <b>openssh-server</b> or <b>openssh-sftp-server</b> depending upon distribution.
 
 If the sftp-server binary is installed on your system, please report a bug mentioning its path on:
@@ -2755,106 +2779,101 @@ If the sftp-server binary is installed on your system, please report a bug menti
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10663"/>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
         <source>SSH key type selection error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10664"/>
+        <location filename="../../src/onmainwindow.cpp" line="10524"/>
         <source>Unknown SSH key selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10666"/>
-        <location filename="../../src/onmainwindow.cpp" line="10742"/>
-        <location filename="../../src/onmainwindow.cpp" line="10821"/>
-        <location filename="../../src/onmainwindow.cpp" line="10829"/>
-        <location filename="../../src/onmainwindow.cpp" line="10839"/>
+        <location filename="../../src/onmainwindow.cpp" line="10526"/>
+        <location filename="../../src/onmainwindow.cpp" line="10602"/>
+        <location filename="../../src/onmainwindow.cpp" line="10681"/>
+        <location filename="../../src/onmainwindow.cpp" line="10689"/>
+        <location filename="../../src/onmainwindow.cpp" line="10699"/>
         <source>Terminating application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10739"/>
+        <location filename="../../src/onmainwindow.cpp" line="10599"/>
         <source>SSH key base directory creation error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10740"/>
+        <location filename="../../src/onmainwindow.cpp" line="10600"/>
         <source>Unable to create SSH key base directory '%1'.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10818"/>
+        <location filename="../../src/onmainwindow.cpp" line="10678"/>
         <source>ssh-keygen launching error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10819"/>
+        <location filename="../../src/onmainwindow.cpp" line="10679"/>
         <source>Unable to start the ssh-keygen binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10826"/>
+        <location filename="../../src/onmainwindow.cpp" line="10686"/>
         <source>ssh-keygen crashed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10827"/>
+        <location filename="../../src/onmainwindow.cpp" line="10687"/>
         <source>The ssh-keygen binary crashed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10834"/>
+        <location filename="../../src/onmainwindow.cpp" line="10694"/>
         <source>ssh-keygen program error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10835"/>
+        <location filename="../../src/onmainwindow.cpp" line="10695"/>
         <source>The ssh-keygen binary did not exit cleanly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10837"/>
+        <location filename="../../src/onmainwindow.cpp" line="10697"/>
         <source>It was probably called with unknown arguments.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10896"/>
+        <location filename="../../src/onmainwindow.cpp" line="10756"/>
         <source>Unable to open newly generated %1 public host key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10916"/>
+        <location filename="../../src/onmainwindow.cpp" line="10776"/>
         <source>%1 public host key file empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="10922"/>
+        <location filename="../../src/onmainwindow.cpp" line="10782"/>
         <source>Cannot open key: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12984"/>
+        <location filename="../../src/onmainwindow.cpp" line="12845"/>
         <source>libssh initialization failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12985"/>
+        <location filename="../../src/onmainwindow.cpp" line="12846"/>
         <source>Unable to initialize libssh.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8810"/>
-        <source><br>X2Go Plugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH (Freiburg)</a><br></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="5012"/>
+        <location filename="../../src/onmainwindow.cpp" line="4936"/>
         <source>Your current color depth is different from the session's color depth. This may cause problems reconnecting to this session and in most cases <b>you will lose the session</b> and have to start a new one! </source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../../src/onmainwindow.cpp" line="5017"/>
+        <location filename="../../src/onmainwindow.cpp" line="4941"/>
         <source>It's highly recommended to change the color depth of your display to %n bit(s) and restart your X.Org Server before you reconnect to this X2Go session.</source>
         <comment>%n will be replaced with a number</comment>
         <translation type="unfinished">
@@ -2862,182 +2881,174 @@ If the sftp-server binary is installed on your system, please report a bug menti
         </translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="5023"/>
+        <location filename="../../src/onmainwindow.cpp" line="4947"/>
         <source><br />Do you want to resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8814"/>
+        <location filename="../../src/onmainwindow.cpp" line="8747"/>
         <source><br>This is a client to access the X2Go network-based computing environment. This client will be able to connect to X2Go Server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore, it can be used as a fullscreen login screen (replacement for login managers like XDM). Please visit <a href="http://www.x2go.org&qu [...]
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8828"/>
+        <location filename="../../src/onmainwindow.cpp" line="8761"/>
         <source><b>X2Go Client v. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="8873"/>
+        <location filename="../../src/onmainwindow.cpp" line="8806"/>
         <source>Please check LDAP Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9135"/>
-        <source>Check whether the package providing "scdaemon" is installed.
-The current search path is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../src/onmainwindow.cpp" line="9161"/>
+        <location filename="../../src/onmainwindow.cpp" line="9038"/>
         <source>didn't start yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9171"/>
+        <location filename="../../src/onmainwindow.cpp" line="9048"/>
         <source>Unable to read from scdaemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9219"/>
+        <location filename="../../src/onmainwindow.cpp" line="9096"/>
         <source>No valid card found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9152"/>
         <source>This card is unknown to the X2Go system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9603"/>
-        <location filename="../../src/onmainwindow.cpp" line="10318"/>
-        <location filename="../../src/onmainwindow.cpp" line="10348"/>
+        <location filename="../../src/onmainwindow.cpp" line="9364"/>
         <source>Can't start X.Org Server.
 Please check your installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9805"/>
+        <location filename="../../src/onmainwindow.cpp" line="9566"/>
         <source>Remote server does not support file system exports through SSH tunnels.
 Please update your x2goserver package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9830"/>
+        <location filename="../../src/onmainwindow.cpp" line="9591"/>
         <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="9859"/>
+        <location filename="../../src/onmainwindow.cpp" line="9620"/>
         <source>Unable to read:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11280"/>
+        <location filename="../../src/onmainwindow.cpp" line="11141"/>
         <source>Error getting window geometry. (Did you close the window?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="11769"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
         <source>Invalid value for argument "speed"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12140"/>
+        <location filename="../../src/onmainwindow.cpp" line="12001"/>
         <source>Applications ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12153"/>
+        <location filename="../../src/onmainwindow.cpp" line="12014"/>
         <source>Abort</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12165"/>
+        <location filename="../../src/onmainwindow.cpp" line="12026"/>
         <source>Show details</source>
         <translation>顯示細節</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12315"/>
+        <location filename="../../src/onmainwindow.cpp" line="12176"/>
         <source>Resume</source>
         <translation>恢復</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12327"/>
+        <location filename="../../src/onmainwindow.cpp" line="12188"/>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12330"/>
+        <location filename="../../src/onmainwindow.cpp" line="12191"/>
         <source>Full access</source>
         <translation>完全存取</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12333"/>
+        <location filename="../../src/onmainwindow.cpp" line="12194"/>
         <source>View only</source>
         <translation>僅查看</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12396"/>
+        <location filename="../../src/onmainwindow.cpp" line="12257"/>
         <source>Status</source>
         <translation>狀態</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12398"/>
+        <location filename="../../src/onmainwindow.cpp" line="12259"/>
         <source>Command</source>
         <translation>指令</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12400"/>
+        <location filename="../../src/onmainwindow.cpp" line="12261"/>
         <source>Type</source>
         <translation>型態</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12402"/>
+        <location filename="../../src/onmainwindow.cpp" line="12263"/>
         <source>Server</source>
         <translation>伺服器</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12407"/>
+        <location filename="../../src/onmainwindow.cpp" line="12268"/>
         <source>Client IP</source>
         <translation>客戶端IP</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12409"/>
+        <location filename="../../src/onmainwindow.cpp" line="12270"/>
         <source>Session ID</source>
         <translation>工作階段識別碼</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12413"/>
+        <location filename="../../src/onmainwindow.cpp" line="12274"/>
         <source>User</source>
         <translation>使用者</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12444"/>
+        <location filename="../../src/onmainwindow.cpp" line="12305"/>
         <source>Only my desktops</source>
         <translation>只選擇我的桌面</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12542"/>
+        <location filename="../../src/onmainwindow.cpp" line="12403"/>
         <source>SSH daemon could not be started.
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12560"/>
-        <location filename="../../src/onmainwindow.cpp" line="12593"/>
+        <location filename="../../src/onmainwindow.cpp" line="12421"/>
+        <location filename="../../src/onmainwindow.cpp" line="12454"/>
         <source>Disabling Remote Printing or File Sharing support in the session settings will get rid of this message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12573"/>
+        <location filename="../../src/onmainwindow.cpp" line="12434"/>
         <source>SSH daemon failed to open its public host key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12617"/>
+        <location filename="../../src/onmainwindow.cpp" line="12478"/>
         <source>SSH daemon failed to open the application's
 authorized_keys file.</source>
         <translation type="unfinished"></translation>
@@ -3051,12 +3062,12 @@ you can install sshd with
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12658"/>
+        <location filename="../../src/onmainwindow.cpp" line="12519"/>
         <source>Restore toolbar</source>
         <translation>還原工具列</translation>
     </message>
     <message>
-        <location filename="../../src/onmainwindow.cpp" line="12704"/>
+        <location filename="../../src/onmainwindow.cpp" line="12565"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;按此按鈕&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;還原工具列&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -3295,80 +3306,80 @@ Example:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="931"/>
+        <location filename="../../src/pulsemanager.cpp" line="933"/>
         <source>PulseAudio failed to start!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="411"/>
-        <location filename="../../src/pulsemanager.cpp" line="436"/>
-        <location filename="../../src/pulsemanager.cpp" line="454"/>
-        <location filename="../../src/pulsemanager.cpp" line="469"/>
-        <location filename="../../src/pulsemanager.cpp" line="483"/>
-        <location filename="../../src/pulsemanager.cpp" line="501"/>
-        <location filename="../../src/pulsemanager.cpp" line="515"/>
-        <location filename="../../src/pulsemanager.cpp" line="540"/>
-        <location filename="../../src/pulsemanager.cpp" line="547"/>
+        <location filename="../../src/pulsemanager.cpp" line="413"/>
+        <location filename="../../src/pulsemanager.cpp" line="438"/>
+        <location filename="../../src/pulsemanager.cpp" line="456"/>
+        <location filename="../../src/pulsemanager.cpp" line="471"/>
+        <location filename="../../src/pulsemanager.cpp" line="485"/>
+        <location filename="../../src/pulsemanager.cpp" line="503"/>
+        <location filename="../../src/pulsemanager.cpp" line="517"/>
+        <location filename="../../src/pulsemanager.cpp" line="542"/>
+        <location filename="../../src/pulsemanager.cpp" line="549"/>
         <source>Error fetching PulseAudio version number!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="412"/>
+        <location filename="../../src/pulsemanager.cpp" line="414"/>
         <source>Unexpected character found when parsing version string for major version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="437"/>
+        <location filename="../../src/pulsemanager.cpp" line="439"/>
         <source>Unexpected character found when parsing version string for minor version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="455"/>
+        <location filename="../../src/pulsemanager.cpp" line="457"/>
         <source>Unexpected character found when parsing version string for micro version number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="470"/>
+        <location filename="../../src/pulsemanager.cpp" line="472"/>
         <source>Supposed to skip major version number. Something is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="484"/>
+        <location filename="../../src/pulsemanager.cpp" line="486"/>
         <source>Unable to convert major version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="502"/>
+        <location filename="../../src/pulsemanager.cpp" line="504"/>
         <source>Unable to convert minor version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="516"/>
+        <location filename="../../src/pulsemanager.cpp" line="518"/>
         <source>Unable to convert micro version number string to integer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="541"/>
+        <location filename="../../src/pulsemanager.cpp" line="543"/>
         <source>Unexpected format encountered.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="548"/>
+        <location filename="../../src/pulsemanager.cpp" line="550"/>
         <source>Unable to start PulseAudio binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="928"/>
+        <location filename="../../src/pulsemanager.cpp" line="930"/>
         <source>Unable to play startup sound.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="932"/>
+        <location filename="../../src/pulsemanager.cpp" line="934"/>
         <source>Sound support will not be available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/pulsemanager.cpp" line="935"/>
+        <location filename="../../src/pulsemanager.cpp" line="937"/>
         <source>If you downloaded the bundled, pre-compiled version from the official home page or the upstream Linux packages, please report a bug on:
 <center><a href="https://wiki.x2go.org/doku.php/wiki:bugs">https://wiki.x2go.org/doku.php/wiki:bugs</a></center>
 </source>
@@ -3437,127 +3448,127 @@ or
         <translation type="obsolete">在桌面上建立工作階段圖示</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="153"/>
+        <location filename="../../src/sessionbutton.cpp" line="154"/>
         <source>Session preferences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="157"/>
+        <location filename="../../src/sessionbutton.cpp" line="158"/>
         <source>Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Delete session</source>
         <translation>刪除工作階段</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="175"/>
+        <location filename="../../src/sessionbutton.cpp" line="176"/>
         <source>Session actions</source>
         <translation>工作階段動作</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="176"/>
+        <location filename="../../src/sessionbutton.cpp" line="177"/>
         <source>Select type</source>
         <translation>選擇類型</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="178"/>
+        <location filename="../../src/sessionbutton.cpp" line="179"/>
         <source>Select resolution</source>
         <translation>選擇解析度</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="179"/>
+        <location filename="../../src/sessionbutton.cpp" line="180"/>
         <source>Toggle sound support</source>
         <translation>切換聲音支援</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="307"/>
         <source>New Session</source>
         <translation>新工作階段</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="328"/>
+        <location filename="../../src/sessionbutton.cpp" line="329"/>
         <source>running</source>
         <translation>執行中</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="332"/>
+        <location filename="../../src/sessionbutton.cpp" line="333"/>
         <source>suspended</source>
         <translation>已暫停</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="365"/>
+        <location filename="../../src/sessionbutton.cpp" line="366"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="385"/>
-        <location filename="../../src/sessionbutton.cpp" line="459"/>
-        <location filename="../../src/sessionbutton.cpp" line="790"/>
+        <location filename="../../src/sessionbutton.cpp" line="387"/>
+        <location filename="../../src/sessionbutton.cpp" line="466"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
         <source>RDP connection</source>
         <translation>RDP連線</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="386"/>
-        <location filename="../../src/sessionbutton.cpp" line="472"/>
-        <location filename="../../src/sessionbutton.cpp" line="796"/>
+        <location filename="../../src/sessionbutton.cpp" line="388"/>
+        <location filename="../../src/sessionbutton.cpp" line="479"/>
+        <location filename="../../src/sessionbutton.cpp" line="854"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="387"/>
-        <location filename="../../src/sessionbutton.cpp" line="448"/>
-        <location filename="../../src/sessionbutton.cpp" line="784"/>
+        <location filename="../../src/sessionbutton.cpp" line="389"/>
+        <location filename="../../src/sessionbutton.cpp" line="455"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Connection to local desktop</source>
         <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="388"/>
-        <location filename="../../src/sessionbutton.cpp" line="477"/>
-        <location filename="../../src/sessionbutton.cpp" line="842"/>
+        <location filename="../../src/sessionbutton.cpp" line="390"/>
+        <location filename="../../src/sessionbutton.cpp" line="484"/>
+        <location filename="../../src/sessionbutton.cpp" line="905"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="501"/>
-        <location filename="../../src/sessionbutton.cpp" line="526"/>
-        <location filename="../../src/sessionbutton.cpp" line="863"/>
+        <location filename="../../src/sessionbutton.cpp" line="508"/>
+        <location filename="../../src/sessionbutton.cpp" line="533"/>
+        <location filename="../../src/sessionbutton.cpp" line="926"/>
         <source>fullscreen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="506"/>
-        <location filename="../../src/sessionbutton.cpp" line="535"/>
-        <location filename="../../src/sessionbutton.cpp" line="539"/>
-        <location filename="../../src/sessionbutton.cpp" line="875"/>
-        <location filename="../../src/sessionbutton.cpp" line="878"/>
+        <location filename="../../src/sessionbutton.cpp" line="513"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="938"/>
+        <location filename="../../src/sessionbutton.cpp" line="941"/>
         <source>Display </source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="521"/>
-        <location filename="../../src/sessionbutton.cpp" line="560"/>
+        <location filename="../../src/sessionbutton.cpp" line="528"/>
+        <location filename="../../src/sessionbutton.cpp" line="567"/>
         <source>window</source>
         <translation>視窗</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="567"/>
-        <location filename="../../src/sessionbutton.cpp" line="571"/>
-        <location filename="../../src/sessionbutton.cpp" line="572"/>
-        <location filename="../../src/sessionbutton.cpp" line="869"/>
+        <location filename="../../src/sessionbutton.cpp" line="574"/>
+        <location filename="../../src/sessionbutton.cpp" line="578"/>
+        <location filename="../../src/sessionbutton.cpp" line="579"/>
+        <location filename="../../src/sessionbutton.cpp" line="932"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="581"/>
-        <location filename="../../src/sessionbutton.cpp" line="711"/>
+        <location filename="../../src/sessionbutton.cpp" line="588"/>
+        <location filename="../../src/sessionbutton.cpp" line="764"/>
         <source>Enabled</source>
         <translation>啟用</translation>
     </message>
     <message>
-        <location filename="../../src/sessionbutton.cpp" line="583"/>
-        <location filename="../../src/sessionbutton.cpp" line="713"/>
+        <location filename="../../src/sessionbutton.cpp" line="590"/>
+        <location filename="../../src/sessionbutton.cpp" line="766"/>
         <source>Disabled</source>
         <translation>停用</translation>
     </message>
@@ -3698,7 +3709,7 @@ Use X2Go Client's hidden mode?</source>
     </message>
     <message>
         <location filename="../../src/sessionwidget.cpp" line="125"/>
-        <location filename="../../src/sessionwidget.cpp" line="415"/>
+        <location filename="../../src/sessionwidget.cpp" line="416"/>
         <source>SSH port:</source>
         <translation>SSH連接埠:</translation>
     </message>
@@ -3758,8 +3769,8 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="336"/>
-        <location filename="../../src/sessionwidget.cpp" line="466"/>
+        <location filename="../../src/sessionwidget.cpp" line="337"/>
+        <location filename="../../src/sessionwidget.cpp" line="467"/>
         <source>X2Go Client is running in portable mode. You should use a path on your USB device to be able to access your data wherever you are.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3788,72 +3799,72 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">連線至微軟終端伺服器</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="225"/>
-        <location filename="../../src/sessionwidget.cpp" line="381"/>
+        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="382"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="226"/>
+        <location filename="../../src/sessionwidget.cpp" line="227"/>
         <source>Connect to local desktop</source>
         <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="227"/>
+        <location filename="../../src/sessionwidget.cpp" line="228"/>
         <source>Custom desktop</source>
         <translation>自訂桌面類型</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="228"/>
+        <location filename="../../src/sessionwidget.cpp" line="229"/>
         <source>Single application</source>
         <translation>單一應用程式</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="229"/>
+        <location filename="../../src/sessionwidget.cpp" line="230"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="231"/>
-        <location filename="../../src/sessionwidget.cpp" line="486"/>
+        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="487"/>
         <source>Command:</source>
         <translation>指令:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="232"/>
+        <location filename="../../src/sessionwidget.cpp" line="233"/>
         <source>Advanced options...</source>
         <translation>進階設定...</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="244"/>
-        <location filename="../../src/sessionwidget.cpp" line="813"/>
-        <location filename="../../src/sessionwidget.cpp" line="914"/>
+        <location filename="../../src/sessionwidget.cpp" line="245"/>
+        <location filename="../../src/sessionwidget.cpp" line="819"/>
+        <location filename="../../src/sessionwidget.cpp" line="920"/>
         <source>Path to executable</source>
         <translation>執行路徑</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="383"/>
+        <location filename="../../src/sessionwidget.cpp" line="384"/>
         <source>Direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="411"/>
+        <location filename="../../src/sessionwidget.cpp" line="412"/>
         <source>RDP port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="431"/>
         <source>Open picture</source>
         <translation>開啟圖片</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="433"/>
         <source>Pictures</source>
         <translation>圖片</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="323"/>
-        <location filename="../../src/sessionwidget.cpp" line="453"/>
+        <location filename="../../src/sessionwidget.cpp" line="324"/>
+        <location filename="../../src/sessionwidget.cpp" line="454"/>
         <source>Open key file</source>
         <translation>開啟密鑰檔案</translation>
     </message>
@@ -3868,26 +3879,26 @@ Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="224"/>
-        <location filename="../../src/sessionwidget.cpp" line="546"/>
+        <location filename="../../src/sessionwidget.cpp" line="225"/>
+        <location filename="../../src/sessionwidget.cpp" line="547"/>
         <source>Connect to Windows Terminal Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="255"/>
-        <location filename="../../src/sessionwidget.cpp" line="388"/>
+        <location filename="../../src/sessionwidget.cpp" line="256"/>
+        <location filename="../../src/sessionwidget.cpp" line="389"/>
         <source>Direct RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="325"/>
-        <location filename="../../src/sessionwidget.cpp" line="455"/>
+        <location filename="../../src/sessionwidget.cpp" line="326"/>
+        <location filename="../../src/sessionwidget.cpp" line="456"/>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="335"/>
-        <location filename="../../src/sessionwidget.cpp" line="465"/>
+        <location filename="../../src/sessionwidget.cpp" line="336"/>
+        <location filename="../../src/sessionwidget.cpp" line="466"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
@@ -3896,30 +3907,30 @@ Use X2Go Client's hidden mode?</source>
         <translation type="obsolete">X2Go用戶端目前為可攜式模式,您應該要使用您的USB裝置的路徑來存取您的資料</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="513"/>
-        <location filename="../../src/sessionwidget.cpp" line="763"/>
+        <location filename="../../src/sessionwidget.cpp" line="514"/>
+        <location filename="../../src/sessionwidget.cpp" line="769"/>
         <source>Server:</source>
         <translation>伺服器:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="522"/>
-        <location filename="../../src/sessionwidget.cpp" line="775"/>
+        <location filename="../../src/sessionwidget.cpp" line="523"/>
+        <location filename="../../src/sessionwidget.cpp" line="781"/>
         <source>XDMCP server:</source>
         <translation>XDMCP 伺服器:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="526"/>
+        <location filename="../../src/sessionwidget.cpp" line="527"/>
         <source>direct XDMCP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="547"/>
+        <location filename="../../src/sessionwidget.cpp" line="548"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop 指令選項:</translation>
     </message>
     <message>
-        <location filename="../../src/sessionwidget.cpp" line="559"/>
-        <location filename="../../src/sessionwidget.cpp" line="791"/>
+        <location filename="../../src/sessionwidget.cpp" line="560"/>
+        <location filename="../../src/sessionwidget.cpp" line="797"/>
         <source>New session</source>
         <translation>新的工作階段</translation>
     </message>
@@ -4117,7 +4128,7 @@ sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="534"/>
+        <location filename="../../src/settingswidget.cpp" line="536"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -4126,8 +4137,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="../../src/settingswidget.cpp" line="704"/>
-        <location filename="../../src/settingswidget.cpp" line="725"/>
+        <location filename="../../src/settingswidget.cpp" line="706"/>
+        <location filename="../../src/settingswidget.cpp" line="727"/>
         <source>password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4241,9 +4252,9 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="204"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="574"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="876"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2071"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="577"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="885"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2120"/>
         <source>Cannot create SSH session.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4253,73 +4264,73 @@ sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="613"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="616"/>
         <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="761"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="770"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1208"/>
         <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1618"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1667"/>
         <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
         <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1785"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1834"/>
         <source>Reconnect session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1895"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1944"/>
         <source>Cannot open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1907"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1956"/>
         <source>Cannot create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1922"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1971"/>
         <source>Cannot write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="1683"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1693"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1702"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1711"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="1720"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2041"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2119"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2141"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2150"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="2285"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1732"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1742"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1751"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1760"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1769"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2090"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2168"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2190"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2199"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2334"/>
         <source>%1 failed.</source>
         <extracomment>Argument in this context will be a function name.</extracomment>
         <translation type="unfinished">%1失敗,</translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2229"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2278"/>
         <source>Error writing to socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2251"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2300"/>
         <source>Error reading channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/sshmasterconnection.cpp" line="2301"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="2350"/>
         <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4357,7 +4368,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="../../src/sshmasterconnection.cpp" line="394"/>
-        <location filename="../../src/sshmasterconnection.cpp" line="644"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="647"/>
         <source>Cannot connect to </source>
         <translation>無法連線至 </translation>
     </message>

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list