[X2Go-Commits] [x2goclient] 02/02: res/i18n: update translation files.

28 Jan 2016

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

x2go pushed a commit to branch master
in repository x2goclient.

commit fe9dbe7c803ca55ff57d11c947de640fc4de4b83
Author: Mihai Moldovan <ionic@ionic.de>
Date:   Thu Jan 28 22:40:04 2016 +0100

    res/i18n: update translation files.
---
 res/i18n/x2goclient_da.ts    | 2643 +++++++++++++++++++++++++-------------
 res/i18n/x2goclient_de.ts    | 2638 +++++++++++++++++++++++++-------------
 res/i18n/x2goclient_es.ts    | 2880 +++++++++++++++++++++++++++---------------
 res/i18n/x2goclient_et.ts    | 2750 ++++++++++++++++++++++++++--------------
 res/i18n/x2goclient_fi.ts    | 2644 +++++++++++++++++++++++++-------------
 res/i18n/x2goclient_fr.ts    |  966 +++++++++-----
 res/i18n/x2goclient_nb_no.ts | 1035 +++++++++++++--
 res/i18n/x2goclient_nl.ts    | 2640 +++++++++++++++++++++++++-------------
 res/i18n/x2goclient_pt.ts    | 2406 +++++++++++++++++++----------------
 res/i18n/x2goclient_ru.ts    | 2700 ++++++++++++++++++++++++---------------
 res/i18n/x2goclient_sv.ts    | 2640 +++++++++++++++++++++++++-------------
 res/i18n/x2goclient_tr.ts    | 2829 +++++++++++++++++++++++++++--------------
 res/i18n/x2goclient_zh_tw.ts | 2813 +++++++++++++++++++++++++----------------
 13 files changed, 20506 insertions(+), 11078 deletions(-)

diff --git a/res/i18n/x2goclient_da.ts b/res/i18n/x2goclient_da.ts
index 2b85dbf..fb22d20 100644
--- a/res/i18n/x2goclient_da.ts
+++ b/res/i18n/x2goclient_da.ts
@@ -4,78 +4,78 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translatorcomment>Not sure if this is the best name for it.</translatorcomment>
         <translation>Udgivet Programmer</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Søg:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Start</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Luk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Multimedie</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Udvikling</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Undervisning</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Netværk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Tilbehør</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Andet</translation>
     </message>
@@ -83,27 +83,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Nuværende kodeord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Nyt kodeord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Bekræft kodeord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>TekstMærkat</translation>
     </message>
@@ -111,7 +111,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Kodeord er ikke ens</translation>
     </message>
@@ -119,67 +119,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Egenskaber</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Tilstand:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Accepterer jobs:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Placering:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Inaktiv</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Printer</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Stoppet</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
@@ -187,69 +187,76 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Ingen indstilling valgt</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Denne værdi er I strid med en anden indstilling</translation>
+        <translation type="obsolete">Denne værdi er I strid med en anden indstilling</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Indstillings konflikt</translation>
+        <translation type="obsolete">Indstillings konflikt</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Forbindelses test</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS forbindelse:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH forbindelse:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Forbindelseshastighed:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Mislykket</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
-        <source>Socket operation timed out</source>
-        <translatorcomment>Cannot be adquately translated</translatorcomment>
-        <translation></translation>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Mislykkedes: </translation>
     </message>
@@ -257,162 +264,219 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Vis ikon i ikon bakke</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>Minimer til ikon bakke</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Skjul i ikon bakke når programmet lukkes</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Minimer til ikon bakke efter forbindelse til server</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <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="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>Brug LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Failover server 1 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Failover server 2 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>X-server indstillinger</translation>
+        <translation type="obsolete">X-server indstillinger</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11 applikation:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11 version:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>Find X11 applikation</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Klienten's SSH port til filsystem-eksportering:</translation>
+        <translation type="obsolete">Klienten's SSH port til filsystem-eksportering:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Start session indlagt i et website</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Avanceret indstillinger</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Standardindstillinger</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>&Annuller</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Udskrift</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Advarsel</translation>
+        <translation type="obsolete">Advarsel</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient kunne ikke finde nogen brugbar X11 Applikationer. Installer venligtst Apple X11 eller specificer stien til applikationen</translation>
+        <translation type="obsolete">x2goclient kunne ikke finde nogen brugbar X11 Applikationer. Installer venligtst Apple X11 eller specificer stien til applikationen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Du bruger X11 (Apple X Window Server) version</translation>
+        <translation type="obsolete">Du bruger X11 (Apple X Window Server) version</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Denne version forårsager problemer med X applikationer i 24bit farver. Du bør opdatere dit X11 miljø (http://trac.macosforge.org/projects/xquartz). </translation>
+        <translation type="obsolete">. Denne version forårsager problemer med X applikationer i 24bit farver. Du bør opdatere dit X11 miljø (http://trac.macosforge.org/projects/xquartz). </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Der blev ikke fundet en X11 applikation i den specificerede sti</translation>
+        <translation type="obsolete">Der blev ikke fundet en X11 applikation i den specificerede sti</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Forbindelse</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation>&Medie</translation>
     </message>
@@ -424,32 +488,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Forbindelseshastighed</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Forbindelseshastighed:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>K&omprimering</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Metode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Komprimerings metode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Billed kvalitet:</translation>
     </message>
@@ -457,72 +521,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Side størrelse:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Papir type:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Papir kilde:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Duplex Udskrivning</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Intet</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Lang side</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Kort side</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Driver indstillinger</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Indstilling</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Værdi</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Ingen mulighed valgt</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>tekst</translation>
     </message>
@@ -530,47 +594,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Session</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Forbindelse</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation>&Medie</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&Delte mapper</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>&Annuller</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Standard</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Session's indstillinger</translation>
     </message>
@@ -578,38 +642,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>&Annuller</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&del</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Præferencer ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Brugerspecificeret mappe ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>del mapper</translation>
+        <translation type="obsolete">del mapper</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Vælg mappe</translation>
     </message>
@@ -617,7 +685,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translatorcomment>Find Din Sessions Mappe</translatorcomment>
         <translation>Sessions mappe</translation>
@@ -626,81 +694,97 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Mapper</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translatorcomment>Tryk her for at lave en ny mappe.</translatorcomment>
         <translation>Lav Ny Mappe</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
         <translatorcomment>Tryk her for at give et nyt navn til mappe.</translatorcomment>
-        <translation>Omdøb Mappe...</translation>
+        <translation type="obsolete">Omdøb Mappe...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
         <translatorcomment>Tryk her for at skifte ikon.</translatorcomment>
-        <translation>Skift Ikon...</translation>
+        <translation type="obsolete">Skift Ikon...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
         <translatorcomment>Tryk her for at slette en mappe</translatorcomment>
-        <translation>Fjern Mappe...</translation>
+        <translation type="obsolete">Fjern Mappe...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translatorcomment>Tryk her for at åbne et billede</translatorcomment>
         <translation>Åben billede</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Billeder</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>X2Go Klient</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translatorcomment>Angiv mappe navn</translatorcomment>
         <translation>Mappe Navn:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translatorcomment>Var ikke muligt at fjerne</translatorcomment>
         <translation>Kan ikke fjerne "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
         <translatorcomment>Alle filer skal være fjernet fra den valge mappe. for at kunne fjerne den valgte mappe.</translatorcomment>
-        <translation>Denne mappe er ikke tom. Venligst slet eller fjern alle filer i denne mappe og prøv igen.</translation>
+        <translation type="obsolete">Denne mappe er ikke tom. Venligst slet eller fjern alle filer i denne mappe og prøv igen.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translatorcomment>Tryk her for at fjerne denne mappe</translatorcomment>
         <translation>FJern mappe</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Ny Mappe</translation>
     </message>
@@ -708,7 +792,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
@@ -724,173 +808,201 @@
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Login fejlede!<br>Prøv venligst igen</translation>
+        <translation type="obsolete">Login fejlede!<br>Prøv venligst igen</translation>
     </message>
     <message>
         <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
         <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="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host nøgle for serveren er skiftet.
 Den er nu: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Af sikkerhedsmæssige årsager, bliver denne forbindelse lukket</translation>
+        <translation type="obsolete">Af sikkerhedsmæssige årsager, bliver denne forbindelse lukket</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Host nøglen for denne server var ikke fundet, men en anden type nøgle eksistere. en ukendt person har muligt skiftet den standard server nøgle for at forvirre din klient til at tro at nøglen ikke findes</translation>
+        <translation type="obsolete">Host nøglen for denne server var ikke fundet, men en anden type nøgle eksistere. en ukendt person har muligt skiftet den standard server nøgle for at forvirre din klient til at tro at nøglen ikke findes</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Kunne ikke finde kendte host fil. Hvis du accepterer serverens host nøgle, vil filen automatisk blive skabt</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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <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?
 offentlig nøgle hash: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Host nøgle bekræftelsen fejlede</translation>
+        <translation type="obsolete">Host nøgle bekræftelsen fejlede</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Godkendelses kode:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Indtast kodeord for at dekryptere en nøgle</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Autentificering fejlede</translation>
+        <translation type="obsolete">Autentificering fejlede</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Sikker forbindelse fejlede</translation>
+        <translation type="obsolete">Sikker forbindelse fejlede</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Udstedt til:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Fælles Navn(CN)</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organisation(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisations Enhed(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Serie nummer	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Udstedt af:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Gyldighed:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Udstedt den</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>udløber den	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Fingeraftryk:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>Luk X2Go-Klienten</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Tilføj undtagelse</translation>
     </message>
@@ -898,45 +1010,45 @@ offentlig nøgle hash: </translation>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Lyd</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Aktiver lyd support</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Start lyd daemon</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>Brug kørende Lyd daemon</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>brug SSH port forwarding til at føre
 lydsystemets forbindelse igennem firewalls</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Brug standard lyd port</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Lyd port:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Support til udskrifter på klientsiden</translation>
     </message>
@@ -944,13 +1056,12 @@ lydsystemets forbindelse igennem firewalls</translation>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>Starter x2goclient...</translation>
+        <translation type="obsolete">Starter x2goclient...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -959,386 +1070,368 @@ lydsystemets forbindelse igennem firewalls</translation>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>X2Go Klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>forbinder</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Internet browser</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>Email klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>Starter x2goclient i flyttebar tilstand... data filsti er:</translation>
+        <translation type="obsolete">Starter x2goclient i flyttebar tilstand... data filsti er:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Indstillinger ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Support ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>Om X2GO klient</translation>
+        <translation type="obsolete">Om X2GO klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>Startede  x2goclient.</translation>
+        <translation type="obsolete">Startede  x2goclient.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation>Kan ikke åbne oversætter:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Oversætter:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation>Installeret.</translation>
+        <translation type="obsolete">Installeret.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Del mappe...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Afbryd</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Genoptag</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>Løsriv X2Go vinduet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Minimere værktøjslinie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Session:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Afslut</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Ny session ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Sessionshåndtering...</translation>
+        <translation type="obsolete">Sessionshåndtering...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Opret sessions ikon på skrivebordet...</translation>
+        <translation type="obsolete">&Opret sessions ikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Sæt broker kodeord...</translation>
+        <translation type="obsolete">&Sæt broker kodeord...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&forbindelses test...</translation>
+        <translation type="obsolete">&forbindelses test...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Vis værktøjslinie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Om Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Indstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Hjælp</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Login:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Handling fejlede</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Kodeord er ændret</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Forkert kodeord!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Forbinder til broker</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentifikation</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Gendan</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>Ikke forbundet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Udvikling</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Undervisning</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Netværk</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Værktøj</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Andet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Venstre musknap for at skjule/gendanne - Højre musknap  for at vise kontekst menu</translation>
+        <translation type="obsolete">Venstre musknap for at skjule/gendanne - Højre musknap  for at vise kontekst menu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
         <source>Closing x2goclient...</source>
-        <translation>Lukker x2goclient...</translation>
+        <translation type="obsolete">Lukker x2goclient...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
         <source>Closed  x2goclient.</source>
-        <translation>Lukket  x2goclient.</translation>
+        <translation type="obsolete">Lukket  x2goclient.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Venligst undersøg LDAP indstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>ingen X2Go server fundet i LDAP</translation>
+        <translation type="obsolete">ingen X2Go server fundet i LDAP</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1364,26 +1457,21 @@ Slå skjult tilstand til?</translation>
         <translation type="obsolete">X2go Link til session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Ingen X2Go sessioner Fundet, Lukker.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>Ugyldig værdi for "--clipboard" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--clipboard" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>SSH Fejl</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -1393,7 +1481,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH daemon kunne ikke blive started
+        <translation type="obsolete">SSH daemon kunne ikke blive started
 
 Du skal bruge SSH daemon for at kunne udskrive og dele filer
 
@@ -1402,35 +1490,32 @@ Normalt, burde dette ikke ske da X2Go Klienten for Windows kommer med programmet
 Vis du ser denne besked. send venlight en fejl rapport til X2Go bugtracker.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>SSH daemon køre ikke.
+        <translation type="obsolete">SSH daemon køre ikke.
 
 Du skal bruge SSH daemon for at kunne printe og dele filer
 
 Venligst forsprøg din system administrater i at give dig adgang til SSH servicen på din computer.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>SSH daemon fejlede i at åbne programmet's offentlig vært's nøgle. </translation>
+        <translation type="obsolete">SSH daemon fejlede i at åbne programmet's offentlig vært's nøgle. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>SSH daemon fejlede i at åbne programmet's
+        <translation type="obsolete">SSH daemon fejlede i at åbne programmet's
 autoriseret_nøgler filen.</translation>
     </message>
     <message>
@@ -1442,58 +1527,56 @@ autoriseret_nøgler filen.</translation>
         <translation type="obsolete">Er du sikker på at du vil slette denne session?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP forbindelse</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Forbindelse til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> på </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation>Starter forbindelse til server:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation>til</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Forbindelses Fejl(</translation>
+        <translation type="obsolete">Forbindelses Fejl(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
         <source>Couldn't find a SSH connection.</source>
-        <translation>Kunne ikke finde en SSH forbindelse.</translation>
+        <translation type="obsolete">Kunne ikke finde en SSH forbindelse.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Indtast kodeord for at dekryptere en nøgle</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Værts nøgle for serveren er ændret.
@@ -1508,472 +1591,413 @@ Den er nu: </translation>
         <translation type="obsolete">Serverens host key blev fundet, men en anden type nøgle eksisterer. En angriber kan ændre standardnøglen på serveren for at narre din klient til at tro at nøglen ikke eksisterer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Kunne ikke finde kendt host fil. Hvis du accepterer serverens host nøgle, vil filen automatisk blive skabt</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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <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?
 Offentlig nøgle hash: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Værts nøgle bekræftelse fejlede</translation>
+        <translation type="obsolete">Værts nøgle bekræftelse fejlede</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Godkendelses kode:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Dette kan være en indikation af mand i midten angreb.
+        <translation type="obsolete">Dette kan være en indikation af mand i midten angreb.
 Det er muligt nogen lytter med på din forbindelse.
 Af sikkerheds grunde anbefaler vi du stopper forbindelsen.
 Vil du afslutte forbindelsen? </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 Vil du gerne opdatere værts nøglen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Værts nøglen for denne server blev ikke fundet, men en anden type af nøglen eksistere. En angreber kan ske at ændre standard nøglen for at forvirre din klient til at tro nøglen ikke eksistere.
+        <translation type="obsolete">Værts nøglen for denne server blev ikke fundet, men en anden type af nøglen eksistere. En angreber kan ske at ændre standard nøglen for at forvirre din klient til at tro nøglen ikke eksistere.
 Af sikkerhedsmæssige årsager, er det anbefalet at du stopper forbindelsen.
 Vil du afslutte forbindelsen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Godkendelse Fejlede:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Godkendelse fejlede</translation>
+        <translation type="obsolete">Godkendelse fejlede</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Indtast kodeord til SSH proxy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Forbindelsen mislykkedes</b></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <translation type="obsolete"><b>Forbindelsen mislykkedes</b></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Forkert kodeord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Forbindelse Fejlede: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation>Forkert kodeord.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>ukendt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>Ingen server tilgængelig</translation>
+        <translation type="obsolete">Ingen server tilgængelig</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>Server er ikke tilgængelig</translation>
+        <translation type="obsolete">Server er ikke tilgængelig</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Vælg session:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>kører</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>suspenderet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>enkelt applikation</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>skygge session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Intet tilgængeligt skrivebord fundet</translation>
+        <translation type="obsolete">Intet tilgængeligt skrivebord fundet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Filtrer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Vælg skrivebord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Din nuværende farvedybde er anderledes end din x2go sessions farvedybde. Dette kan skabe problemer med at genoptage sessionen og i de fleste tilfælde <b>vil du miste din session</b> og være nødt til at starte en ny! det anbefales kraftigt at skifte farvedybden på dit Skærmbillede til </translation>
+        <translation type="obsolete">Din nuværende farvedybde er anderledes end din x2go sessions farvedybde. Dette kan skabe problemer med at genoptage sessionen og i de fleste tilfælde <b>vil du miste din session</b> og være nødt til at starte en ny! det anbefales kraftigt at skifte farvedybden på dit Skærmbillede til </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 eller 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> bit og genstart din X server før du genoptager din x2go session.<br>Vil du fortsætte alligevel?</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="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>suspenderer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>afbryder</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Forkert Kodeord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Ny session er startet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Session genoptaget</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Ikke i stand til at lave mappe:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Kunne ikke skrive filen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation>Nødudgang.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Venter på at proxy afslutter.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Fejlede med at afslutte proxy.</translation>
+        <translation type="obsolete">Fejlede med at afslutte proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Forkerte parameter:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Hjælp</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Pakke Metoder</translation>
+        <translation type="obsolete">Pakke Metoder</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>Denne mulighed er ikke til tilgængelig i denne version</translation>
+        <translation type="obsolete">Denne mulighed er ikke til tilgængelig i denne version</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translatorcomment>Opdaterings Log</translatorcomment>
         <translation>Ændringslog</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Git Information</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Kunne ikke oprette mappe:</translation>
+        <translation type="obsolete">Kunne ikke oprette mappe:</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
         <translation type="obsolete">Kunne ikke skrive fil:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>Tilkobl X2Go vindue</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>Kunne ikke oprette SSL tunnel:</translation>
+        <translation type="obsolete">Kunne ikke oprette SSL tunnel:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>Kunne ikke oprette SSL Tunnel:</translation>
+        <translation type="obsolete">Kunne ikke oprette SSL Tunnel:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>Afsluttet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>starter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>fortsætter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Forbindelse fik timeout, afbryder</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>afbryder</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>Er du sikker på du vil afbryde denne session?
+        <translation type="obsolete">Er du sikker på du vil afbryde denne session?
 Ugemte dokumenter vil gå tabt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Skærmbillede</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Skabelsestid</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Forbindelse mislykkedes</b>
+        <translation type="obsolete"><b>Forbindelse mislykkedes</b>
 :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (filen kan ikke åbnes)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (filen eksisterer ikke)</translation>
+        <translation type="obsolete"> (filen eksisterer ikke)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (stien findes ikke)</translation>
+        <translation type="obsolete"> (stien findes ikke)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>Ugyldig værdi for "--link" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--link" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>Ugyldig værdi for "--sound" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--sound" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>Ugyldig værdi for "--geometry" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--geometry" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>Ugyldig værdi for "--set-kbd" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--set-kbd" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>Ugyldig værdi for "--ldap" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--ldap" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>Ugyldig værdi for "--ldap1" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--ldap1" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>Ugyldig værdi for "--ldap2" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--ldap2" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>Ugyldig værdi for "--pack" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "--pack" argumentet</translation>
     </message>
     <message>
         <source>wrong parameter: </source>
@@ -1984,247 +2008,843 @@ Ugemte dokumenter vil gå tabt</translation>
         <translation type="obsolete">Indstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Tilgængelige pakke metoder:</translation>
+        <translation type="obsolete">Tilgængelige pakke metoder:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA filen er tom.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Kan ikke åbne nøgle:</translation>
+        <translation type="obsolete">Kan ikke åbne nøgle:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Support</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2goplugin mode blev sponsoreret af <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="obsolete"><br>x2goplugin mode blev sponsoreret af <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation><br>Klient til brug med X2go's netværksbaserede computer miljø. Denne klient vil kunne forbinde til X2go servere og starte, stoppe, fortsætte og afslutte (igangværende) skrivebord's sessioner. X2Go-Klienten lagrer forskellige server forbindelser og kan automatisk lave forespørgsler til LDAP tjenester om autentificeringsdata. Den kan desuden bruges som fuldskærmslogin (erstatning for loginmanagers som xdm) Besøg venligst x2go.org for yderligere informa [...]
+        <translation type="obsolete"><br>Klient til brug med X2go's netværksbaserede computer miljø. Denne klient vil kunne forbinde til X2go servere og starte, stoppe, fortsætte og afslutte (igangværende) skrivebord's sessioner. X2Go-Klienten lagrer forskellige server forbindelser og kan automatisk lave forespørgsler til LDAP tjenester om autentificeringsdata. Den kan desuden bruges som fuldskærmslogin (erstatning for loginmanagers som xdm) Besøg venligst x2go.org for yd [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Go Client V. </translation>
+        <translation type="obsolete"><b>X2Go Client V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Venligst undersøg LDAP indstillinger</translation>
+        <translation type="obsolete">Venligst undersøg LDAP indstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>Intet gyldigt kort fundet</translation>
+        <translation type="obsolete">Intet gyldigt kort fundet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Kort er ikke konfigureret.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>Denne kort er ukendt af X2Go systemet</translation>
+        <translation type="obsolete">Denne kort er ukendt af X2Go systemet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Ikke i stand til at lave fil: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
-        <translation>Kan ikke forbinde til x server
+        <translation type="obsolete">Kan ikke forbinde til x server
 Undersøg venligst dine indstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>Kan ikke starte X server
+        <translation type="obsolete">Kan ikke starte X server
 Undersøg venligst dine indstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>Kan ikke starte X Server
+        <translation type="obsolete">Kan ikke starte X Server
 Undersøg venligst din installation</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Kunne ikke udføre handling: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Fjernserveren understøtter ikke fil system eksportering igennem en SSH Tunnel
+        <translation type="obsolete">Fjernserveren understøtter ikke fil system eksportering igennem en SSH Tunnel
 Venligst opdater til en nyere version af x2goserver pakken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Kunne ikke læses :</translation>
+        <translation type="obsolete">Kunne ikke læses :</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Kunne ikke skrive :</translation>
+        <translation type="obsolete">Kunne ikke skrive :</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Fejl ved hentning af vindue geomatri (vinduet lukkede)?</translation>
+        <translation type="obsolete">Fejl ved hentning af vindue geomatri (vinduet lukkede)?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go Session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>Ugyldig værdi for "speed" argumentet</translation>
+        <translation type="obsolete">Ugyldig værdi for "speed" argumentet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Kodeord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Tastatur layout:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Applikationer...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation>Afbryd</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Vis detaljer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Fortsæt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Fuld adgang</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Kun synlig</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>Klient IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>Sessions ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Bruger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Kun mine skrivebord</translation>
     </message>
     <message>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>sshd not started, you'll need sshd for printing and file sharing
 you can install sshd with
 <b>sudo apt-get install openssh-server</b></source>
@@ -2233,12 +2853,12 @@ du kan installere sshd med
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Gendan værktøjslinie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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>
@@ -2246,141 +2866,157 @@ du kan installere sshd med
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Udskrift - X2Go Klient</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Udskrift</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Du har deaktiveret x2go klientens udskrifts dialog.</translation>
+        <translation type="obsolete">Du har deaktiveret x2go klientens udskrifts dialog.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Du kan genaktivere denne dialog i x2goclient indstillings dialogen (Menu -> Indstilinger -> Indstil</translation>
+        <translation type="obsolete">Du kan genaktivere denne dialog i x2goclient indstillings dialogen (Menu -> Indstilinger -> Indstil</translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Gem Filen</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>PDF Dokument (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Udføring af kommando fejlede:</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Udskriftsfejl</translation>
+        <translation type="obsolete">Udskriftsfejl</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Formel</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Udskriv</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Se som PDF</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Printer indstillinger</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Printer:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Print med Windows standard PDF Viewer
 (Viewer applikationen skal være installeret)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Printer kommando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Fremviser indstillinger</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Åben i fremviser applikationen</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Gem til disk</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Vis denne dialog før udskrivning starter</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Venligst konfiguere dine printerindstillinger på klientsiden.<br><br>Hvis du vil udskrive den skabte fil, vil du få brug for en ekstern applikation. Du kan typisk bruge <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; og <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Du kan finde yderligere informationer <a href="http://www.x2go.org/index.php?id=49" [...]
+        <translation type="obsolete">Venligst konfiguere dine printerindstillinger på klientsiden.<br><br>Hvis du vil udskrive den skabte fil, vil du få brug for en ekstern applikation. Du kan typisk bruge <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; og <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Du kan finde yderligere informationer <a href="http://www.x2go.org/inde [...]
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Printer kommando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2391,47 +3027,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Output format</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Vælg venligst det rette format til udskriftsfil (i forhold til dit udskrifts miljø - Hvis du bruger CUPS kan du bruge PDF)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Data struktur</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>vælg venligst den rette metode til udskriftsfilinput (nogle kommandoer accepterer udskriftsfiler som program muligheder, nogle venter på data fra standard input):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>standard input (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Specificer sti som program parameter</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2440,7 +3076,7 @@ f.eks:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translatorcomment>?</translatorcomment>
         <translation><Path to gsprint.exe> -query -color</translation>
@@ -2449,135 +3085,186 @@ f.eks:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Ingen svar modtaget fra fjern server. Vil du afslutte den nuværende session?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Sessions præferencer...</translation>
+        <translation type="obsolete">Sessions præferencer...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Opret sessions ikon på skrivebordet...</translation>
+        <translation type="obsolete">Opret sessions ikon på skrivebordet...</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Fjern session</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Sessions handlinger</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Vælg type</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Vælg opløsning</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Til/fravælg lyd understøttelse</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Ny Session</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>kører</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>suspenderet</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP forbindelse</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Forbindelse til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Udgivet Programmer</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>Fuldskærm</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Skærmbillede </translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>vindue</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Maksimum</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>Aktiveret</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>Deaktiveret</translation>
     </message>
@@ -2585,41 +3272,51 @@ f.eks:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Tilbage</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Opret sessions ikon på skrivebordt</translation>
+        <translation type="obsolete">Opret sessions ikon på skrivebordt</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Skrivebords ikoner kan indstilles til ikke at vise x2goklienten (skjult tilstand). Hvis du vil bruge denne funktion skal du konfigurere login med gpg nøgle eller gpg smart card.
+        <translation type="obsolete">Skrivebords ikoner kan indstilles til ikke at vise x2goklienten (skjult tilstand). Hvis du vil bruge denne funktion skal du konfigurere login med gpg nøgle eller gpg smart card.
 
 Brug x2goclient skjult tilstand?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Vis session ikon i ikon bakke når programmet køre</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Ny Session</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation>X2Go Link til session </translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Er du sikker på at du vil fjerne denne session?</translation>
     </message>
@@ -2627,38 +3324,42 @@ Brug x2goclient skjult tilstand?</translation>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>E&xit</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Ny session</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Sessions præferencer</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>&Fjern session</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Opret sessions ikon på skrivebordet...</translation>
+        <translation type="obsolete">&Opret sessions ikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Sessions håndtering</translation>
     </message>
@@ -2666,237 +3367,257 @@ Brug x2goclient skjult tilstand?</translation>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Sessions navn:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< skift ikon</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Sti:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Vært:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Login:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Brug RSA/DSA nøgle til ssh forbindelse:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Prøv automatisk login (ssh-agent eller standard ssh nøgle)</translation>
+        <translation type="obsolete">Prøv automatisk login (ssh-agent eller standard ssh nøgle)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI) autentificering</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Delegation af GSSAPI legitimations oplysninger til serveren</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Brug Proxy Server til SSH-forbindelse</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Proxy server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Samme login som på X2Go Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Samme kodeord som på X2Go Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>RSA/DSA nøgle:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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>
         <source>ssh-agent or default ssh key</source>
-        <translation>ssh-agent eller standard ssh nøgle</translation>
+        <translation type="obsolete">ssh-agent eller standard ssh nøgle</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Sessions type</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Sessions type:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Forbind til Windows terminal server</translation>
+        <translation type="obsolete">Forbind til Windows terminal server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Forbind til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Brugerdefineret skrivebord</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Enkelt applikation</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Udgivet applikationer</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Avancerede indstillinger...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Sti til Program</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Direkt RDP Forbindelse</translation>
+        <translation type="obsolete">Direkt RDP Forbindelse</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RDP port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Åben billede</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Billeder</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Åben nøglefil</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop kommandolinie parametre:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Ny session</translation>
     </message>
@@ -2904,14 +3625,14 @@ Brug x2goclient skjult tilstand?</translation>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Skærmbillede</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Tastatur</translation>
     </message>
@@ -2920,121 +3641,133 @@ Brug x2goclient skjult tilstand?</translation>
         <translation type="obsolete">Lyd</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>&Clipboard Tilstand</translation>
+        <translation type="obsolete">&Clipboard Tilstand</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>tovejs kopier og indsæt</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Kopier og indsæt fra klient til server</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Kopier og indsæt fra server til klient</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Deaktivere clipboard fuldstendigt</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
         <source>Auto detect keyboard settings</source>
-        <translation>Auto opdage tastetur instillinger</translation>
+        <translation type="obsolete">Auto opdage tastetur instillinger</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Konfigurer ikke tasteturet</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Konfigurer tasteturet</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>model:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Opsætning:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Variant:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>RDP Klient</translation>
+        <translation type="obsolete">RDP Klient</translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Fuldskærm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Tilpasset</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Vindue</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Bruge hele skærmbilledet</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Maximalt tilgængelige</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Sæt Skærmbillede DPI</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama udvidelse (understøtter to eller flere fysiske displays)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Bredde:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Højde:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Skærmbillede:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Identificer alle skærme</translation>
     </message>
     <message>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Keep current keyboard Settings</source>
         <translation type="obsolete">Behold nuværende tastaturindstillinger</translation>
     </message>
@@ -3077,17 +3810,17 @@ lydsystemets forbindelse igennem firewalls</translation>
         <translation type="obsolete">Support til udskrifter på klientsiden</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Yderligere paramentre:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Kommandolinje:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -3096,7 +3829,8 @@ lydsystemets forbindelse igennem firewalls</translation>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>kodeord</translation>
     </message>
@@ -3104,80 +3838,88 @@ lydsystemets forbindelse igennem firewalls</translation>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Mapper</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Sti</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Automonter</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Sti:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Encodning af filnavne</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>Lokalt:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>Fjern:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Brug ssh port forwarding til at føre filsystemsforbindelser igennem firewalls</translation>
+        <translation type="obsolete">Brug ssh port forwarding til at føre filsystemsforbindelser igennem firewalls</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Vælg mappe</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3185,126 +3927,198 @@ lydsystemets forbindelse igennem firewalls</translation>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
         <source>SSH proxy connection error</source>
-        <translation>SSH proxy forbindelses fejl</translation>
+        <translation type="obsolete">SSH proxy forbindelses fejl</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>SSH proxy forbindelses fejl:</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>kunne ikke skabe SSH proxy tunnel</translation>
+        <translation type="obsolete">kunne ikke skabe SSH proxy tunnel</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>Kunne ikke starte libssh</translation>
+        <translation type="obsolete">Kunne ikke starte libssh</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>Kunne ikke skabe ssh session</translation>
+        <translation type="obsolete">Kunne ikke skabe ssh session</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>Kan ikke forbinde til proxy server</translation>
+        <translation type="obsolete">Kan ikke forbinde til proxy server</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>Kunne ikke forbinde til</translation>
+        <translation type="obsolete">Kunne ikke forbinde til</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Autentificering fejlede</translation>
+        <translation type="obsolete">Autentificering fejlede</translation>
     </message>
     <message>
         <source>channel_forward_listen failed</source>
         <translation type="obsolete">channel_forward_listen fejlede</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation>kunne ikke starte SSH Klient. Venligst tjek din installation og GSSApi konfiguration</translation>
+        <translation type="obsolete">kunne ikke starte SSH Klient. Venligst tjek din installation og GSSApi konfiguration</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>Tjek din GSSApi konfiguration eller vælg en anden godkendelses metode</translation>
+        <translation type="obsolete">Tjek din GSSApi konfiguration eller vælg en anden godkendelses metode</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>Kan ikke åbne fil</translation>
+        <translation type="obsolete">Kan ikke åbne fil</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>Kan ikke skabe fjern fil</translation>
+        <translation type="obsolete">Kan ikke skabe fjern fil</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>Kan ikke skrive til fjern fil</translation>
+        <translation type="obsolete">Kan ikke skrive til fjern fil</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>kan ikke forbinde til</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward fejlede</translation>
+        <translation type="obsolete">channel_open_forward fejlede</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_sesion fejlede</translation>
+        <translation type="obsolete">channel_open_sesion fejlede</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec fejlede</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>Fejl ved skrivning til socket</translation>
+        <translation type="obsolete">Fejl ved skrivning til socket</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>fejl ved læsning af kanal</translation>
+        <translation type="obsolete">fejl ved læsning af kanal</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
-        <translation>channel_write fejlede</translation>
+        <translation type="obsolete">channel_write fejlede</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>fejl i læsning af tcp socket</translation>
+        <translation type="obsolete">fejl i læsning af tcp socket</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Fejl i skabelse af socket</translation>
+        <translation type="obsolete">Fejl i skabelse af socket</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Fejl i binding</translation>
     </message>
@@ -3312,12 +4126,12 @@ lydsystemets forbindelse igennem firewalls</translation>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Åben Fil</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>eksekverbar (*.exe)</translation>
     </message>
@@ -3325,69 +4139,74 @@ lydsystemets forbindelse igennem firewalls</translation>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Formel</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Du skal genstarte X2Go klienten før ændringerne træder i kraft</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>brug integreret X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation>brug ikke den primær udklipsholder</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>brug tilpasset X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>tilpas X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>eksekverbar:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>start X-Server sammen med X2Go klient</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>Kommandolinje parametre:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>X-Server Kommandolinje parametre</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>Vindue tilstand:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>Fuldskærms tilstand:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>Enkelt applikation:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_de.ts b/res/i18n/x2goclient_de.ts
index c38a83e..eccc0a3 100644
--- a/res/i18n/x2goclient_de.ts
+++ b/res/i18n/x2goclient_de.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Veröffentlichte Anwendungen</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Suche:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Starten</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>S&chließen</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Unterhaltungsmedien</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Entwicklung</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Bildung</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Spiele</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Internet</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Büroprogramme</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>Systemwerkzeuge</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Dienstprogramme</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Sonstige</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Altes Kennwort:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Neues Kennwort:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Kennwort wiederholen:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Kennwörter stimmen nicht überein</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Inaktiv</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Druckt</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Angehalten</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Eigenschaften</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Aufträge werden angenommen:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Adresse:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
@@ -186,68 +186,80 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Keine Einstellung ausgewählt</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Dieser Wert erzeugt einen Konflikt mit einer anderen Option</translation>
+        <translation type="obsolete">Dieser Wert erzeugt einen Konflikt mit einer anderen Option</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Einstellungskonflikt</translation>
+        <translation type="obsolete">Einstellungskonflikt</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Verbindungstest</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS-Verbindung:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH-Verbindung:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Verbindungsgeschwindigkeit:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
-        <translation>Zeitüberschreibung bei Socket-Operation</translation>
+        <translation type="obsolete">Zeitüberschreibung bei Socket-Operation</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Fehlgeschlagen: </translation>
     </message>
@@ -255,7 +267,7 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>benutze LDAP</translation>
     </message>
@@ -264,22 +276,22 @@
         <translation type="obsolete">LDAP Einstellungen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>A&bbrechen</translation>
     </message>
@@ -312,7 +324,7 @@
         <translation type="obsolete">Displaynummer:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Konfiguration</translation>
     </message>
@@ -341,31 +353,24 @@
         <translation type="obsolete">Suche X11 Applikation</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Warnung</translation>
+        <translation type="obsolete">Warnung</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient konnte keine passende X11 Installation finden. Bitte Installieren Sie Apple X11 oder wählen Sie den Pfad zu einer gültigen Installation</translation>
+        <translation type="obsolete">x2goclient konnte keine passende X11 Installation finden. Bitte Installieren Sie Apple X11 oder wählen Sie den Pfad zu einer gültigen Installation</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Sie verwenden die Apple X11 Umgebung in der Version </translation>
+        <translation type="obsolete">Sie verwenden die Apple X11 Umgebung in der Version </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Es ist bekannt, dass bei dieser Version Darstellungsprobleme bei 24 Farbtiefe auftreten. Wir empfehlen Ihnen ein Update auf eine neuere Version (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">. Es ist bekannt, dass bei dieser Version Darstellungsprobleme bei 24 Farbtiefe auftreten. Wir empfehlen Ihnen ein Update auf eine neuere Version (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Unter dem angegebenden Pfad konnte keine gültige X11 Installation gefunden werden</translation>
+        <translation type="obsolete">Unter dem angegebenden Pfad konnte keine gültige X11 Installation gefunden werden</translation>
     </message>
     <message>
         <source>Clientside SSH Port For File System Export Usage:</source>
@@ -376,105 +381,169 @@
         <translation type="obsolete">LDAP Einstellungen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Failover Server 1 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Failover Server 2 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
         <source>X-Server settings</source>
-        <translation>X-Server Konfiguration</translation>
+        <translation type="obsolete">X-Server Konfiguration</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11 Applikation:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11 Version:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>Suche X11 Applikation</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation>
+        <translation type="obsolete">SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Sitzung innerhalb einer Webseite anzeigen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Symbol im Systemabschnitt der Kontrolleiste anzeigen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>In den Systemabschnitt der Kontrolleiste minimieren</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Statt Schließen in den Systemabschnitt der Kontrolleiste minimieren</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Bei Verbindung in den Systemabschnitt der Kontrolleiste minimieren</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Nach Verbindungsende wiederherstellen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Erweiterte Einstellungen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Voreinstellungen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Verbindung</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation>Ein-/Ausgabe</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation>Medien</translation>
     </message>
@@ -486,32 +555,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Verbindungsgeschwindigkeit</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Verbindungsgeschwindigkeit:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>K&ompression</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Methode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Methode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Bildqualität:</translation>
     </message>
@@ -519,72 +588,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Seitenformat:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Papiertyp:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Papiereinzug:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Beidseitiger Druck</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Kein Duplexdruck</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Lange Seite</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Kurze Seite</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Treiber-Einstellungen</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>OPtion</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Value</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Keine Einstellung ausgewählt</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>text</translation>
     </message>
@@ -592,37 +661,37 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Sitzung</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Verbindung</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation>Ein-/Ausgabe</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation>&Medien</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>Ab&brechen</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Voreinstellungen</translation>
     </message>
@@ -795,7 +864,7 @@
         <translation type="obsolete">Fenster</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&freigegebene Ordner</translation>
     </message>
@@ -890,7 +959,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Sitzungsvoreinstellungen - </translation>
     </message>
@@ -934,23 +1003,28 @@ sound system connections through firewalls</source>
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>A&bbrechen</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Voreinstellungen ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>lösche</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&Freigeben</translation>
     </message>
@@ -967,17 +1041,16 @@ sound system connections through firewalls</source>
         <translation type="obsolete">wähle Ordner</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Anderer Ordner ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
         <source>share folders</source>
-        <translation>Ordner freigeben</translation>
+        <translation type="obsolete">Ordner freigeben</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Wähle Ordner</translation>
     </message>
@@ -985,7 +1058,7 @@ sound system connections through firewalls</source>
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation>Sitzungsordner</translation>
     </message>
@@ -993,73 +1066,89 @@ sound system connections through firewalls</source>
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Ordner</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translatorcomment>Neuen Ordner erstellen</translatorcomment>
         <translation></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
-        <translation>Ordner umbenennen...</translation>
+        <translation type="obsolete">Ordner umbenennen...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
-        <translation>Symbol ändern...</translation>
+        <translation type="obsolete">Symbol ändern...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
-        <translation>Ordner löschen...</translation>
+        <translation type="obsolete">Ordner löschen...</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation>Öffne Bild</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>X2Go Client</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation>Ordnername:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation>Kann den Ordner "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>". nicht löschen. Der Ordner ist nicht leer. Bitte löschen Sie den Inhalt des Ordners und versuchen Sie es erneut.</translation>
+        <translation type="obsolete">". nicht löschen. Der Ordner ist nicht leer. Bitte löschen Sie den Inhalt des Ordners und versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation>Lösche Ordner "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Neuer Ordner</translation>
     </message>
@@ -1067,7 +1156,7 @@ sound system connections through firewalls</source>
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Einstellungen</translation>
     </message>
@@ -1083,173 +1172,201 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/de</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host-Key des Servers hat sich geändert.
 Er lautet jetzt: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Aus Sicherheitsgründen wird der Verbindungsaufbau abgebrochen</translation>
+        <translation type="obsolete">Aus Sicherheitsgründen wird der Verbindungsaufbau abgebrochen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Der Hostkey 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>
+        <translation type="obsolete">Der Hostkey 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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Die ,,Known Host''-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <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?
 Öffentlicher Schlüssel: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Hostkey Überprüfung fehlgeschlagen</translation>
+        <translation type="obsolete">Hostkey Überprüfung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Bestätigungscode:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Bitte Kennwort eingeben, um den Key zu entschlüsseln</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Anmeldung fehlgeschlagen</translation>
+        <translation type="obsolete">Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Anmeldung fehlgeschlagen!<br>Bitte noch einmal versuchen</translation>
+        <translation type="obsolete">Anmeldung fehlgeschlagen!<br>Bitte noch einmal versuchen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Sichere Verbindung fehlgeschlagen</translation>
+        <translation type="obsolete">Sichere Verbindung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Ausgestellt für:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Ausgestellt von:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerabdrücke:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>X2Go Client beenden</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Ausnahme hinzufügen</translation>
     </message>
@@ -1261,45 +1378,45 @@ Public key hash: </source>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Audiounterstützung aktivieren</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Starte Sound Server</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>Benutze existierenden Sound Server</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Benutze Port-Weiterleitung über Tunnel
  um Audiosignale über Firewalls zu verbinden</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Benutze standard Audio Port</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Audio Port:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Clientseitige Druckunterstützung</translation>
     </message>
@@ -1307,8 +1424,8 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>de</translation>
     </message>
@@ -1317,30 +1434,30 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/de</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Support ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Sitzung:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Beenden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
@@ -1349,7 +1466,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">&Neue Sitzung ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
@@ -1358,7 +1475,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Sitzungsverwaltung...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
@@ -1367,7 +1484,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">LDAP &Konfiguration ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Werkzeugleiste wieder anzeigen</translation>
     </message>
@@ -1376,193 +1493,182 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Über X2GoClient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Über QT</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Sitzung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Strg +Q</translation>
+        <translation type="obsolete">Strg +Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Sitzung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Einstellungen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Hilfe</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Bestätigungscode:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Das kann ein Anzeichen für einen Man-in-the-Middle-Angriff sein.
+        <translation type="obsolete">Das kann ein Anzeichen für einen Man-in-the-Middle-Angriff sein.
 Vielleicht werden Sie gerade von jemandem belauscht.
 Aus Sicherheitsgründen ist es angeraten, die Verbindung zu beenden.
 Möchten Sie die Verbindung abbrechen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 Wollen Sie den Host-Key aktualisieren?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Der Host-Key dieses Servers konnte nicht gefunden werden, aber eine anderer Schlüsseltyp für ihn ist bereits vorhanden. Ein Angreifer könnte den Standard-Key des Servers geändert haben, um Ihren Client glauben zu machen, der Key wäre noch nicht vorhanden.
+        <translation type="obsolete">Der Host-Key dieses Servers konnte nicht gefunden werden, aber eine anderer Schlüsseltyp für ihn ist bereits vorhanden. Ein Angreifer könnte den Standard-Key des Servers geändert haben, um Ihren Client glauben zu machen, der Key wäre noch nicht vorhanden.
 Aus Sicherheitsgründen ist es angeraten, die Verbindung zu beenden.
 Möchten Sie die Verbindung abbrechen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Neue Sitzung gestartet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Sitzung fortgesetzt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Ordner kann nicht erstellt werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Datei kann nicht geschrieben werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation>Notausgang.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Darauf warten, dass der Proxy sich beendet.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Fehlgeschlagen, töte Proxy.</translation>
+        <translation type="obsolete">Fehlgeschlagen, töte Proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>unerwarteter Wert "--clipboard"</translation>
+        <translation type="obsolete">unerwarteter Wert "--clipboard"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Falscher Parameter:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Packmethoden</translation>
+        <translation type="obsolete">Packmethoden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>Option in diesem Build nicht verfügbar</translation>
+        <translation type="obsolete">Option in diesem Build nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Changelog</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Git Info</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA Datei leer.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Schlüssel kann nicht geöffnet werden:</translation>
+        <translation type="obsolete">Schlüssel kann nicht geöffnet werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Smartcard nicht konfiguriert.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Fehler beim Ermitteln der Fenstergeometrie. (Fenster geschlossen?)</translation>
+        <translation type="obsolete">Fehler beim Ermitteln der Fenstergeometrie. (Fenster geschlossen?)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Tastaturlayout:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Anwendungen...</translation>
     </message>
@@ -1571,118 +1677,118 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Ungültige Antwort vom Session-Broker</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> on </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Benutzername:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Wähle Sitzung:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Fortfahren</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Anhalten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Display</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
@@ -1691,20 +1797,20 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Startzeit</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>Client IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>angehalten</translation>
     </message>
@@ -1717,55 +1823,340 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>SSL Tunnel kann nicht erzeugt werden:
+        <translation type="obsolete">SSL Tunnel kann nicht erzeugt werden:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>verbinde</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>starte</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>aktiviere</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Zeitüberschreitung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>Abbruch</translation>
     </message>
     <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation Time:<br>Status:</b></source>
         <translation type="obsolete"><b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
@@ -1774,98 +2165,76 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Zeige Details</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (kann Datei nicht öffnen)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (Datei existiert nicht)</translation>
+        <translation type="obsolete"> (Datei existiert nicht)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (Verzeichnis existiert nicht)</translation>
+        <translation type="obsolete"> (Verzeichnis existiert nicht)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>unerwarteter Wert "--link"</translation>
+        <translation type="obsolete">unerwarteter Wert "--link"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>unerwarteter Wert "--sound"</translation>
+        <translation type="obsolete">unerwarteter Wert "--sound"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>unerwarteter Wert "--geometry"</translation>
+        <translation type="obsolete">unerwarteter Wert "--geometry"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>unerwarteter Wert "--set-kbd"</translation>
+        <translation type="obsolete">unerwarteter Wert "--set-kbd"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>unerwarteter Wert "--ldap"</translation>
+        <translation type="obsolete">unerwarteter Wert "--ldap"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>unerwarteter Wert "--pack"</translation>
+        <translation type="obsolete">unerwarteter Wert "--pack"</translation>
     </message>
     <message>
         <source>wrong parameter: </source>
         <translation type="obsolete">unerwarteter Wert: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Liste aller Packmethoden:</translation>
+        <translation type="obsolete">Liste aller Packmethoden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Support</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
+        <translation type="obsolete">Bitte überprüfen Sie die LDAP Einstellungen</translation>
     </message>
     <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
         <source>no X2Go Server found in LDAP </source>
-        <translation type="obsolete">LDAP enthält keinen X2GoServer </translation>
+        <translation type="unfinished">LDAP enthält keinen X2GoServer </translation>
     </message>
     <message>
         <source>Are you sure you want to delete this Session?</source>
         <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Verbindung fehlgeschlagen</b>
+        <translation type="obsolete"><b>Verbindung fehlgeschlagen</b>
 </translation>
     </message>
     <message>
@@ -1873,27 +2242,25 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>Sitzungs ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>anhalten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>beende</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Verbindung fehlgeschlagen</b>
+        <translation type="obsolete"><b>Verbindung fehlgeschlagen</b>
 :
 </translation>
     </message>
@@ -1924,17 +2291,15 @@ Möchten Sie die Verbindung abbrechen?</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&apos [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Lesefehler:
+        <translation type="obsolete">Lesefehler:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Schreibfehler:
+        <translation type="obsolete">Schreibfehler:
 </translation>
     </message>
     <message>
@@ -1942,19 +2307,17 @@ Möchten Sie die Verbindung abbrechen?</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="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Falsches Passwort!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>unerwarteter Wert "--ldap1"</translation>
+        <translation type="obsolete">unerwarteter Wert "--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>unerwarteter Wert "--ldap2"</translation>
+        <translation type="obsolete">unerwarteter Wert "--ldap2"</translation>
     </message>
     <message>
         <source>Usage: x2goclient [Options]
@@ -1981,21 +2344,20 @@ Möchten Sie die Verbindung abbrechen?</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="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Datei konnte nicht erzeugt werden: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>Es wurde keine gültige Karte gefunden</translation>
+        <translation type="obsolete">Es wurde keine gültige Karte gefunden</translation>
     </message>
     <message>
         <source>This card is unknown by X2Go System</source>
         <translation type="obsolete">Diese Karte ist dem X2Go-System unbekannt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Konfiguration ...</translation>
     </message>
@@ -2012,12 +2374,11 @@ Möchten Sie die Verbindung abbrechen?</translation>
         <translation type="obsolete">Verbindung zu X-Server konnte nicht hergestellt werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
         <oldsource>Can't connect to X-Server
 Please check your settings</oldsource>
-        <translation>Verbindung zu X-Server konnte nicht hergestellt werden
+        <translation type="obsolete">Verbindung zu X-Server konnte nicht hergestellt werden
 Bitte überprüfen Sie Ihre Einstellungen</translation>
     </message>
     <message>
@@ -2031,44 +2392,33 @@ Please check your settings</source>
 Überprüfen Sie Ihre Einstellungen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </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>. Um Fehler zu vermeiden wird empfohlen, die aktuelle Farbtiefe auf </translation>
+        <translation type="obsolete">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>. Um Fehler zu vermeiden wird empfohlen, die aktuelle Farbtiefe auf </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 oder 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation>  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>
+        <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="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2GoClient V. </translation>
+        <translation type="obsolete"><b>X2GoClient V. </translation>
     </message>
     <message>
         <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with 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 fullscreen loginscreen (replacement for lo [...]
@@ -2079,42 +2429,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="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Desktopumgebung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation></translation>
     </message>
@@ -2123,133 +2473,125 @@ Please check your settings</source>
         <translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Befehl konnte nicht ausgeführt werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Webbrowser</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>E-Mail-Programm</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Neue Sitzung ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Sitzungsverwaltung...</translation>
+        <translation type="obsolete">Sitzungsverwaltung...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Zeige Werkzeugleiste</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>Über X2GoClient</translation>
+        <translation type="obsolete">Über X2GoClient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>LDAP enthält keinen X2GoServer </translation>
+        <translation type="obsolete">LDAP enthält keinen X2GoServer </translation>
     </message>
     <message>
         <source>Are you sure you want to delete this session?</source>
         <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Falsches Passwort!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>es konnte kein Server gefunden werden</translation>
+        <translation type="obsolete">es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <oldsource>Active connection</oldsource>
         <translation>Nicht verbunden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Ordner kann nicht erzeugt werden:</translation>
+        <translation type="obsolete">Ordner kann nicht erzeugt werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Bitte Kennwort eingeben, um den Schlüssel zu öffnen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Keine X2Go Sitzung gefunden, Programm wird geschlossen.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation>Verbindung mit Server wird gestartet: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation>auf</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Verbindungsfehler(</translation>
+        <translation type="obsolete">Verbindungsfehler(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
         <source>Couldn't find a SSH connection.</source>
-        <translation>Konnte keine SSH Verbindung finden.</translation>
+        <translation type="obsolete">Konnte keine SSH Verbindung finden.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host-Key des Servers hat sich geändert. Er lautet jetzt: </translation>
@@ -2263,256 +2605,225 @@ It is now: </source>
         <translation type="obsolete">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>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Die ,,Known Host''-Datei konnte nicht gefunden werden. Wenn Sie den Host-Key hier akzeptieren, dann wird die Datei automatisch erstellt.</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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <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? Öffentlicher Schlüssel: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Die Überprüfung des Host-Keys schlug fehl</translation>
+        <translation type="obsolete">Die Überprüfung des Host-Keys schlug fehl</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Anmeldung fehlgeschlagen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Anmeldung fehlgeschlagen</translation>
+        <translation type="obsolete">Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Kennwort für SSH Proxy eingeben</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Verbindung fehlgeschlagen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation> - Falsches Kennwort.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>Server nicht verfügbar</translation>
+        <translation type="obsolete">Server nicht verfügbar</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
         <translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>SSL Tunnel kann nicht erzeugt werden:
+        <translation type="obsolete">SSL Tunnel kann nicht erzeugt werden:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Ordner freigeben...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Zeige Details</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>Diese Karte ist dem X2Go-System unbekannt</translation>
+        <translation type="obsolete">Diese Karte ist dem X2Go-System unbekannt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>X-Server lässt sich nicht starten. 
+        <translation type="obsolete">X-Server lässt sich nicht starten. 
 Bitte überprüfen Sie Ihre Installation</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Der gewählte server unterstützt kein Dateisystemexport via SSH Tunnel
+        <translation type="obsolete">Der gewählte server unterstützt kein Dateisystemexport via SSH Tunnel
 Bitte installieren sie eine neuere Version von x2goserver</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Desktopsymbol erzeugen...</translation>
+        <translation type="obsolete">&Desktopsymbol erzeugen...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>X2Go Client wird gestartet...</translation>
+        <translation type="obsolete">X2Go Client wird gestartet...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>Portable X2Go Client wird gestartet... Datenverzeichnis ist: </translation>
+        <translation type="obsolete">Portable X2Go Client wird gestartet... Datenverzeichnis ist: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>X2Go Client ist gestartet.</translation>
+        <translation type="obsolete">X2Go Client ist gestartet.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation>Kann Übersetzer nicht laden: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Übersetzung: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation> installiert.</translation>
+        <translation type="obsolete"> installiert.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Kennwort für Session-Broker setzen...</translation>
+        <translation type="obsolete">&Kennwort für Session-Broker setzen...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&Verbindungstest...</translation>
+        <translation type="obsolete">&Verbindungstest...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Operation fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Das Kennwort wurde geändert</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Falsches Kennwort!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Authentifizierung</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Unterhaltungsmedien</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Entwicklung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Bildung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Spiele</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Internet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Büroprogramme</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>Systemwerkzeuge</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Dienstprogramme</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Sonstige</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
         <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource>
-        <translation>Linke Maustaste: verstecken/wiederherstellen  -  rechte Maustaste: Kontextmenü</translation>
+        <translation type="obsolete">Linke Maustaste: verstecken/wiederherstellen  -  rechte Maustaste: Kontextmenü</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
         <source>Closing x2goclient...</source>
-        <translation>X2Go Client wird geschossen...</translation>
+        <translation type="obsolete">X2Go Client wird geschossen...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
         <source>Closed  x2goclient.</source>
-        <translation>X2Go Client wurde geschlossen.</translation>
+        <translation type="obsolete">X2Go Client wurde geschlossen.</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -2539,68 +2850,189 @@ Wollen Sie den versteckten Modus nutzen?</translation>
         <translation type="obsolete">Keine X2Go-Sitzungen gefunden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP Verbindung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>Fenster abkoppeln</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>Fenster einbetten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>Beendet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>Die Sitzung wird beendet. Sind Sie sicher?<br>Ungespeicherte Dokumente gehen verloren</translation>
+        <translation type="obsolete">Die Sitzung wird beendet. Sind Sie sicher?<br>Ungespeicherte Dokumente gehen verloren</translation>
     </message>
     <message>
         <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with 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 fullscr [...]
         <translation type="obsolete"></b><br> (C. 2006-2009 <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="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>X-Server lässt sich nicht starten. 
+        <translation type="obsolete">X-Server lässt sich nicht starten. 
 Bitte überprüfen Sie Ihre Installation</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go-Sitzung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Symbole verstecken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>SSH-Fehler</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -2610,37 +3042,34 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH-Dienst konnte nicht gestartet werden.\n\nDer SSH-Dienst wird für die Datei- und Druckdienste benötigt.\n\nDiese Fehlermeldung sollte nie auftreten, da der Windows-X2GoClient seinen eigenen SSH-Dienst mitbringt.\n\nWenn Sie diese Fehlermeldung sehen, melden Sie den Fehler bitte über den X2Go-Bugtracker.</translation>
+        <translation type="obsolete">SSH-Dienst konnte nicht gestartet werden.\n\nDer SSH-Dienst wird für die Datei- und Druckdienste benötigt.\n\nDiese Fehlermeldung sollte nie auftreten, da der Windows-X2GoClient seinen eigenen SSH-Dienst mitbringt.\n\nWenn Sie diese Fehlermeldung sehen, melden Sie den Fehler bitte über den X2Go-Bugtracker.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>Der SSH-Dienst läuft nicht.\n\nDer SSH-Dienst wird für die Datei- und Druckdienste benötigt.\n\nBitte wenden Sie sich an Ihren Systemadministrator und bitten Sie ihn, den SSH-Dienst auf Ihrem Computer zu installieren.</translation>
+        <translation type="obsolete">Der SSH-Dienst läuft nicht.\n\nDer SSH-Dienst wird für die Datei- und Druckdienste benötigt.\n\nBitte wenden Sie sich an Ihren Systemadministrator und bitten Sie ihn, den SSH-Dienst auf Ihrem Computer zu installieren.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>Der SSH-Dienst konnte den öffentlichen Host-Schlüssel der Anwendung nicht öffnen.</translation>
+        <translation type="obsolete">Der SSH-Dienst konnte den öffentlichen Host-Schlüssel der Anwendung nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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 öffentlichen Host-Schlüssel der Anwendung nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>Der SSH-Dienst konnte die autorized_keys-Datei der Anwendung nicht öffnen.</translation>
+        <translation type="obsolete">Der SSH-Dienst konnte die autorized_keys-Datei der Anwendung nicht öffnen.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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>
@@ -2657,65 +3086,260 @@ Sie können SSHD über folgenden Befehl installieren:
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Desktopauswahl:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Nur betrachten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Kein freigegebener Desktop gefunden</translation>
+        <translation type="obsolete">Kein freigegebener Desktop gefunden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Vollzugriff</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Nur eigene Desktops</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Neu verbinden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Verbinden mit Broker</translation>
     </message>
@@ -2724,29 +3348,26 @@ Sie können SSHD über folgenden Befehl installieren:
         <translation type="obsolete"></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin 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="obsolete"><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="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation><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>
+        <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="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>wrong value for argument"speed"</translation>
+        <translation type="obsolete">wrong value for argument"speed"</translation>
     </message>
     <message>
         <source>application/x2go:x2go:Configuration File for X2Go Session</source>
@@ -2756,22 +3377,30 @@ Sie können SSHD über folgenden Befehl installieren:
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Sie haben den clientseitigen Druckdialog deaktiviert.</translation>
+        <translation type="obsolete">Sie haben den clientseitigen Druckdialog deaktiviert.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Über die Clienteinstellungen (Menü -> Einstellungen -> Konfiguration) können Sie den Dialog wieder einblenden</translation>
+        <translation type="obsolete">Über die Clienteinstellungen (Menü -> Einstellungen -> Konfiguration) können Sie den Dialog wieder einblenden</translation>
     </message>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Drucken - X2GoClient</translation>
     </message>
@@ -2779,118 +3408,126 @@ Sie können SSHD über folgenden Befehl installieren:
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Datei speichern</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>PDF Dokument (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Befehl konnte nicht ausgeführt werden:</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Druckfehler</translation>
+        <translation type="obsolete">Druckfehler</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Als PDF anzeigen</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Druckeinstellungen</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Druckbefehl:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Anzeigeoptionen</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Als PDF (Anzeige) öffnen</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Befehl:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Als Datei speichern</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Diesen Dialog vor Druckstart anzeigen</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Legen Sie hier die Druckerkonfiguration für den clientseitigen Druck fest.<br><br>Um die erzeugten Dateien auf einem Drucker ausgeben zu können, wird ein externes Programm benötigt. Typischerweise wird <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">Ghostprint</a>; und <a href="http://pages.cs.wisc.edu/~ghost/gsview/">Ghostview</a>; verwendet<br>Weiterführende Infromationen erhalten Sie <a hre [...]
+        <translation type="obsolete">Legen Sie hier die Druckerkonfiguration für den clientseitigen Druck fest.<br><br>Um die erzeugten Dateien auf einem Drucker ausgeben zu können, wird ein externes Programm benötigt. Typischerweise wird <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">Ghostprint</a>; und <a href="http://pages.cs.wisc.edu/~ghost/gsview/">Ghostview</a>; verwendet<br>Weiterführende Infromationen erhalt [...]
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Drucker:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Mit Hilfe eines PDF-Anzeigeprogramms drucken
 (PDF-Anzeigeprogramm muss installiert sein)</translation>
     </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Druckbefehl</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2901,47 +3538,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Ausgabeformat</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Bitte wählen Sie ein Dateiformat für den Druck (passend zu Ihrer Druckumgebung - bei Verwendung von CUPS können Sie z.B, PDF nutzen)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Datenstruktur</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Bitte wählen Sie die Ausgabeform für die Druckübergabe (Einige Druckumgebungen erwarten Dateien als Programmoptionen, andere erwarten die Ausgabe als "standard input"):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>standard input (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Geben Sie den Pfad als Programmoption an</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2950,7 +3587,7 @@ Beispiel:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><Pfad zur gsprint.exe> -query -color</translation>
     </message>
@@ -2958,10 +3595,53 @@ Beispiel:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Keine Antwort vom Server. Möchten Sie die Sitzung unterbrechen?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
@@ -2986,55 +3666,55 @@ Beispiel:
         <translation type="obsolete">Aktiviere Audiounterstützung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Veröffentlichte Anwendungen</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Anzeige </translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>aktiviert</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>deaktiviert</translation>
     </message>
@@ -3043,74 +3723,82 @@ Beispiel:
         <translation type="obsolete">/usr/bin/startkde</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Sitzungseinstellungen...</translation>
+        <translation type="obsolete">Sitzungseinstellungen...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Desktopsymbol erzeugen...</translation>
+        <translation type="obsolete">Desktopsymbol erzeugen...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Sitzung entfernen</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Auflösung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Sound</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>angehalten</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP Verbindung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -3118,41 +3806,51 @@ Beispiel:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Zurück</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Desktopsymbol erzeugen</translation>
+        <translation type="obsolete">Desktopsymbol erzeugen</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Der Aufruf über Desktopsymbole kann erfolgen, ohne dass der X2Go Client sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Login-Vorgang über einen GPG-Schlüssel oder eine GPG-Smartcard konfiguriert haben.
+        <translation type="obsolete">Der Aufruf über Desktopsymbole kann erfolgen, ohne dass der X2Go Client sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Login-Vorgang über einen GPG-Schlüssel oder eine GPG-Smartcard konfiguriert haben.
 
 Wollen Sie den versteckten Modus verwenden?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Sitzungssymbol während Verbindung in der Taskleiste anzeigen</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
     </message>
@@ -3160,7 +3858,7 @@ Wollen Sie den versteckten Modus verwenden?</translation>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>Be&enden</translation>
     </message>
@@ -3177,7 +3875,7 @@ Wollen Sie den versteckten Modus verwenden?</translation>
         <translation type="obsolete">&Sitzung löschen</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>löschen</translation>
@@ -3187,280 +3885,304 @@ Wollen Sie den versteckten Modus verwenden?</translation>
         <translation type="obsolete">Sitzungsverwaltung</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Sitzungsvoreinstellungen</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>&Sitzung löschen</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Sitzungsverwaltung</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Desktopsymbol erzeugen...</translation>
+        <translation type="obsolete">&Desktopsymbol erzeugen...</translation>
     </message>
 </context>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Sitzungsname:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< Symbol ändern</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Pfad:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Login:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH-Port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>RSA-/DSA-Schlüssel verwenden (ssh):</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Anmeldung über voreingestellten SSH-Schlüssel oder ssh-agent</translation>
+        <translation type="obsolete">Anmeldung über voreingestellten SSH-Schlüssel oder ssh-agent</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos5 (GSSAPI) Authentifizierung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Übertragung der GSSAPI Legitimation auf den Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Proxy Server für SSH Verbindung verwenden</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Proxy-Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Gleiche Anmeldung wie für X2Go-Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Gleiches Kennwort wie für X2Go-Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>RSA/DSA-Schlüssel:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
         <source>ssh-agent or default ssh key</source>
-        <translation>SSH-Agent oder SSH-Standardschlüssel</translation>
+        <translation type="obsolete">SSH-Agent oder SSH-Standardschlüssel</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Sitzungsart</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Sitzungsart:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Verbindung mit Windows Terminalserver herstellen</translation>
+        <translation type="obsolete">Verbindung mit Windows Terminalserver herstellen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Andere Desktopumgebung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Veröffentlichte Anwendungen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Befehl:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Erweiterte Einstellungen...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Pfad zum Programm</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Direkte RDP Verbindung</translation>
+        <translation type="obsolete">Direkte RDP Verbindung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RDP port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Öffne Bild</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Öffne Schlüssel</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop Kommandozeilenoptionen:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient 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>
+        <translation type="obsolete">x2goclient 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>
 </context>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Display</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Tastatur</translation>
     </message>
@@ -3469,121 +4191,133 @@ Wollen Sie den versteckten Modus verwenden?</translation>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>Zwis&chenablage-Modus</translation>
+        <translation type="obsolete">Zwis&chenablage-Modus</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>Kopieren und Einfügen in beide Richtungen möglich</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Kopieren und Einfügen nur von Client zu Server möglich</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Kopieren und Einfügen nur von Server zu Client möglich</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Zwischenablage komplett deaktivieren</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
         <source>Auto detect keyboard settings</source>
-        <translation>Tastatureinstellungen automatisch erkennen</translation>
+        <translation type="obsolete">Tastatureinstellungen automatisch erkennen</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Tastatur nicht konfigurieren</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Tastatur konfigurieren</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Modell:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Tastaturlayout:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Variante:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>RDP Client</translation>
+        <translation type="obsolete">RDP Client</translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Eigener</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Ganzen Bildschirm verwenden</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Maximal verfügbare Größe</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Auflösung festlegen (DPI)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama-Erweiterung (unterstützt zwei oder mehr Bildschirme)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Breite:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Höhe:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Bildschirm:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Alle Bildschirme identifizieren</translation>
     </message>
     <message>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Keep current keyboard Settings</source>
         <translation type="obsolete">Tastaturlayout behalten</translation>
     </message>
@@ -3626,17 +4360,17 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Clientseitige Druckunterstützung</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Zusätzliche Parameter:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Kommandozeile:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>de</translation>
     </message>
@@ -3645,7 +4379,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/de</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>Kennwort</translation>
     </message>
@@ -3653,207 +4388,287 @@ sound system connections through firewalls</source>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Ordner</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Pfad</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>automatisch verbinden</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Pfad:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation>
+        <translation type="obsolete">Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Wähle Ordner</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Kodierung der Dateinamen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>lokal:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>entfernt:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient befindet sich im portablen Ausführungsmodus. Wenn Sie einen Pfad ausserhalb des USB Geräts wählen, können sie auf die Daten nicht von überall aus zugreifen</translation>
+        <translation type="obsolete">x2goclient befindet sich im portablen Ausführungsmodus. Wenn Sie einen Pfad ausserhalb des USB Geräts wählen, können sie auf die Daten nicht von überall aus zugreifen</translation>
     </message>
 </context>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
         <source>SSH proxy connection error</source>
-        <translation>Verbindungsfehler SSH-Proxy</translation>
+        <translation type="obsolete">Verbindungsfehler SSH-Proxy</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>SSH-Proxy Verbindungsfehler: </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>Aufbau des SSH-Proxy-Tunnels fehlgeschlagen</translation>
+        <translation type="obsolete">Aufbau des SSH-Proxy-Tunnels fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>Kann libssh nicht initialisieren</translation>
+        <translation type="obsolete">Kann libssh nicht initialisieren</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>Kann SSH-Sitzung nicht erstellen</translation>
+        <translation type="obsolete">Kann SSH-Sitzung nicht erstellen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>Verbindung zu Proxy-Server nicht möglich</translation>
+        <translation type="obsolete">Verbindung zu Proxy-Server nicht möglich</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>Verbindungsaufbau nicht möglich </translation>
+        <translation type="obsolete">Verbindungsaufbau nicht möglich </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Anmeldung fehlgeschlagen</translation>
+        <translation type="obsolete">Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
         <source>channel_forward_listen failed</source>
         <translation type="obsolete">channel_forward_listen schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation>Konnte SSH Client nicht starten. Bitte überprüfen Sie Ihre Installation und die GSSApi-Konfiguration.</translation>
+        <translation type="obsolete">Konnte SSH Client nicht starten. Bitte überprüfen Sie Ihre Installation und die GSSApi-Konfiguration.</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <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>
+        <translation type="obsolete">Überprüfen Sie die GSSApi-Konfiguration oder wählen Sie eine andere Authentisierungsmethode.</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>Kann Datei nicht öffnen </translation>
+        <translation type="obsolete">Kann Datei nicht öffnen </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>Kann entfernte Datei nicht öffnen</translation>
+        <translation type="obsolete">Kann entfernte Datei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>Kann entfernte Datei nicht schreiben </translation>
+        <translation type="obsolete">Kann entfernte Datei nicht schreiben </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>Kann Verbindung nicht herstellen zu </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward schlug fehl</translation>
+        <translation type="obsolete">channel_open_forward schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session schlug fehl</translation>
+        <translation type="obsolete">channel_open_session schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>Fehler beim Schreiben auf Socket</translation>
+        <translation type="obsolete">Fehler beim Schreiben auf Socket</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>Channel Lesefehler</translation>
+        <translation type="obsolete">Channel Lesefehler</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
-        <translation>Channel Schreibfehler</translation>
+        <translation type="obsolete">Channel Schreibfehler</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>Lesefehler TCP-Socket</translation>
+        <translation type="obsolete">Lesefehler TCP-Socket</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Socket-Fehler beim Erstellen</translation>
+        <translation type="obsolete">Socket-Fehler beim Erstellen</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Socket-Bind-Fehler</translation>
     </message>
@@ -3861,12 +4676,12 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Ausführbare Datei (*.exe)</translation>
     </message>
@@ -3874,70 +4689,75 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Sie müssen X2GoClient neu starten, um die Änderungen zu aktivieren</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>integrierten X-Server verwenden</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation>Nicht das primäre Clipboard verwenden</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>benutzerdefinierten X-Server verwenden</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>benutzerdefinierter X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>Ausführbare Datei:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>X-Server auf X2GoClient starten</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>Kommandozeilenoptionen:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>Kommandozeilenoptionen des X-Servers</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>Fenstermodus:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>Vollbildmodus:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>Einzelanwendung:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sshProcess</name>
diff --git a/res/i18n/x2goclient_es.ts b/res/i18n/x2goclient_es.ts
index 2a52b81..3096c6a 100644
--- a/res/i18n/x2goclient_es.ts
+++ b/res/i18n/x2goclient_es.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Aplicaciones Publicadas</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Buscar:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Iniciar</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Cerrar</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Educación</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Juegos</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Red</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Utilidades</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Otras</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Diálogo</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Contraseña anterior:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Nueva contraseña:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Repetir nueva contraseña:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>Etiqueta</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Las contraseñas introducidas no coinciden</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Estado:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Aceptando trabajos:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Ubicación:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Comentarios:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Ocupada</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Imprimiendo</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Detenida</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>No</translation>
     </message>
@@ -186,68 +186,80 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>No se seleccionó ninguna opción</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Este valor entra en conflico con otra opción</translation>
+        <translation type="obsolete">Este valor entra en conflico con otra opción</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Conflicto de opciones</translation>
+        <translation type="obsolete">Conflicto de opciones</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Test de conexión</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>Conexión HTTPS:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>Conexión SSH:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Velocidad de la conexión:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
-        <translation>Tiempo de espera sobrepasado en la conexión con el socket</translation>
+        <translation type="obsolete">Tiempo de espera sobrepasado en la conexión con el socket</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Error: </translation>
     </message>
@@ -255,162 +267,219 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Mostrar icono de notificación en la bandeja del sistema</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>Mostrar como icono de notificación al minimizar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Mostrar icono de notificación al cerrar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <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="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Restaurar ventana al desconectar la conexión</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>Usar LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>URL del servidor:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>URL del Servidor LDAP alternativo 1: </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>URL del Servidor LDAP alternativo 2:  </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>Configuración del servidor X</translation>
+        <translation type="obsolete">Configuración del servidor X</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>Aplicación X11:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>Versión de X11:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>Encontrar aplicación X11</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Puerto SSH del lado del cliente para exportar el sistema de archivos:</translation>
+        <translation type="obsolete">Puerto SSH del lado del cliente para exportar el sistema de archivos:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Iniciar sesión dentro del sitio web</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Opciones avanzadas</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Valores defecto</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&Ok</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>&Cancelar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Propiedades</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Impresión</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Advertencia</translation>
+        <translation type="obsolete">Advertencia</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2gocliente no puede encontrar ninguna aplicación X11. Instala Apple X11 o selecciona la ruta para la aplicación</translation>
+        <translation type="obsolete">x2gocliente no puede encontrar ninguna aplicación X11. Instala Apple X11 o selecciona la ruta para la aplicación</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Estás usando X11 (Servdio X-Windows de Apple) versión </translation>
+        <translation type="obsolete">Estás usando X11 (Servdio X-Windows de Apple) versión </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Esta versión tiene problemas con aplicaciones X con 24bits de color. Deberías actualizar tu entorno X11 (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">. Esta versión tiene problemas con aplicaciones X con 24bits de color. Deberías actualizar tu entorno X11 (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>No se encontró una aplicación X11 válida en la ruta seleccionada</translation>
+        <translation type="obsolete">No se encontró una aplicación X11 válida en la ruta seleccionada</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Conexión</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
@@ -422,32 +491,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Velocidad de la conexión</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Velocidad de la conexión:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>C&ompresión</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Método:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Método de compresión:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Calidad de la imagen:</translation>
     </message>
@@ -455,72 +524,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Diálogo</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Tamaño de página:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Tipo de papel:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Origen del papel:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Doble cara</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>A lo largo</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>A lo ancho</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Propiedades del controlador</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Opción</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>No se seleccionó ninguna opción</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>texto</translation>
     </message>
@@ -528,47 +597,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Sesión</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Conexión</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>C&arpetas compartidas</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&Ok</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>&Cancelar</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Valores por defecto</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Preferencias de la sesión</translation>
     </message>
@@ -576,38 +645,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>&Cancelar</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&compartir</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Preferencias ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Carpeta personalizada ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>compartir carpetas</translation>
+        <translation type="obsolete">compartir carpetas</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Elegir carpeta</translation>
     </message>
@@ -615,7 +688,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation>Carpeta de sesión</translation>
     </message>
@@ -623,72 +696,88 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Carpetas</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation>Crear Nueva Carpeta</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
-        <translation>Renombrar Carpeta...</translation>
+        <translation type="obsolete">Renombrar Carpeta...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
-        <translation>Cambiar Icono...</translation>
+        <translation type="obsolete">Cambiar Icono...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
-        <translation>Eliminar Carpeta...</translation>
+        <translation type="obsolete">Eliminar Carpeta...</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation>Abrir imagen</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Imágenes</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>Cliente X2Go</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation>Nombre de la Carpeta:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation>No se puede eliminar "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>" la Carpeta no está vacía. Elimina el contenido de la carpeta e inténtalo otra vez.</translation>
+        <translation type="obsolete">" la Carpeta no está vacía. Elimina el contenido de la carpeta e inténtalo otra vez.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation>Eliminar carpeta "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Nueva Carpeta</translation>
     </message>
@@ -696,7 +785,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
@@ -712,174 +801,202 @@
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Falló el inicio de sesión<br>Inténtalo de nuevo</translation>
+        <translation type="obsolete">Falló el inicio de sesión<br>Inténtalo de nuevo</translation>
     </message>
     <message>
         <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
         <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="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>La clave del servidor ha cambiado.
 Ahora es: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>La conexión ha finalizado por razones de seguridad</translation>
+        <translation type="obsolete">La conexión ha finalizado por razones de seguridad</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>No se ha encontrado la clave para este servidor aunque se han encontrado claves de otro tipo. Un hacker podría cambiar la clave por defecto del servidor para hacer creer al cliente que la clave no existe</translation>
+        <translation type="obsolete">No se ha encontrado la clave para este servidor aunque se han encontrado claves de otro tipo. Un hacker podría cambiar la clave por defecto del servidor para hacer creer al cliente que la clave no existe</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>No se encontró el archivos de claves conocidas en este equipo. Si aceptas se creará en nuevo archivo de claves</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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Este servidor es desconocido. ¿Confiar en su clave?
 Hash de su clave pública: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Falló la comprobación de la clave del equipo</translation>
+        <translation type="obsolete">Falló la comprobación de la clave del equipo</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Código de verificación:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Introduce la frase de paso para desencriptar la clave</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Fallo de autenticación</translation>
+        <translation type="obsolete">Fallo de autenticación</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Fallo en la seguridad de la conexión</translation>
+        <translation type="obsolete">Fallo en la seguridad de la conexión</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Issued to:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Issued by:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerprints:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>Salir del cliente X2Go</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Añadir excepción</translation>
     </message>
@@ -887,45 +1004,45 @@ Hash de su clave pública: </translation>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Sonido</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Activar soporte de sonido</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Iniciar demonio de sonido</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>Usar el demonio de sonido actual</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Usar el tunel de puertos SSH para
 el sonido en conexiones a través de firewalls</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Usar el puerto para el sonido por defecto</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Puerto de sonido:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Soporte para imprimir en el cliente</translation>
     </message>
@@ -933,13 +1050,12 @@ el sonido en conexiones a través de firewalls</translation>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>Iniciando el cliente X2Go...</translation>
+        <translation type="obsolete">Iniciando el cliente X2Go...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>es</translation>
     </message>
@@ -948,386 +1064,368 @@ el sonido en conexiones a través de firewalls</translation>
         <translation type="obsolete">pc105/es</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>Cliente X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>conectando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Navegador web</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>Cliente de correo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>Iniciando x2goclint en modo portable... el directorio de los datos es: </translation>
+        <translation type="obsolete">Iniciando x2goclint en modo portable... el directorio de los datos es: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Preferencias ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Soporte ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>Acerca del cliente X2Go</translation>
+        <translation type="obsolete">Acerca del cliente X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>Cliente X2Go iniciado.</translation>
+        <translation type="obsolete">Cliente X2Go iniciado.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation>No se puede cargar el traductor:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Traductor: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation> instalado.</translation>
+        <translation type="obsolete"> instalado.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Compartir carpeta...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Reconectar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>Abrir nueva ventana X2go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Minimizar barra de herramientas</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Sesión:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Salir</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Nueva sesión ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Gestión de sesiones...</translation>
+        <translation type="obsolete">Gestión de sesiones...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Crear icono de sesión en el escritorio...</translation>
+        <translation type="obsolete">&Crear icono de sesión en el escritorio...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Seleccionar contraseña para el broker...</translation>
+        <translation type="obsolete">&Seleccionar contraseña para el broker...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>Test de &conectividad...</translation>
+        <translation type="obsolete">Test de &conectividad...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Mostrar barra de herramientas</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Sobre Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Sesión</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Opciones</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Ayuda</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Usuario:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Falló la operación</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Contraseña cambiada</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>¡Contraseña errónea!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Conectando al broker</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Autenticación</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Restaurar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>No conectado</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Desarrollo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Educación</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Juegos</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Gráficos</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Redes</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Ajustes</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Utilidades</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Otros</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Botón izquierdo del ratón para ocultar/restaurar - Botón derecho del ratón para mostrar el menú contextual</translation>
+        <translation type="obsolete">Botón izquierdo del ratón para ocultar/restaurar - Botón derecho del ratón para mostrar el menú contextual</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
         <source>Closing x2goclient...</source>
-        <translation>Cerrando x2goclient...</translation>
+        <translation type="obsolete">Cerrando x2goclient...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
         <source>Closed  x2goclient.</source>
-        <translation>x2goclient finalizado.</translation>
+        <translation type="obsolete">x2goclient finalizado.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Comprueba los datos de conexión LDAP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>no se encontró ningún servidor X2Go en el LDAP</translation>
+        <translation type="obsolete">no se encontró ningún servidor X2Go en el LDAP</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1353,26 +1451,21 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">Enlace a la sesión X2go </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>No se han encontrado sesiones X2Go.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>valor erróneo para el argumento "--clipboard"</translation>
+        <translation type="obsolete">valor erróneo para el argumento "--clipboard"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>Error de SSH</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -1382,7 +1475,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>El demonio SSH no pudo iniciarse
+        <translation type="obsolete">El demonio SSH no pudo iniciarse
 
 Se necesita el demonio SSH para el sistema de impresión y compartición de archivos.
 
@@ -1392,14 +1485,13 @@ para windows incluye su propio sshd.exe
 Si ves este mensaje te pedimos notifiques el error en el registro de errores de X2Go.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>El demonio SSH no pudo iniciarse
+        <translation type="obsolete">El demonio SSH no pudo iniciarse
 
 Se necesita el demonio SSH para el sistema de impresión y compartición de archivos
 
@@ -1407,22 +1499,20 @@ Pregunte al administrador del sistema para que suministre el servicio
 SSH en tu ordenador.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>El demonio SSH falló al abrir la clave pública del host de la aplicación.</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="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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
 usada para exportar carpetas e impresoras.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>El demonio SSH falló al abrir el acrhivo authoized_keys de la aplicación.</translation>
+        <translation type="obsolete">El demonio SSH falló al abrir el acrhivo authoized_keys de la aplicación.</translation>
     </message>
     <message>
         <source>X2Go sessions not found</source>
@@ -1433,58 +1523,56 @@ authoized_keys file.</source>
         <translation type="obsolete">¿Eliminar esta sesión?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>Conexión RDP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Conectar al escritorio local</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> on </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation>Iniciando conección con el servidor: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation> a </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Error en la conexión (</translation>
+        <translation type="obsolete">Error en la conexión (</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
         <source>Couldn't find a SSH connection.</source>
-        <translation>No se pudo encontrar la conexión SSH.</translation>
+        <translation type="obsolete">No se pudo encontrar la conexión SSH.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Introduce la frase de paso para desencriptar la clave</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>La clave del servidor ha cambiado.
@@ -1499,365 +1587,322 @@ Ahora es: </translation>
         <translation type="obsolete">No se ha encontrado la clave para este servidor aunque se han econtrado otras. Un hacker podría cambiar la clave por defecto del servidor para hacer creer al cliente que la clave no existe</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>No se encontró el archivos de claves en este equipo. Si aceptas se creará en nuevo archivo de claves</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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Este servidor es desconocido. ¿Confiar en su clave?
 Hash de su clave pública: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Falló la comprobación de la clave del equipo</translation>
+        <translation type="obsolete">Falló la comprobación de la clave del equipo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Código de verificación:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Esto puede indicar un ataque del tipo main-in-the-middle.
+        <translation type="obsolete">Esto puede indicar un ataque del tipo main-in-the-middle.
 Alguien podría estar escuhando las comunicaciones.
 Por razones de seguridad se recomienda finalizar la conexión.
 ¿Finalizar la conexión?
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Si</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 ¿Actualizar la clave del host?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>No se encuentra la clave del host para este servidor pero el servidor tiene otro tipo de clave disponible. Un atacante podría cambiar la clave por defecto del servidor para hacer creer al cliente x2go que la clave del servidor no existe.
+        <translation type="obsolete">No se encuentra la clave del host para este servidor pero el servidor tiene otro tipo de clave disponible. Un atacante podría cambiar la clave por defecto del servidor para hacer creer al cliente x2go que la clave del servidor no existe.
 Por razones de seguridad se recomienda finalizar la conexión.
 ¿Finalizar la conexión?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Fallo en la autenticación: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Falló la autenticación</translation>
+        <translation type="obsolete">Falló la autenticación</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Introduce la contraseña para el proxy SSH</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Error en la conexión</b></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <translation type="obsolete"><b>Error en la conexión</b></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Contraseña incorrecta</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Fallo en la conexión: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation> - Contraseña incorrecta.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>Servidor no disponible</translation>
+        <translation type="obsolete">Servidor no disponible</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>Servidor no disponible</translation>
+        <translation type="obsolete">Servidor no disponible</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Seleccionar sesión:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>activa</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>suspendida</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Escritorio</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>aplicación</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>sesión tipo shadow</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>No se encontró ningún escritorio al que conectarse</translation>
+        <translation type="obsolete">No se encontró ningún escritorio al que conectarse</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Elige escritorio:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Atención</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Tu profundidad de color actual es diferente de la profundidad de color de tu sesión de x2go. ¡Esto suele provocar problemas en la reconección y en la mayoría de los casos <b>perderás la sesión</b> y tendrás que iniciar una nueva! Te recomendamos cambiar la profundidad de color de tu pantalla a </translation>
+        <translation type="obsolete">Tu profundidad de color actual es diferente de la profundidad de color de tu sesión de x2go. ¡Esto suele provocar problemas en la reconección y en la mayoría de los casos <b>perderás la sesión</b> y tendrás que iniciar una nueva! Te recomendamos cambiar la profundidad de color de tu pantalla a </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 o 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> bit y reiniciar tu servidor X antes de reconectar a esta sesión x2go. <br>¿Recuperar esta sesión?</translation>
+        <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="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>suspendiendo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>terminando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>¡Contraseña incorrecta!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Iniciada nueva sesión</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Sesión suspendida</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>No se ha podido crear la carpeta: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>No se ha podido guardar el archivo: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation>Salida de emergencia.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Esperando a la salida del proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Error, finalizando el proxy.</translation>
+        <translation type="obsolete">Error, finalizando el proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Parámetro incorrecto: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Métodos de empaquetado</translation>
+        <translation type="obsolete">Métodos de empaquetado</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>La opción no está disponible en esta versión</translation>
+        <translation type="obsolete">La opción no está disponible en esta versión</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Registro de cambios</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Información Git</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>No se ha podido crear la carpeta:</translation>
+        <translation type="obsolete">No se ha podido crear la carpeta:</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
         <translation type="obsolete">No se ha podido guardar el archivo:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>Añadir ventana X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>No fue posible crear el tunel SSL:</translation>
+        <translation type="obsolete">No fue posible crear el tunel SSL:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>No fue posible crear el tunel SSL:</translation>
+        <translation type="obsolete">No fue posible crear el tunel SSL:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>Finalizada</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>iniciando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translatorcomment>Not sure if trying to connect to a resumed session or the running session is being resumed.
 
@@ -1866,109 +1911,93 @@ Current translation is for trying to connect a resumed session. If not wil be be
         <translation>restaurando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Tiempo de conexión finalizado. Cancelando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>cancelando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>¿Seguro que quieres finalizar la sesión?
+        <translation type="obsolete">¿Seguro que quieres finalizar la sesión?
 Los documentos no guardados se perderán</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Sesión</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Monitor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translatorcomment>Not sure if "creation time" means the date the session was created</translatorcomment>
         <translation>Sesión creada en</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Error en la conexión</b>
+        <translation type="obsolete"><b>Error en la conexión</b>
 :</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (no se puede abrir el archivo)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (el archivo no existe)</translation>
+        <translation type="obsolete"> (el archivo no existe)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (la carpeta no existe)</translation>
+        <translation type="obsolete"> (la carpeta no existe)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>valor incorrecto para el argumento "--link"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--link"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>valor incorrecto para el argumento "--sound"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--sound"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>valor incorrecto para el argumento "--geometry"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--geometry"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>valor incorrecto para el argumento "--set-kdb"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--set-kdb"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>valor incorrecto para el argumento "--ldap"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--ldap"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>valor incorrecto para el argumento "--ldap1"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>valor incorrecto para el argumento "--ldap2"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--ldap2"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>valor incorrecto para el argumento "--pack"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "--pack"</translation>
     </message>
     <message>
         <source>wrong parameter: </source>
@@ -1979,454 +2008,1066 @@ Los documentos no guardados se perderán</translation>
         <translation type="obsolete">Opciones</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Métodos disponibles:</translation>
+        <translation type="obsolete">Métodos disponibles:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>Archivo RSA vacío.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>No se puede abrir la clave: </translation>
+        <translation type="obsolete">No se puede abrir la clave: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Soporte</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin 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="obsolete"><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="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <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 [...]
+        <translation type="obsolete"><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 gest [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>cliente X2Go v. </translation>
+        <translation type="obsolete"><b>cliente X2Go v. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Revisa las opciones acceso a LDAP</translation>
+        <translation type="obsolete">Revisa las opciones acceso a LDAP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>No se encontró una semart card válida</translation>
+        <translation type="obsolete">No se encontró una semart card válida</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Tarjeta no configurada.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>El sistema C2Go no reconocoe esta smart card</translation>
+        <translation type="obsolete">El sistema C2Go no reconocoe esta smart card</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Impoble crear el archivo:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
-        <translation>No se puede conectar con el servidor X
+        <translation type="obsolete">No se puede conectar con el servidor X
 Comprueba los datos de configuración</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>No se puede iniciar el servidor X
+        <translation type="obsolete">No se puede iniciar el servidor X
 Comprueba los datos de configuración</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>No se puede iniciar el servidor X
+        <translation type="obsolete">No se puede iniciar el servidor X
 Comprueba la instalación del sistema</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Imposible ejecutar el comando: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>El servidor remoto no soporta el sistema de archivos exportado a través del tunel SSH
+        <translation type="obsolete">El servidor remoto no soporta el sistema de archivos exportado a través del tunel SSH
 Actualiza el paquete x2goserver en el servidor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Imposible leer:</translation>
+        <translation type="obsolete">Imposible leer:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Imposible escribir:</translation>
+        <translation type="obsolete">Imposible escribir:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Fallo al obtener el tamaño de la ventana (¿está la ventana cerrada?)</translation>
+        <translation type="obsolete">Fallo al obtener el tamaño de la ventana (¿está la ventana cerrada?)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>Sesión X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>valor incorrecto para el argumento "velocidad"</translation>
+        <translation type="obsolete">valor incorrecto para el argumento "velocidad"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Tipo de teclado:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Aplicaciones...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10906"/>
-        <source>Abort</source>
-        <translation>Cancelar</translation>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
-        <source>Show details</source>
-        <translation>Mostrar detalles</translation>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
-        <source>Resume</source>
-        <translation>Desconectar</translation>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
-        <source>New</source>
-        <translation>Nueva</translation>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
-        <source>Full access</source>
-        <translation>Acceso completo</translation>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
-        <source>View only</source>
-        <translation>Sólo ver</translation>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
-        <source>Status</source>
-        <translation>Estado</translation>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
-        <source>Command</source>
-        <translation>Comando</translation>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
-        <source>Type</source>
-        <translation>Tipo</translation>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
-        <source>Server</source>
-        <translation>Servidor</translation>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
-        <source>Client IP</source>
-        <translation>IP del cliente</translation>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
-        <source>Session ID</source>
-        <translation>ID de la Sesión</translation>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
-        <source>User</source>
-        <translation>Usuario</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
-        <source>Only my desktops</source>
-        <translation>Sólo mis escritorios</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <source>A left click hides or restores the window. A right click displays the context menu.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>sshd not started, you'll need sshd for printing and file sharing
-you can install sshd with
-<b>sudo apt-get install openssh-server</b></source>
-        <translation type="obsolete">no se ha iniciado sshd. Necesitas iniciar sshd para imprimir y para compartir carpetas
-puedes instalar sshd con
-<b>sudo apt-get install openssh-server</b></translation>
+        <location filename="../../src/onmainwindow.cpp" line="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
-        <source>Restore toolbar</source>
-        <translation>Restaurar barra de herramientas</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
-        <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>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
-        <source>Print - X2Go Client</source>
-        <translation>Imprimir - Cliente X2Go</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
-        <source>Print</source>
-        <translation>Imprimir</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
-        <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Has desactiva el diálogo de impresión del cliente x2go.</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
-        <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Puedes reactivar este diálogo dentro de las preferencia del cliente x2go (Menú -> Opciones - > Preferencias)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
-        <source>Save File</source>
-        <translation>Guardar Archivo</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
-        <source>PDF Document (*.pdf)</source>
-        <translation>Documento PDF (*.pdf)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
-        <source>Failed to execute command:
-</source>
-        <translation>Fallo al ejecutar el comando:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
-        <source>Printing error</source>
-        <translation>Error de impresión</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
-        <source>Form</source>
-        <translation>Formulario</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
-        <source>Print</source>
-        <translation>Imprimir</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
-        <source>View as PDF</source>
-        <translation>Mostrar como PDF</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
-        <source>Print settings</source>
-        <translation>Opciones de impresión</translation>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
-        <source>Printer:</source>
-        <translation>Impresora:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
-        <source>Print using default Windows PDF Viewer
-(Viewer application needs to be installed)</source>
-        <translation>Imprimir usando el Visor PDF por defecto
-(se necesita instalar un visor de PDF)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
-        <source>Printer command:</source>
-        <translation>Comando de impresión:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
-        <source>Viewer settings</source>
-        <translation>Parámetros del visor</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
-        <source>Open in viewer application</source>
-        <translation>Abrir con el programa</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <source>This likely means the binary is not available.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
-        <source>Command:</source>
-        <translation>Comando:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
-        <source>Save to disk</source>
-        <translation>Guardar como archivo</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
-        <source>Show this dialog before start printing</source>
-        <translation>Mostrar este diálogo antes de imprimir</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
-        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Configura los parámetros de impresión en el lado del cliente.<br><br>Si quieres imprimir el archivo creado necesitas un programa externo. Normalmente puedes usar <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; y <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Puedes encontrar más información<a href="http://www.x2go.org/index.php?id=49">aquí</ [...]
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
-        <source>Printer command</source>
-        <translation>Comando para imprimir</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
-        <source>Command</source>
-        <translation>Comando</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
-        <source>Please enter your customized or individual printing command.
-Examples:
-kprinter
-lpr -P hp_laserjet</source>
-        <translation>Introduce tu comando personalizado para imprimir.
-Ejemplos:
-kprinter
-lpr -P hp_larserjet</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
-        <source>Output format</source>
-        <translation>Formato de salida</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
-        <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
-        <translation>Selecciona el formato de impresión (de acuerdo a tu entorno de impresión - si usas CUPS puedes usar PDF)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
-        <source>PDF</source>
-        <translation>PDF</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="printercmddialog.ui" line="75"/>
-        <source>PS</source>
-        <translation>PS</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
-        <source>Data structure</source>
-        <translation>Estructura de datos</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
-        <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
-        <translation>Selecciona el método de entrada para el archivo de impresión (algunos comando aceptan archivos de impresión como opciones; otros reciben datos de la entrada estándar):</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
-        <source>standard input (STDIN)</source>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
+        <source>Abort</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
+        <source>Show details</source>
+        <translation>Mostrar detalles</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
+        <source>Resume</source>
+        <translation>Desconectar</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
+        <source>New</source>
+        <translation>Nueva</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
+        <source>Full access</source>
+        <translation>Acceso completo</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
+        <source>View only</source>
+        <translation>Sólo ver</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
+        <source>Status</source>
+        <translation>Estado</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
+        <source>Command</source>
+        <translation>Comando</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
+        <source>Server</source>
+        <translation>Servidor</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
+        <source>Client IP</source>
+        <translation>IP del cliente</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
+        <source>Session ID</source>
+        <translation>ID de la Sesión</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
+        <source>User</source>
+        <translation>Usuario</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
+        <source>Only my desktops</source>
+        <translation>Sólo mis escritorios</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sshd not started, you'll need sshd for printing and file sharing
+you can install sshd with
+<b>sudo apt-get install openssh-server</b></source>
+        <translation type="obsolete">no se ha iniciado sshd. Necesitas iniciar sshd para imprimir y para compartir carpetas
+puedes instalar sshd con
+<b>sudo apt-get install openssh-server</b></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
+        <source>Restore toolbar</source>
+        <translation>Restaurar barra de herramientas</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
+        <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>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
+        <source>Print - X2Go Client</source>
+        <translation>Imprimir - Cliente X2Go</translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="31"/>
+        <source>Print</source>
+        <translation>Imprimir</translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You've deactivated the x2go client printing dialog.</source>
+        <translation type="obsolete">Has desactiva el diálogo de impresión del cliente x2go.</translation>
+    </message>
+    <message>
+        <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
+        <translation type="obsolete">Puedes reactivar este diálogo dentro de las preferencia del cliente x2go (Menú -> Opciones - > Preferencias)</translation>
+    </message>
+</context>
+<context>
+    <name>PrintProcess</name>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="170"/>
+        <source>Save File</source>
+        <translation>Guardar Archivo</translation>
+    </message>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="172"/>
+        <source>PDF Document (*.pdf)</source>
+        <translation>Documento PDF (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
+        <source>Failed to execute command:
+</source>
+        <translation>Fallo al ejecutar el comando:</translation>
+    </message>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Printing error</source>
+        <translation type="obsolete">Error de impresión</translation>
+    </message>
+</context>
+<context>
+    <name>PrintWidget</name>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
+        <source>Print</source>
+        <translation>Imprimir</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
+        <source>View as PDF</source>
+        <translation>Mostrar como PDF</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
+        <source>Print settings</source>
+        <translation>Opciones de impresión</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
+        <source>Printer:</source>
+        <translation>Impresora:</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
+        <source>Print using default Windows PDF Viewer
+(Viewer application needs to be installed)</source>
+        <translation>Imprimir usando el Visor PDF por defecto
+(se necesita instalar un visor de PDF)</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
+        <source>Printer command:</source>
+        <translation>Comando de impresión:</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
+        <source>Viewer settings</source>
+        <translation>Parámetros del visor</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
+        <source>Open in viewer application</source>
+        <translation>Abrir con el programa</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
+        <source>Command:</source>
+        <translation>Comando:</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
+        <source>Save to disk</source>
+        <translation>Guardar como archivo</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
+        <source>Show this dialog before start printing</source>
+        <translation>Mostrar este diálogo antes de imprimir</translation>
+    </message>
+    <message>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
+        <translation type="obsolete">Configura los parámetros de impresión en el lado del cliente.<br><br>Si quieres imprimir el archivo creado necesitas un programa externo. Normalmente puedes usar <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; y <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Puedes encontrar más información<a href="http://www.x2go.org/index.php?id=49&qu [...]
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrinterCmdDialog</name>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
+        <source>Printer command</source>
+        <translation>Comando para imprimir</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
+        <source>Command</source>
+        <translation>Comando</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
+        <source>Please enter your customized or individual printing command.
+Examples:
+kprinter
+lpr -P hp_laserjet</source>
+        <translation>Introduce tu comando personalizado para imprimir.
+Ejemplos:
+kprinter
+lpr -P hp_larserjet</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
+        <source>Output format</source>
+        <translation>Formato de salida</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
+        <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
+        <translation>Selecciona el formato de impresión (de acuerdo a tu entorno de impresión - si usas CUPS puedes usar PDF)</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
+        <source>PDF</source>
+        <translation>PDF</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
+        <source>PS</source>
+        <translation>PS</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
+        <source>Data structure</source>
+        <translation>Estructura de datos</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
+        <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
+        <translation>Selecciona el método de entrada para el archivo de impresión (algunos comando aceptan archivos de impresión como opciones; otros reciben datos de la entrada estándar):</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
+        <source>standard input (STDIN)</source>
         <translation>entrada estándar (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>especificar ruta como parámetro del programa</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2435,7 +3076,7 @@ Ejemplo:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><Ruta a gsprint.exe> -query -color</translation>
     </message>
@@ -2443,135 +3084,186 @@ Ejemplo:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>No se ha recibido respuesta del servidor remoto. ¿Finalizar la sesión actual?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Preferencias de la sesión...</translation>
+        <translation type="obsolete">Preferencias de la sesión...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Crear icono de sesión en el escritorio...</translation>
+        <translation type="obsolete">Crear icono de sesión en el escritorio...</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Borrar sesión</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Acciones sobre la sesión</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Elegir tipo</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Elegir resolución</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Alternar entre soporte para sonido activo sí o no</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Nueva sesión</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>activa</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>suspendida</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>Conexión RDP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Conexión al escritorio local</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Aplicaciones publicadas</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>pantalla completa</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Monitor</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>ventana</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Máximo</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>Activo</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>Desactivado</translation>
     </message>
@@ -2579,41 +3271,51 @@ Ejemplo:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Atrás</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Crear icono de sesión en el escritorio</translation>
+        <translation type="obsolete">Crear icono de sesión en el escritorio</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Los iconoes del escritorio pueden configurarse para no mostrar la ventana del cliente x2go (modo oculto). Si quieres usar esta característica tienes que configurar el inicio de sesión usando una clave gpg o una smart card.
+        <translation type="obsolete">Los iconoes del escritorio pueden configurarse para no mostrar la ventana del cliente x2go (modo oculto). Si quieres usar esta característica tienes que configurar el inicio de sesión usando una clave gpg o una smart card.
 
 ¿Usar el cliente x2go en modo oculto?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Mostrar icono de sesión en la bandeja del sistema durante la ejecución</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Nueva sesión</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation>Enlace a la sesión X2go </translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>¿Eliminar esta sesión?</translation>
     </message>
@@ -2621,38 +3323,42 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>&Salir</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Nueva sesión</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Preferencias de la sesión</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>&Eliminar sesión</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Crear icono de sesion en el escritorio...</translation>
+        <translation type="obsolete">&Crear icono de sesion en el escritorio...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Manejo de sesiones</translation>
     </message>
@@ -2660,237 +3366,257 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Nombre de la sesión:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< cambiar icono</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Ruta:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Servidor</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Usuario:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>Puerto SSH:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Usar claves RSA/DSA para la conexión ssh:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Intentar auto inicio de sesión (a través del agente ssh o de la clave ssh por defecto)</translation>
+        <translation type="obsolete">Intentar auto inicio de sesión (a través del agente ssh o de la clave ssh por defecto)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Autenticación Kerberos 5 (GSSAPI)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Delegación de credenciales GSSAPI al servidor</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Usar servidor Proxy para la conexión SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Servidor Proxy</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Mismos datos de inicio de sesión que en el servidor X2GO</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Misma contraseña que el servidor X2Go</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>Clave RSA/DSA:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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>
         <source>ssh-agent or default ssh key</source>
-        <translation>agente ssh o clave ssh por defecto</translation>
+        <translation type="obsolete">agente ssh o clave ssh por defecto</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Puerto:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>Tipo de &sesión</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Tipo de sesión:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Conectar a Windows Terminal Server</translation>
+        <translation type="obsolete">Conectar a Windows Terminal Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Conectar al escritorio local</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Escritorio personalizado</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Aplicación</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Aplicaciones publicadas</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Comando:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Opciones avanzadas...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Ruta al ejecutable</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Conexión RDP directa</translation>
+        <translation type="obsolete">Conexión RDP directa</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>Puerto RDP:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Abrir imagen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Imágenes</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Archivo con la clave open</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Todos los archivos</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Servidor:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>Servidor XDMCP:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>opciones de línea de comando para rdesktop:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Nueva sesión</translation>
     </message>
@@ -2898,14 +3624,14 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Monitor</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Teclado</translation>
     </message>
@@ -2914,121 +3640,133 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">Sonido</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>Modo de &Portapapeles</translation>
+        <translation type="obsolete">Modo de &Portapapeles</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>Copiar y Pegar en ambas direcciones</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Copiar y pegar desde el cliente al servidor</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Copiar y pegar desde el servidor al cliente</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Desactivar portapapeles por completo</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
         <source>Auto detect keyboard settings</source>
-        <translation>Auto detectar preferencias del teclado</translation>
+        <translation type="obsolete">Auto detectar preferencias del teclado</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>No configurar el teclado</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Configurar el teclado</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Modelo:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Capa:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Variante:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>Cliente RDP</translation>
+        <translation type="obsolete">Cliente RDP</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Ventana</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Usar toda la pantalla</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Máxima disponible</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Especificar DPI</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Extensión Xinerama (soporta dos o más monitores físicos)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Ancho:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Alto:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Monitor:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Identificar monitores</translation>
     </message>
     <message>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Keep current keyboard Settings</source>
         <translation type="obsolete">Mantener las preferencias actuales para el teclado</translation>
     </message>
@@ -3071,17 +3809,17 @@ el sonido en conexiones a través de firewalls</translation>
         <translation type="obsolete">Soporte para imprimir en el cliente</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Parámetros adicionales:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Línea de comando:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>es</translation>
     </message>
@@ -3090,7 +3828,8 @@ el sonido en conexiones a través de firewalls</translation>
         <translation type="obsolete">pc105/es</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>contraseña</translation>
     </message>
@@ -3098,80 +3837,88 @@ el sonido en conexiones a través de firewalls</translation>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>Car&petas</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Automontar</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Ruta:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Codificación para los nombres de archivo</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>local:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>remoto:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Usar tunel de puertos SSH para el sistema de archivos a través de firewalls </translation>
+        <translation type="obsolete">Usar tunel de puertos SSH para el sistema de archivos a través de firewalls </translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Elegir carpeta</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3179,126 +3926,198 @@ el sonido en conexiones a través de firewalls</translation>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
         <source>SSH proxy connection error</source>
-        <translation>Error en la conexión con el proxy SSH</translation>
+        <translation type="obsolete">Error en la conexión con el proxy SSH</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>Error en la conexión con el proxy SSH: </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>Fallo al crear el tunel SSH a través del proxy</translation>
+        <translation type="obsolete">Fallo al crear el tunel SSH a través del proxy</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>No se puede inicializar libssh</translation>
+        <translation type="obsolete">No se puede inicializar libssh</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>No se puede crear la sesión ssh</translation>
+        <translation type="obsolete">No se puede crear la sesión ssh</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>No hay conexión con el servidor proxy</translation>
+        <translation type="obsolete">No hay conexión con el servidor proxy</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>No se puede conectar a </translation>
+        <translation type="obsolete">No se puede conectar a </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Fallo de autenticación</translation>
+        <translation type="obsolete">Fallo de autenticación</translation>
     </message>
     <message>
         <source>channel_forward_listen failed</source>
         <translation type="obsolete">error en channel_forward_listen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <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>
+        <translation type="obsolete">Fallo al iniciar el cliente SSH: Por favor comprueba tu instalación y la configuración GSSAPI</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <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>
+        <translation type="obsolete">Comprueba tu configuración GSSAPI o elije otro método de autenticación</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>No se puede abrir el archivo</translation>
+        <translation type="obsolete">No se puede abrir el archivo</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>No se puede crear el archivo remoto</translation>
+        <translation type="obsolete">No se puede crear el archivo remoto</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>No se puede escribir en el archivo remoto</translation>
+        <translation type="obsolete">No se puede escribir en el archivo remoto</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>no se puede conectar a </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>error en channel_open_forward</translation>
+        <translation type="obsolete">error en channel_open_forward</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>error en channel_open_session</translation>
+        <translation type="obsolete">error en channel_open_session</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>error en channel_request_exec</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>error escribiendo en el socket</translation>
+        <translation type="obsolete">error escribiendo en el socket</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>error leyendo el canal</translation>
+        <translation type="obsolete">error leyendo el canal</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
-        <translation>error en channel_write</translation>
+        <translation type="obsolete">error en channel_write</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>error leyendo el socket tcp</translation>
+        <translation type="obsolete">error leyendo el socket tcp</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Error creando el socket</translation>
+        <translation type="obsolete">Error creando el socket</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Error rellenando </translation>
     </message>
@@ -3306,12 +4125,12 @@ el sonido en conexiones a través de firewalls</translation>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Abrir Archivo</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Ejecutable (*.exe)</translation>
     </message>
@@ -3319,69 +4138,74 @@ el sonido en conexiones a través de firewalls</translation>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Debes reiniciar el Cliente X2Go para que los cambios se apliquen correctamente</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>usar el Servidor X integrado</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation> no usar el portapapeles principal</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>usar Servidor X personalizado</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>Servidor X personalizado</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>ejecutable:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>iniciar ServidorX en el inicio del cliente X2Go</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>opciones de la línea de comando:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>Opciones para la línea de comandos del Servidor X</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>modo ventana:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>modo pantalla completa:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>modo aplicación:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_et.ts b/res/i18n/x2goclient_et.ts
index 3514b28..ed67309 100644
--- a/res/i18n/x2goclient_et.ts
+++ b/res/i18n/x2goclient_et.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Kasutatavad programmid</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Otsi:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Käivita</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Sule</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Multimeedia</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Arendus</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Õppeotstarbelised</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Mäng</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Graafika</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Võrk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Kontoritarkvara</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Seaded</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>Süsteem</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Abiprogramm</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Muu</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Dialoog</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Vana salasõna:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Uus salasõna:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Kinnita salasõna:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>Seletus</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Salasõnad ei ole samad</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Vorm</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Omadused</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Olek:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Lubatud toimingud:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Tüüp:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Asukoht:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Kommentaar:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Ootel</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Prindib</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Peatatud</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Jah</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
@@ -186,68 +186,80 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Midagi ei ole valitud</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Valik on vastuoleus eelmise valikuga</translation>
+        <translation type="obsolete">Valik on vastuoleus eelmise valikuga</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Valikud ei ole omavahel kooskõlas</translation>
+        <translation type="obsolete">Valikud ei ole omavahel kooskõlas</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Ühenduse testimine</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS - ühendus:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH - ühendus:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Ühenduse kiirus:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
-        <translation>Soketi toiming vananes</translation>
+        <translation type="obsolete">Soketi toiming vananes</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Ebaõnnestus:</translation>
     </message>
@@ -255,162 +267,219 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Üldine</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Näita ikooni tegumiribal</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>Peida tegumiribale kui minimeeritakse</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Peida tegumiribale kui suletakse</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Peida tegumiribale kui ühendus on loodud</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Too uuesti esile kui ühendus katkeb</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>Kasuta LDAP-d</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>Serveri URL-aadress:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Esimese varuserveri URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Teise varuserveri URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>X-serveri seaded</translation>
+        <translation type="obsolete">X-serveri seaded</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11-programm:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11-versioon:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>Otsi X11-rakendus</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Kliendi SSH-port mida kasutatakse failide ekspordil:</translation>
+        <translation type="obsolete">Kliendi SSH-port mida kasutatakse failide ekspordil:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Käivita ühendus veebilehe sees</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Täpsemad valikud</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Vaikimisi omadused</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>&Loobu</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Seaded</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Printimine</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Hoiatus</translation>
+        <translation type="obsolete">Hoiatus</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2go-ei leida sobivat X11-rakendust. Installeeri Apple X11 või määa rakenduse asukoht</translation>
+        <translation type="obsolete">x2go-ei leida sobivat X11-rakendust. Installeeri Apple X11 või määa rakenduse asukoht</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Sa kasutad X11 (Apple X-Window Server) versiooni</translation>
+        <translation type="obsolete">Sa kasutad X11 (Apple X-Window Server) versiooni</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. See versioon tekitab probleeme 24 bitise värviedastusega. Uuenda oma X11-rakendus (http://trac.macosforge.org/projects/xquarts).</translation>
+        <translation type="obsolete">. See versioon tekitab probleeme 24 bitise värviedastusega. Uuenda oma X11-rakendus (http://trac.macosforge.org/projects/xquarts).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Valitud asukohast ei leita toimivat X11-rakendust</translation>
+        <translation type="obsolete">Valitud asukohast ei leita toimivat X11-rakendust</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Ühendus</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
@@ -422,32 +491,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Ühenduse kiirus</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Ühenduse kiirus:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>&Pakkimine</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Meetod:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Pakkimismeetod:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Pildi kvaliteet:</translation>
     </message>
@@ -455,72 +524,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Valikud</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Üldine</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Lehe suurus:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Paberi tüüp:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Paberi sisestusseade:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Kahepoolne-printimine</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Ära kasuta</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Pikk leht</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Lühike leht</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Ajuri seaded</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Valikud</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Väärtus</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Midagi ei ole valitud</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>tekst</translation>
     </message>
@@ -528,47 +597,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Sessioon</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Ühendus</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&Jagatud kataloogid</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>&Loobu</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Vaikimisi väärtused</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Sessiooni parameetrid -</translation>
     </message>
@@ -576,38 +645,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>&Loobu</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&jaga</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Parameetrid ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Vali kataloog ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Kustuta</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>jaga katalooge</translation>
+        <translation type="obsolete">jaga katalooge</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Vali kataloog</translation>
     </message>
@@ -615,7 +688,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation>Sessioonide kaust</translation>
     </message>
@@ -623,72 +696,88 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Kataloogid</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation>Loo uus kataloog</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
-        <translation>Nimeta kataloog ümber ...</translation>
+        <translation type="obsolete">Nimeta kataloog ümber ...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
-        <translation>Vaheta ikoon ...</translation>
+        <translation type="obsolete">Vaheta ikoon ...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
-        <translation>Kustuta kataloog...</translation>
+        <translation type="obsolete">Kustuta kataloog...</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation>Ava piltAva pilt</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Pildid</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>X2Go klient</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation>Kataloogi nimi:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation>Ei suuda eemaldada "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>". Kataloog ei ole tühi. Palun eemalda esmalt kataloogi susu ja proovi siis uuesti.</translation>
+        <translation type="obsolete">". Kataloog ei ole tühi. Palun eemalda esmalt kataloogi susu ja proovi siis uuesti.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation>Kustuta kataloog "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Uus Kataloog</translation>
     </message>
@@ -696,7 +785,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Valikud</translation>
     </message>
@@ -704,7 +793,7 @@
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translatorcomment>tarkista</translatorcomment>
@@ -712,162 +801,190 @@ It is now: </source>
 See on nüüd:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Ühendus katkestatakse turvalisuse tõttu</translation>
+        <translation type="obsolete">Ühendus katkestatakse turvalisuse tõttu</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</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 ei ole</translation>
+        <translation type="obsolete">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 ei ole</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Ei leidu tuntud võtmete faili. Kui kinnitad selle serveri võtme, moodustame automaatselt ka tuntud võtmete faili</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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Tundmatu server. Kas Sa usaldad tema võtit.?
 Tema avaliku võtme 'hash' on:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Võtme kontroll ebaõnnestus</translation>
+        <translation type="obsolete">Võtme kontroll ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Jah</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Kontrollkood:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anna võtme salasõna</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Autentimine ebaõnnestus</translation>
+        <translation type="obsolete">Autentimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Sisselogimine ebaõnnestus!<br>Palun ürita uuesti</translation>
+        <translation type="obsolete">Sisselogimine ebaõnnestus!<br>Palun ürita uuesti</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Turvalise ühenduse loomine ebaõnnestus</translation>
+        <translation type="obsolete">Turvalise ühenduse loomine ebaõnnestus</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Antud:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organisatsioon (O)</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisatsiooni allüksus(OU)</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Seeria number</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Väljaandja:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Kehtivus:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Välja antud</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>vananeb</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Sõrmejälg:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>Sulge X2GoClient</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Lisa erand</translation>
     </message>
@@ -875,44 +992,44 @@ Tema avaliku võtme 'hash' on:</translation>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Heli</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Võimalda heli</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Käivita helimoodul</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>kasuta käimasolevat heli moodulit</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Kasuta SSH port edastust heliseadete ühendamiseks pääsemaks läbi tulemüüri</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Kasuta vaikimisi heli porti</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Heli port:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Kliendipoolne printimine</translation>
     </message>
@@ -920,13 +1037,12 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>x2goclient käivitub...</translation>
+        <translation type="obsolete">x2goclient käivitub...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -935,501 +1051,1091 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>X2Go Client</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>ühendan</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Veebilehitseja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>E-mail kliendiprogramm</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>Käivitan x2goclient-i 'mobiilses' olekus... Andmekataloog on:</translation>
+        <translation type="obsolete">Käivitan x2goclient-i 'mobiilses' olekus... Andmekataloog on:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Seaded...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Tugi...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>X2Go client andmed</translation>
+        <translation type="obsolete">X2Go client andmed</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>X2Go klient on käivitatud.</translation>
+        <translation type="obsolete">X2Go klient on käivitatud.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation>Translaatori laadimine ei õnnestu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Translaator:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation>installeeritud.</translation>
+        <translation type="obsolete">installeeritud.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Jaga kataloog...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Rakendused...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Peata</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Sulge</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Ühenda uuesti</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>Haagi X2Go akent.lahti ;-)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Minimiseeri töövahendid</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Sessioon:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Lõpeta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Lõpeta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Uus sessioon...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Sessiooni haldamine...</translation>
+        <translation type="obsolete">Sessiooni haldamine...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Tee sessiooniikoon töölauale...</translation>
+        <translation type="obsolete">&Tee sessiooniikoon töölauale...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Anna 'broker'-i salasõna...</translation>
+        <translation type="obsolete">&Anna 'broker'-i salasõna...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&Ühenduse test...</translation>
+        <translation type="obsolete">&Ühenduse test...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Näita töövahendite riba</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Qt andmed</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Sessioon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Valikud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Abi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Logi sisse:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Toiming ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Salasõna on vahetatud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Vale salasõna!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Ühendume 'broker'-iga</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentimine</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Taasta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>Ei ole ühendatud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Multimeedia</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Arendus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Õpetus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Mäng</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Graafika</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Võrk</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Office</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
-        <source>Settings</source>
-        <translation>Seaded</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
+        <source>Settings</source>
+        <translation>Seaded</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
+        <source>System</source>
+        <translation>Süsteem</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
+        <source>Utility</source>
+        <translation>Abiprogramm</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
+        <source>Other</source>
+        <translation>Muu</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
+        <translation type="obsolete">Vasak hiire nupp - peida/näita - Parem nupp - näta valikuid</translation>
+    </message>
+    <message>
+        <source>Closing x2goclient...</source>
+        <translation type="obsolete">x2goclient sulgub...</translation>
+    </message>
+    <message>
+        <source>Closed  x2goclient.</source>
+        <translation type="obsolete">X2goclient on suletud.</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
+        <source>Please check LDAP settings</source>
+        <translation>Palun kontrolli LDAP-sätteid</translation>
+    </message>
+    <message>
+        <source>no X2Go server found in LDAP </source>
+        <translation type="obsolete">X2Go -serverit ei leia LDAP-st </translation>
+    </message>
+    <message>
+        <source>Create session icon on desktop</source>
+        <translation type="obsolete">Loo sessiooni ikoon töölauale</translation>
+    </message>
+    <message>
+        <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
+
+Use x2goclient hidden mode?</source>
+        <translation type="obsolete">Töölauaikoonid võib sättida peitma x2goclient rakendust (hidden mode). Kui sa tahad seda võimalust kasutada siis säti login kasutama gpg-võtit või gpg -kaarti.
+
+Kasuta x2goclient programmi peidetuna? </translation>
+    </message>
+    <message>
+        <source>New Session</source>
+        <translation type="obsolete">Uus sessioon</translation>
+    </message>
+    <message>
+        <source>X2Go Link to session </source>
+        <translation type="obsolete">X2Go viit sessioonile</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
+        <source>No X2Go sessions found, closing.</source>
+        <translation>X2Go -sessioone ei leidunud, suleme. </translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete this session?</source>
+        <translation type="obsolete">Kas oled kindel, et tahad kustutada selle sessiooni?</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
+        <source>KDE</source>
+        <translation>KDE</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
+        <source>RDP connection</source>
+        <translation>RDP -ühendus</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
+        <source>XDMCP</source>
+        <translation>XDMCP</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
+        <source>Connection to local desktop</source>
+        <translation>Ühendus lokaalsele töölauale</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
+        <source> on </source>
+        <translation> sees </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
+        <source>Starting connection to server: </source>
+        <translation>Ühenduse loomine serveriga: </translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
+        <source> to </source>
+        <translation> => </translation>
+    </message>
+    <message>
+        <source>Connection Error(</source>
+        <translation type="obsolete">Ühenduse viga(</translation>
+    </message>
+    <message>
+        <source>Couldn't find a SSH connection.</source>
+        <translation type="obsolete">Ei leia SSH-ühendust.</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
+        <source>Enter passphrase to decrypt a key</source>
+        <translation>Anna võtme salasõna</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
+        <source>Host key for server changed.
+It is now: </source>
+        <translation>Serveri avalik võti on muutunud.
+See on nüüd:</translation>
+    </message>
+    <message>
+        <source>wrong value for argument"--clipboard"</source>
+        <translation type="obsolete">Vigane argumendi "--clipboard" väärtus</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
+        <source>Help</source>
+        <translation>Abi</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
-        <source>System</source>
-        <translation>Süsteem</translation>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
-        <source>Utility</source>
-        <translation>Abiprogramm</translation>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
-        <source>Other</source>
-        <translation>Muu</translation>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
-        <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Vasak hiire nupp - peida/näita - Parem nupp - näta valikuid</translation>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
-        <source>Closing x2goclient...</source>
-        <translation>x2goclient sulgub...</translation>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="onmainwindow.cpp" line="1456"/>
-        <source>Closed  x2goclient.</source>
-        <translation>X2goclient on suletud.</translation>
+        <location filename="../../src/onmainwindow.cpp" line="9351"/>
+        <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
-        <source>Please check LDAP settings</source>
-        <translation>Palun kontrolli LDAP-sätteid</translation>
+        <location filename="../../src/onmainwindow.cpp" line="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
-        <source>no X2Go server found in LDAP </source>
-        <translation>X2Go -serverit ei leia LDAP-st </translation>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create session icon on desktop</source>
-        <translation type="obsolete">Loo sessiooni ikoon töölauale</translation>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
-
-Use x2goclient hidden mode?</source>
-        <translation type="obsolete">Töölauaikoonid võib sättida peitma x2goclient rakendust (hidden mode). Kui sa tahad seda võimalust kasutada siis säti login kasutama gpg-võtit või gpg -kaarti.
-
-Kasuta x2goclient programmi peidetuna? </translation>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Session</source>
-        <translation type="obsolete">Uus sessioon</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X2Go Link to session </source>
-        <translation type="obsolete">X2Go viit sessioonile</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
-        <source>No X2Go sessions found, closing.</source>
-        <translation>X2Go -sessioone ei leidunud, suleme. </translation>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to delete this session?</source>
-        <translation type="obsolete">Kas oled kindel, et tahad kustutada selle sessiooni?</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
-        <source>KDE</source>
-        <translation>KDE</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="onmainwindow.cpp" line="2609"/>
-        <source>RDP connection</source>
-        <translation>RDP -ühendus</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
-        <source>XDMCP</source>
-        <translation>XDMCP</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
-        <source>Connection to local desktop</source>
-        <translation>Ühendus lokaalsele töölauale</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
-        <source> on </source>
-        <translation> sees </translation>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
-        <source>Starting connection to server: </source>
-        <translation>Ühenduse loomine serveriga: </translation>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
-        <source> to </source>
-        <translation> => </translation>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="onmainwindow.cpp" line="2734"/>
-        <source>Connection Error(</source>
-        <translation>Ühenduse viga(</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
-        <source>Couldn't find a SSH connection.</source>
-        <translation>Ei leia SSH-ühendust.</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
-        <source>Enter passphrase to decrypt a key</source>
-        <translation>Anna võtme salasõna</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="onmainwindow.cpp" line="2862"/>
-        <source>Host key for server changed.
-It is now: </source>
-        <translation>Serveri avalik võti on muutunud.
-See on nüüd:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
-        <source>wrong value for argument"--clipboard"</source>
-        <translation>Vigane argumendi "--clipboard" väärtus</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
-        <source>Help</source>
-        <translation>Abi</translation>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>SSH Viga</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -1439,7 +2145,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH daemoni ei suudeta käivitada.
+        <translation type="obsolete">SSH daemoni ei suudeta käivitada.
 Sa vajad seda printimiseks ja jagamiseks.
 
 Tavaliselt, seda viga ei juhtu kuna X2Go windowsi.klient
@@ -1449,36 +2155,33 @@ Kui Sa näed seda viga, palun tee selle kohta
 postitus X2Go bugtracker'isse.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>SSH daemon ei ole käivitatud.
+        <translation type="obsolete">SSH daemon ei ole käivitatud.
 
 Sa vajad SSH daemonit printimiseks ja jagamiseks
 Palu, et süsteemi administraator lisaks
 SSH service Sinu arvutisse.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>SSH daemon ei suuda avada rakenduse avalikku võtit.</translation>
+        <translation type="obsolete">SSH daemon ei suuda avada rakenduse avalikku võtit.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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
 eksportimaks katalooge ja printereid.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>SSH daemon ei suuda avada
+        <translation type="obsolete">SSH daemon ei suuda avada
 rakenduse 'authorized_keys' faili.</translation>
     </message>
     <message>
@@ -1490,442 +2193,387 @@ rakenduse 'authorized_keys' faili.</translation>
         <translation type="obsolete">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 ei ole</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host 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>
+        <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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Tundmatu server. Kas Sa usaldad tema võtit.?
 Tema avaliku võtme 'hash' on:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Võtme kontroll ebaõnnestus</translation>
+        <translation type="obsolete">Võtme kontroll ebaõnnestus</translation>
     </message>
     <message>
         <source>Show session tray icon when running</source>
         <translation type="obsolete">Kui programm töötab näita ikooni tegumiribal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Kontrollkood:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>See võib olla 'man-in-the-middle' rünnaku tunnus.
+        <translation type="obsolete">See võib olla 'man-in-the-middle' rünnaku tunnus.
 Tusvalisuse kaalutlustel on soovitatav katkestada ühendus.
 Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Jah</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 Kas sa tahad võtit uuendada?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </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 ei ole
+        <translation type="obsolete">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 ei ole
 Turvalisuse kaalutlusel soovitame ühendus katkestada.
 Kas Sa soovid ühenduse katkestada?
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Autentimine ebaõnnestus:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Autentimine ebaõnnestus</translation>
+        <translation type="obsolete">Autentimine ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Anna SSH proxy salasõna</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Ühendus ebaõnnestus</b>
+        <translation type="obsolete"><b>Ühendus ebaõnnestus</b>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Vale salasõna!</b><br /><br /></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Yhendus ebaõnnestus: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation>- Vale salasõna.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
         <translatorcomment>Typo in original</translatorcomment>
-        <translation>Ühtegi serverit ei leidu</translation>
+        <translation type="obsolete">Ühtegi serverit ei leidu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
         <translatorcomment>Typo</translatorcomment>
-        <translation>Server ei ole kättesaadav</translation>
+        <translation type="obsolete">Server ei ole kättesaadav</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Vali sessioon:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>töötab</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>peatatud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Töölaud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>rakendus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>Varisessioon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Ühtegi ligipääsetavat töölauda ei ledu</translation>
+        <translation type="obsolete">Ühtegi ligipääsetavat töölauda ei ledu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Valik</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Vali töölaud:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Su praegune värvieraldus on erinev kui x2go sessioonil. See võib põhjustada probleeme taasühendamisel ja enamusel juhtudest <b>ühendus kaob</b> ja Sa pead alustama uuesti. On kindlasti soovitatavet sa muudaksoma ekraani värvieralduseks </translation>
+        <translation type="obsolete">Su praegune värvieraldus on erinev kui x2go sessioonil. See võib põhjustada probleeme taasühendamisel ja enamusel juhtudest <b>ühendus kaob</b> ja Sa pead alustama uuesti. On kindlasti soovitatavet sa muudaksoma ekraani värvieralduseks </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 või 32 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> bitti ja käivitaksid X-serveri uuesti enne kui Sa ühendud uuesti selle x2go sessiooniga<br>Kas soovid jätkata vaatamata sllele?</translation>
+        <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="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>peatame</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>katkestame</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Vale salasõna!</b><br><br> </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Uus sessioon on käivitatud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Sessioon jätkub</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Kataloogi loomine ei õnnestu: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Ei õnnestu kirjutamine faili: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>Ühendu X2GO aknaga</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>Ei suuda luua SSL tunnelit:</translation>
+        <translation type="obsolete">Ei suuda luua SSL tunnelit:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>Ei suuda luua SSL Tunnelit:</translation>
+        <translation type="obsolete">Ei suuda luua SSL Tunnelit:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation>Hädaväljapääs.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Ootame kuni proxy lõpetab.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Ebaõnnestus, tapame proxy.</translation>
+        <translation type="obsolete">Ebaõnnestus, tapame proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>Lõpetatud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>Käivitub</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>jätkab</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Ühendus aegus, katkestame</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>katkestame</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>kas oled kindel et tahad sulgeda?
+        <translation type="obsolete">kas oled kindel et tahad sulgeda?
 Avatud failid ei salvestu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Sessioon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Ekraan</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Loomisaeg</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Ühendus ebaõnnestus</b>
+        <translation type="obsolete"><b>Ühendus ebaõnnestus</b>
 :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (ei saa avada faili)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (faili ei leidu)</translation>
+        <translation type="obsolete"> (faili ei leidu)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (kataloogi ei leidu)</translation>
+        <translation type="obsolete"> (kataloogi ei leidu)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>vale väärtus parameetril "--link"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--link"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>vale väärtus parameetril "--sound"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--sound"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>vale väärtus parameetril "--geometry"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--geometry"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>vale väärtus parameetril "--set-kbd"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--set-kbd"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>vale väärtus parameetril "--ldap"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--ldap"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>vale väärtus parameetril "--ldap1"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>vale väärtus parameetril "--ldap2"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--ldap2"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>vale väärtus parameetril "--pack"</translation>
+        <translation type="obsolete">vale väärtus parameetril "--pack"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Vale parameeter: </translation>
     </message>
@@ -1934,264 +2582,241 @@ Avatud failid ei salvestu</translation>
         <translation type="obsolete">Valikud</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Võimalikud pakkimisviisid:</translation>
+        <translation type="obsolete">Võimalikud pakkimisviisid:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Pakkimisviisid</translation>
+        <translation type="obsolete">Pakkimisviisid</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>See seade ei ole võimalik selles versioonis</translation>
+        <translation type="obsolete">See seade ei ole võimalik selles versioonis</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Muutuste nimekiri</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Git'i info</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Kataloogi loomine ei õnnestu:</translation>
+        <translation type="obsolete">Kataloogi loomine ei õnnestu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA-fail on tühi.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Võtme avamine ei õnnestu: </translation>
+        <translation type="obsolete">Võtme avamine ei õnnestu: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Abi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation><b><br> (C. 2005-2016 <b>kindlalt hea</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"><b><br> (C. 2005-2016 <b>kindlalt hea</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2plugin meetodi sponsori <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="obsolete"><br>x2plugin meetodi sponsori <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation><b>Töövahend mille abil võid ühenduda X2Go võrgus olevate arvutitega. Selle kliendiprogrammiga võid ühenduda X2GO serveritega ja alustada, lõpetada, katkestada ja jätkata olemasolevate töölaua sessioonidega. X2Go Client jätab meelde erinevaid servereid ja võib automaatselt auteniseeruda kasutades LDAP katalooge Lisaks võib seda kasutada täisekraan loginekraanina (sel juhul asendab ta loginmanagere -nagu näiteks xdm ). Külasta veebilehte x2go.org, sealt saad täp [...]
+        <translation type="obsolete"><b>Töövahend mille abil võid ühenduda X2Go võrgus olevate arvutitega. Selle kliendiprogrammiga võid ühenduda X2GO serveritega ja alustada, lõpetada, katkestada ja jätkata olemasolevate töölaua sessioonidega. X2Go Client jätab meelde erinevaid servereid ja võib automaatselt auteniseeruda kasutades LDAP katalooge Lisaks võib seda kasutada täisekraan loginekraanina (sel juhul asendab ta loginmanagere -nagu näiteks xdm ). Külasta veebilehte x2go.org [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Go Client V. </translation>
+        <translation type="obsolete"><b>X2Go Client V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Palun kontrolli LDAP-sätteid</translation>
+        <translation type="obsolete">Palun kontrolli LDAP-sätteid</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>Ei leia toimivat kaarti</translation>
+        <translation type="obsolete">Ei leia toimivat kaarti</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Kaart on puudulikult konfigureeritud.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>X2Go ei tunne seda kaarti</translation>
+        <translation type="obsolete">X2Go ei tunne seda kaarti</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Ei suuda luua faili:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
-        <translation>Ühendus X-serveriga ei õnnestu, palun kontrolli oma seadeid</translation>
+        <translation type="obsolete">Ühendus X-serveriga ei õnnestu, palun kontrolli oma seadeid</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>Ei suuda käivitada X serverit
+        <translation type="obsolete">Ei suuda käivitada X serverit
 Palun kontrolli oma seadeid</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>Ei suuda käivitada X serverit
+        <translation type="obsolete">Ei suuda käivitada X serverit
 Palun kontrolli oma installeeringut</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Ei suuda käivitada:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Serveril puudub SSH tunneli kaudu failisüsteemi eksportimise tugi
+        <translation type="obsolete">Serveril puudub SSH tunneli kaudu failisüsteemi eksportimise tugi
 Uuenda x2goserver uuema vastu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Ei suuda lugeda :
+        <translation type="obsolete">Ei suuda lugeda :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Ei suuda kirjutada :
+        <translation type="obsolete">Ei suuda kirjutada :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Akna geomeetriliste parameetrite lugemine ei õnnestu (Kas aken on äkki suletud)?</translation>
+        <translation type="obsolete">Akna geomeetriliste parameetrite lugemine ei õnnestu (Kas aken on äkki suletud)?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go Sessioon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>argumendil "speed" on vale väärtus</translation>
+        <translation type="obsolete">argumendil "speed" on vale väärtus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Salasõna:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Klaviatuuri asetus:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation>Katkesta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Näita täpsemalt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Jätka</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Uus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Kõik õigused</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Ainult vaatlemine</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Olek</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Käsk</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Tüüp</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>Kliendi IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>Sessiooni ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Kasutaja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Ainult oma töölauad</translation>
     </message>
@@ -2204,12 +2829,12 @@ võid installeerida selle kasutades käsku
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Taasta tegumiriba</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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>
@@ -2217,141 +2842,157 @@ võid installeerida selle kasutades käsku
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Printimine - X2GoClient</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Prindi</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Sa oled keelanud x2goClient-rakenduses printimistoimingu.</translation>
+        <translation type="obsolete">Sa oled keelanud x2goClient-rakenduses printimistoimingu.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>sa võid selle dialoogi uuesti käivitada x2goClient-rakenduses (Menüü -> Valikud -> Seaded)</translation>
+        <translation type="obsolete">sa võid selle dialoogi uuesti käivitada x2goClient-rakenduses (Menüü -> Valikud -> Seaded)</translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>PDF dokument (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Toimingu käivitamine ebaõnnestus:</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Printimisel tuli viga</translation>
+        <translation type="obsolete">Printimisel tuli viga</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Vorm</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Printimine</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Vaata PDF-vormingus</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Printeri seaded</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Printer:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Prindi kasutades Windowsi vaikimisi määäratud PDF-vaatajat
 (PDF-vaataja peab olema installeeritud)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Printeri käsk:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>... - vali - ...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Vaatamisprogrammi omadused</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Ava vaatamisprogrammiga</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Käsk:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Salvesta kettale</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Näita seda dialoogi alati enne printimist</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Palun konfigureeri printeri seaded.<br><br>Kui tahad loodud faili printida siis vajad selleks eraldi programmi. Tavaliselt peaks selleks sobima  <a hrer="http:pages.cs.wisc.edtu/~ghost/doc/GPL/index.htm">ghostprint</a> või <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Lisaks võid lugeda <a href="http://www.x2go.org/index.php?id=49">siit</a>.</translation>
+        <translation type="obsolete">Palun konfigureeri printeri seaded.<br><br>Kui tahad loodud faili printida siis vajad selleks eraldi programmi. Tavaliselt peaks selleks sobima  <a hrer="http:pages.cs.wisc.edtu/~ghost/doc/GPL/index.htm">ghostprint</a> või <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Lisaks võid lugeda <a href="http://www.x2go.org/index.php?id=49">siit</a>.</translation>
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Printeri käsud</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Käsk</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2362,48 +3003,48 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Väljundformaat</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Palun vali printimisformaat (vastavalt oma printimisvõimalustele - kui kasutad CUPS'i võid kasutada PDF -vormingut)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Sisendvorming
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Vali printimisel kasutatav sisendvorming (mõned käsud lubavad printida failist, mõned aga ootavad sisendit nn. 'standard input' kaudu):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>'Standardi input'-kanal (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Anna faili asukoht programmi parameetrina</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2412,7 +3053,7 @@ Näiteks:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><Path to gsprint.exe> -query -color</translation>
     </message>
@@ -2420,135 +3061,186 @@ Näiteks:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Server ei vasta. Kas katkestame sessiooni?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Sessiooni omadused...</translation>
+        <translation type="obsolete">Sessiooni omadused...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Tee sessioonist ikoon töölauale ...</translation>
+        <translation type="obsolete">Tee sessioonist ikoon töölauale ...</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Kustuta sessioon</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Sessiooni toimingud</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Vali tüüp</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Vali resolutsioon</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Hääle edastus</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Uus sessioon</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>töötab</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>seisatud</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP -ühendus</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Ühendus lokaalsele töölauale</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Võimalikud rakendused</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>täisekraan</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Ekraan</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>aken</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Maksimaalne</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>Lubatud</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>Keelatud</translation>
     </message>
@@ -2556,41 +3248,51 @@ Näiteks:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Tagasi</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Loo sessiooni ikoon töölauale</translation>
+        <translation type="obsolete">Loo sessiooni ikoon töölauale</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Töölauaikoonid võib sättida peitma x2goclient rakendust (hidden mode). Kui sa tahad seda võimalust kasutada siis säti login kasutama gpg-võtit või gpg -kaarti.
+        <translation type="obsolete">Töölauaikoonid võib sättida peitma x2goclient rakendust (hidden mode). Kui sa tahad seda võimalust kasutada siis säti login kasutama gpg-võtit või gpg -kaarti.
 
 Kasuta x2goclient programmi peidetuna? </translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Kui programm töötab näita ikooni tegumiribal</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Uus sessioon</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation>X2Go viit sessioonile</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Kas oled kindel, et tahad kustutada selle sessiooni?</translation>
     </message>
@@ -2598,38 +3300,42 @@ Kasuta x2goclient programmi peidetuna? </translation>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>&Lõpeta</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Uus sessioon</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Sessiooni parameetrid</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>&Kustuta sessioon</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Tee sessioonist ikoon töölauale...</translation>
+        <translation type="obsolete">&Tee sessioonist ikoon töölauale...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Kustuta</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Sessioonide haldamine</translation>
     </message>
@@ -2637,237 +3343,257 @@ Kasuta x2goclient programmi peidetuna? </translation>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Sessiooni nimi:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< muuda ikooni</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Aadress:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Aadress:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Login:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH .-port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Kasuta RSA/DSA -võtit ssh -ühenduse loomiseks:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Ürita automaatset sisselogimist (ssh-agenti või vaikimisi ssh võtit kasutades)</translation>
+        <translation type="obsolete">Ürita automaatset sisselogimist (ssh-agenti või vaikimisi ssh võtit kasutades)</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI) audentimine</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Saada GSSAPI andmed serverile</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Kasuta vaheserverit (proxy) SSH -ühenduse loomiseks</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Vaheserver (Proxy)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Sama kasutanimi kui X2Go -serverilgi</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Sama salasõna kui X2Go -serverilgi</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>RSA/DSA-võti:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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>
         <source>ssh-agent or default ssh key</source>
-        <translation>ssh-agent või vaikimisi -ssh-võti</translation>
+        <translation type="obsolete">ssh-agent või vaikimisi -ssh-võti</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Tüüp:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Sessiooni tüüp</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Sessiooni tüüp:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Loo ühendus Windows terminal serveriga</translation>
+        <translation type="obsolete">Loo ühendus Windows terminal serveriga</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Ühenda lokaalsele töölauale</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Isemääratud meetod</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Üks kindel rakendus</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Lubatud rakendused</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Käsk:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Täpsemad valikud...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Programmi asukoht</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Otsene RDP ühendus</translation>
+        <translation type="obsolete">Otsene RDP ühendus</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Ava võtmefail</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Kõik failid</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RDP-port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Ava pilt</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Pildid</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP -server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop -käsurea parameetrid:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Uus sessioon</translation>
     </message>
@@ -2875,14 +3601,14 @@ Kasuta x2goclient programmi peidetuna? </translation>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Ekraan</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Klaviatuur</translation>
     </message>
@@ -2891,112 +3617,125 @@ Kasuta x2goclient programmi peidetuna? </translation>
         <translation type="obsolete">Heli</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>&Clipboard režiim</translation>
+        <translation type="obsolete">&Clipboard režiim</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Täisekraan</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Ise määratud</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Aken</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Kasuta kogu ekraani</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Maksimaalne võimalik</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Määra ekraani DPI (punkti tolli kohta)-väärtus</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama -laiendus (toetus kahele või enamale ekraanile)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Laius:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Kõrgus:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Ekraan:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Identifitseeri kõik ekraanid</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>Mõlemapidine kopeeri-aseta</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Kopeeri ja aseta kliendist serverisse</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Kopeeri ja aseta serverist.kliendile</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Keela kopeeri-aseta</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Auto detect keyboard settings</source>
-        <translation>Määra klaviatuuri parameetrid automaatselt</translation>
+        <translation type="obsolete">Määra klaviatuuri parameetrid automaatselt</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Ära määra klaviatuuri parameetreid</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Määratle klaviatuur</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Mudel:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Tähtede asetus:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Variant:</translation>
     </message>
@@ -3042,22 +3781,21 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Kliendipoolne printimine</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>RDP -klient</translation>
+        <translation type="obsolete">RDP -klient</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Lisaparameetrid:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Käsurida:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -3066,7 +3804,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>salasõna</translation>
     </message>
@@ -3074,80 +3813,88 @@ sound system connections through firewalls</source>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Ktaloogid</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Aadress</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Automaatne külgeühendamine</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Lisa</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Kustuta</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Aadress:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Faili nime kodeering</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>kohalik - lokaalne:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>server:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Kasuta ssh-ühendust tulemüüride läbimiseks</translation>
+        <translation type="obsolete">Kasuta ssh-ühendust tulemüüride läbimiseks</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Vali kataloog</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Viga</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3155,126 +3902,198 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
         <source>SSH proxy connection error</source>
-        <translation>SSH vaheserveriga ühendumise viga</translation>
+        <translation type="obsolete">SSH vaheserveriga ühendumise viga</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>SSH vaheserveriga ühendumise viga:</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>Viga SSH vaheserveri ühenduse loomisel</translation>
+        <translation type="obsolete">Viga SSH vaheserveri ühenduse loomisel</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>Libssh-teegi initsialiseerimise viga</translation>
+        <translation type="obsolete">Libssh-teegi initsialiseerimise viga</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>Ssh-sessiooni loomine ei õnnestu</translation>
+        <translation type="obsolete">Ssh-sessiooni loomine ei õnnestu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>Vaheserveriga ühendumise viga</translation>
+        <translation type="obsolete">Vaheserveriga ühendumise viga</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>Ei suuda luua ühendust </translation>
+        <translation type="obsolete">Ei suuda luua ühendust </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Autentimine ebaõnnestus</translation>
+        <translation type="obsolete">Autentimine ebaõnnestus</translation>
     </message>
     <message>
         <source>channel_forward_listen failed</source>
         <translation type="obsolete">channel_forward_listen ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation>Ei õnnestu SSH kliendiprogrammi käivitamine. Palun kontrolli oma installeerimist ja GSSA konfiguratsiooni</translation>
+        <translation type="obsolete">Ei õnnestu SSH kliendiprogrammi käivitamine. Palun kontrolli oma installeerimist ja GSSA konfiguratsiooni</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>Kontrolli oma GSSA konfiguratsiooni või vali mõni muu atentimismeetod</translation>
+        <translation type="obsolete">Kontrolli oma GSSA konfiguratsiooni või vali mõni muu atentimismeetod</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>Ei saa avada faili </translation>
+        <translation type="obsolete">Ei saa avada faili </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>Ei saa luua serverile faili </translation>
+        <translation type="obsolete">Ei saa luua serverile faili </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>Ei suuda kirjutada serveri faili </translation>
+        <translation type="obsolete">Ei suuda kirjutada serveri faili </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>ei suuda ühenduda </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward ebaõnnestus</translation>
+        <translation type="obsolete">channel_open_forward ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session ebaõnnestus</translation>
+        <translation type="obsolete">channel_open_session ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>socket'isse kirjutamisel tekkis viga</translation>
+        <translation type="obsolete">socket'isse kirjutamisel tekkis viga</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>kanali lugemisviga</translation>
+        <translation type="obsolete">kanali lugemisviga</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
-        <translation>channel_write ebaõnnestus</translation>
+        <translation type="obsolete">channel_write ebaõnnestus</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>viga tcp socket'ist lugemisel</translation>
+        <translation type="obsolete">viga tcp socket'ist lugemisel</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Viga socket'i loomisel</translation>
+        <translation type="obsolete">Viga socket'i loomisel</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Sidumisviga pordiga </translation>
     </message>
@@ -3282,12 +4101,12 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Ava fail</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Rakendus (.exe)</translation>
     </message>
@@ -3295,69 +4114,74 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Vorm</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Selleks, et siin tehtud muudatused jõustuksid pead Sa X2GoClient'i uuesti käivitama</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>kasuta integreeritud X-serverit</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation>ära kasuta primaarset 'clipboard'-i</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>kasuta mõnd muud X-serverit</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>X-server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>käivitatav programm:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>käivita X-server X2GOclient'i käivitumisel</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>käsurea parameetrid:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>X-serveri käsurea valikud</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>Akna olek:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>Koguekraan:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>Üks programm:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_fi.ts b/res/i18n/x2goclient_fi.ts
index 2eff5da..4d88ea4 100644
--- a/res/i18n/x2goclient_fi.ts
+++ b/res/i18n/x2goclient_fi.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Julkaistut sovellukset</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Etsi:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Käynnistä</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Sulje</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Ääni ja video</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Ohjelmointi</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Ohjeet</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Peli</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Grafiikka</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Toimisto</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Varusohjelma</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Muu</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Dialogi</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Vanha salasana:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Uusi salasana:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Vahvista salasana:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>Tekstiselitys</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Salasanat eivät täsmää</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Ruutu</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Nimi:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Ominaisuudet</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Tila:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Vastaanottaa tehtäviä:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Tyyppi:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Sijainti:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Kommentti:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Odottaa</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Tulostus</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Pysäytetty</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
@@ -186,68 +186,80 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Valinta puuttuu</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Valinta on ristiriidassa toisen kanssa</translation>
+        <translation type="obsolete">Valinta on ristiriidassa toisen kanssa</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Ristiriitainen valinta</translation>
+        <translation type="obsolete">Ristiriitainen valinta</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Yhteyskoe</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS -yhteys:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH-yhteys:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Yhteyden nopeus:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Epäonnistui</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kt/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
-        <translation>Socketyhteys vanheni</translation>
+        <translation type="obsolete">Socketyhteys vanheni</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Epäonnistui:</translation>
     </message>
@@ -255,162 +267,219 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Yleinen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Näytä ikoni järjestelmäpalkissa</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>Piilota järjestelmäpalkkiin kun minimoidaan</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Piilota järjestelmäpalkkiin kun suljettu</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Piilota järjestelmäpalkkiin kun yhteys on avattu</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Hae esille järjestelmäpalkista kun yhteys katkeaa</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>Käytä LDAP-ta</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>Palvelimen URL-osoite:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Varapalvelimen 1 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Varapalvelimen 2 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>X-palvelimen asetukset</translation>
+        <translation type="obsolete">X-palvelimen asetukset</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11-sovellus:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11-versio:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>Etsi X11-sovellus</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Etätyöaseman käyttämä levyjaon SSH-portti:</translation>
+        <translation type="obsolete">Etätyöaseman käyttämä levyjaon SSH-portti:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Käynnistä istunto web-palvelimessa</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Edistyneet toiminnot</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Oletusarvot</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>&Keskeytä</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Tulostaa</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Varoitus</translation>
+        <translation type="obsolete">Varoitus</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2go-asiakasohjelma ei löytänyt toimivaa X11-sovellusta. Asenna Apple X11 tai määritä sovelluksen sijainti</translation>
+        <translation type="obsolete">x2go-asiakasohjelma ei löytänyt toimivaa X11-sovellusta. Asenna Apple X11 tai määritä sovelluksen sijainti</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Käytät X11 (Apple X-Window Server) versiota</translation>
+        <translation type="obsolete">Käytät X11 (Apple X-Window Server) versiota</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Tämä versio ei toimi 24 bitin tarkkuudella X-palvelimssa. Päivitä X11-palvelimesi (http://trac.macosforge.org/projects/xquarts).</translation>
+        <translation type="obsolete">. Tämä versio ei toimi 24 bitin tarkkuudella X-palvelimssa. Päivitä X11-palvelimesi (http://trac.macosforge.org/projects/xquarts).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Toimivaa X11-sovellusta ei löydy annetusta hakupolusta</translation>
+        <translation type="obsolete">Toimivaa X11-sovellusta ei löydy annetusta hakupolusta</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Yhteys</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation>&Media</translation>
     </message>
@@ -422,32 +491,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Yhteyden nopeus</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Yhteyden nopeus:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>&Pakkaus</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Menetelmä:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Pakkausmenetelmä:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Kuvan tarkkuus:</translation>
     </message>
@@ -455,72 +524,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Valinnat</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Yleistä</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Sivun koko:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Sivun asettelu:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Lomakkeen syöttö:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Duplex-tulostus</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Ohita</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Pitkä sivu</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Lyhyt sivu</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Ajurin asetukset</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Valinta</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Arvo</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Valinta puuttuu</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>teksti</translation>
     </message>
@@ -528,47 +597,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Istunto</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Yhteys</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation>&Media</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&Jaetut kansiot</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>&Peruuta</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Oletukset</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Istunnon asetukset -</translation>
     </message>
@@ -576,38 +645,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>&Peruuta</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&jaa</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Oletukset ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Varattu hakemisto ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>jaa kansiot</translation>
+        <translation type="obsolete">jaa kansiot</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Valitse kansio</translation>
     </message>
@@ -615,7 +688,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation>Istuntojen kansio</translation>
     </message>
@@ -623,72 +696,88 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Kansiot</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation>Tee uusi kansio</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
-        <translation>Kansiolle uusi nimi...</translation>
+        <translation type="obsolete">Kansiolle uusi nimi...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
-        <translation>Vaihda kuvake...</translation>
+        <translation type="obsolete">Vaihda kuvake...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
-        <translation>Poista kansio...</translation>
+        <translation type="obsolete">Poista kansio...</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation>Avaa kuva</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Kuvat</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>X2Go asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation>Kansion nimi:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation>Poisto ei onnisu "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>". Kansio ei ole tyhjä. Tyhjennä kansio ja yritä uudelleen.</translation>
+        <translation type="obsolete">". Kansio ei ole tyhjä. Tyhjennä kansio ja yritä uudelleen.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation>Poista kansio "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Uusi kansio</translation>
     </message>
@@ -696,7 +785,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Vaihtoehdot</translation>
     </message>
@@ -704,7 +793,7 @@
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translatorcomment>tarkista</translatorcomment>
@@ -712,163 +801,191 @@ It is now: </source>
 Se on nyt:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Turvallisuussyistä, yhteys katkaistaan</translation>
+        <translation type="obsolete">Turvallisuussyistä, yhteys katkaistaan</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Palvelimen avainta ei löytynyt mutta vaihtoehtoinen avain löytyi. Tunkeutuja on ehkä vaihtanut oletusavaimen harhauttaakseen etäkäyttäjää luulemaan että avainta ei ole</translation>
+        <translation type="obsolete">Palvelimen avainta ei löytynyt mutta vaihtoehtoinen avain löytyi. Tunkeutuja on ehkä vaihtanut oletusavaimen harhauttaakseen etäkäyttäjää luulemaan että avainta ei ole</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Tunnetut työasemat sisältävää tiedostoa ei löytynyt. Jos hyväksyt palvelimen avaimen, tiedosto tehdäään automaattisesti</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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Palvelin on tuntematon. Luotatko sen avaimeen?
 Julkinen avain:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Palvelimen avaimen todennus epäonnistui</translation>
+        <translation type="obsolete">Palvelimen avaimen todennus epäonnistui</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Tarkistuskoodi:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anna avaimen salasana</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Autentikointi epäonnistui</translation>
+        <translation type="obsolete">Autentikointi epäonnistui</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Kirjautuminen epäonnistui!<br>Yritä uudelleen</translation>
+        <translation type="obsolete">Kirjautuminen epäonnistui!<br>Yritä uudelleen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Turvallisen yhteyden avaus epäonnistui</translation>
+        <translation type="obsolete">Turvallisen yhteyden avaus epäonnistui</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Annettu:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organisaatio(O)</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisaatioyksikkö(OU))	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Sarjanumero 	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Myöntäjä:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Voimassaolo:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Myöntöpäivä</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>vanhenee</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Tiivisteet:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>Sulje X2Go -ohjelma</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Lisää poikkeus</translation>
     </message>
@@ -876,44 +993,44 @@ Julkinen avain:</translation>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Ääni</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Aseta ääni pälle</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Käynnistä ääniajuri</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>Käytä nykyistä ääniajuria</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Käytä SSH -portin tunnelointia äänen saamiseksi palomuurin läpi</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Käytä oletus-aääniporttia</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Ääniportti:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Asiakasohjelman tulostintuki</translation>
     </message>
@@ -921,13 +1038,12 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>Käynnistää x2go-asiakasohjelman...</translation>
+        <translation type="obsolete">Käynnistää x2go-asiakasohjelman...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>fi</translation>
     </message>
@@ -936,392 +1052,736 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>X2Go asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>yhdistää</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Web -selain</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>Sähköpostiohjelma</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Pääte</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>Käynnistää x2go-asiakasohjelman mobiiliversion...datakansio on:</translation>
+        <translation type="obsolete">Käynnistää x2go-asiakasohjelman mobiiliversion...datakansio on:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Asetukset...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Neuvonta...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>Tietoja X2Go-asiakasohjelmasta</translation>
+        <translation type="obsolete">Tietoja X2Go-asiakasohjelmasta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>Käynnistetty   x2go-asiakasohjelma</translation>
+        <translation type="obsolete">Käynnistetty   x2go-asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation>Kääntäjän käynnistys ei onnistu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Kääntäjä:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation> asennettu.</translation>
+        <translation type="obsolete"> asennettu.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Jaa kansio...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Sovellukset...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Pysäytä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Uusi yhteys</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>Siirrä X2Go -ikkunaa</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Minimoi toimintopalkki</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Istunto:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Lopeta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Uusi istunto...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Istunnon hallinta...</translation>
+        <translation type="obsolete">Istunnon hallinta...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Tee istuntokuvake työpöydälle</translation>
+        <translation type="obsolete">&Tee istuntokuvake työpöydälle</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Aseta brokerin salasana...</translation>
+        <translation type="obsolete">&Aseta brokerin salasana...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&Yhteystesti...</translation>
+        <translation type="obsolete">&Yhteystesti...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Näytä toimintopalkki</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Tietoja Qt:stä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Istunto</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Valinnat</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Apua</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Kirjaudu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Toiminto epäonnistui</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Salasana vaihdettu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Väärä salasana!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Yhdistää brokeriin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentikointi</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Palauta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>Ei yhteyttä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Ääni ja video</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Ohjelmakehitys</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Ohjeet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Peli</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Grafiikka</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Verkko</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Toimisto</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Työkalu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Muuta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Vasen hiiren näppäin piilottaa/palauttaa - Oikea näppäin näyttää toiminnon valinnat</translation>
+        <translation type="obsolete">Vasen hiiren näppäin piilottaa/palauttaa - Oikea näppäin näyttää toiminnon valinnat</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
         <source>Closing x2goclient...</source>
-        <translation>Sulkee x2go -asiakasohjelman...</translation>
+        <translation type="obsolete">Sulkee x2go -asiakasohjelman...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
         <source>Closed  x2goclient.</source>
-        <translation>X2go-asiakasohjelman sulkeutui.</translation>
+        <translation type="obsolete">X2go-asiakasohjelman sulkeutui.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Tarkista LDAP-asetukset</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>X2Go -palvelinta ei löydy LDAP-sta </translation>
+        <translation type="obsolete">X2Go -palvelinta ei löydy LDAP-sta </translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1344,7 +1804,7 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
         <translation type="obsolete">Linkki X2Go -istuntoon </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>X2Go -istuntoa ei löytynyt, sulkeutuu.</translation>
     </message>
@@ -1353,58 +1813,56 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
         <translation type="obsolete">Haluatko varmasti poistaa tämän istunnon?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP -yhteys</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Yhteys paikalliselle näytölle</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> käyttäen </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation>Käynnistää yhteyden palvelimeen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation> kohteeseen </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Yhteysvirhe(</translation>
+        <translation type="obsolete">Yhteysvirhe(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
         <source>Couldn't find a SSH connection.</source>
-        <translation>Ei löydä SSH-yhteyttä.</translation>
+        <translation type="obsolete">Ei löydä SSH-yhteyttä.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anna avaimen salasana</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Palvelimen avain vaihtui.
@@ -1419,463 +1877,656 @@ Se on nyt: </translation>
         <translation type="obsolete">Tämän palvelimen julkinen avain puuttuu mutta toinen löytyi.Tunketuja on ehkä vaihtanut aiemman avaimen harhauttaakseen sinut luulemaan että avainta ei ole</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Tunnettut työasemat sisältävää tiedostoa ei ole. Jos hyväksyt yhteyden, kyseinen tiedosto luodaan</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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Palvelin on tuntematon. Luotatko sen avaimeen?
 Avaimen tiiviste: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Palvelimen avaimen todennus epäonnistui</translation>
+        <translation type="obsolete">Palvelimen avaimen todennus epäonnistui</translation>
     </message>
     <message>
         <source>Show session tray icon when running</source>
         <translation type="obsolete">Näytä istunon ikoni kun se on aktiivinen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Tarkistenumero:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Joku saattaa kuunnella verkkoa.
+        <translation type="obsolete">Joku saattaa kuunnella verkkoa.
 Turvallisuuden takia on syytä katkaista yhteys.
 Halutko katkaista?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Kyllä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Ei</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 Halutko hyväksyä uuden palvelinavaimen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Tämän palvelimen avainta ei löydy mutta toinen avain löytyi. Tunkeutuja saattaa vaihtaa palvelimen oletusavaimen uskotellakseen että palvelinavainta ei ole. 
+        <translation type="obsolete">Tämän palvelimen avainta ei löydy mutta toinen avain löytyi. Tunkeutuja saattaa vaihtaa palvelimen oletusavaimen uskotellakseen että palvelinavainta ei ole. 
 Turvallisuuden takia on syytä katkaista yhteys.
 Haluatko katkaista?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Autentikointi epäonnistui: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Autentikointi epäonnistui</translation>
+        <translation type="obsolete">Autentikointi epäonnistui</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Anna salasana SSH-proxya varten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Yhteydenotto epäonnistui</b></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <translation type="obsolete"><b>Yhteydenotto epäonnistui</b></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Väärä salasana!<b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Yhteys epäonnistui</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation> - Väärä salasana</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
         <translatorcomment>Typo in original</translatorcomment>
-        <translation>Palvelinta ei saatavilla</translation>
+        <translation type="obsolete">Palvelinta ei saatavilla</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
         <translatorcomment>Typo</translatorcomment>
-        <translation>Palvelinta ei saatavilla</translation>
+        <translation type="obsolete">Palvelinta ei saatavilla</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Valitse istunto:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>käynnissä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>pysäytetty</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Työpöytä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>erillinen sovellus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>varjoistunto</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Tietoja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Työpöytää ei ole käytettävissä</translation>
+        <translation type="obsolete">Työpöytää ei ole käytettävissä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Valinta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Valitse työpöytä:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Käyttämäsi värierottelu on erilainen kuin x2go-istunnon vastaava. Se saattaa aiheuttaa ongelmia kun kun yhdistät uudelleen tähän istuntoon ja useimmiten <b>istunto katoaa</b> ja joudut avaamaan uuden! On erittäin suositeltavaa että muutat värierottelun omalla näytölläsi arvoon </translation>
+        <translation type="obsolete">Käyttämäsi värierottelu on erilainen kuin x2go-istunnon vastaava. Se saattaa aiheuttaa ongelmia kun kun yhdistät uudelleen tähän istuntoon ja useimmiten <b>istunto katoaa</b> ja joudut avaamaan uuden! On erittäin suositeltavaa että muutat värierottelun omalla näytölläsi arvoon </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>25 tai 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> bittiä ja käynnistä X-palvelin uudelleen ennenkuin avaat tämän x2go-istunnon.<br>Jatka istuntoa joka tapauksessa?
+        <translation type="obsolete"> bittiä ja käynnistä X-palvelin uudelleen ennenkuin avaat tämän x2go-istunnon.<br>Jatka istuntoa joka tapauksessa?
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>pysäyttää</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>lopettaa</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Väärä salasana!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Uusi istunto käynnistyi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Istuntoa jatkettu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Kansion luonti ei onnistu: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Tiedostoon kirjoitus ei onnistu: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>Kytkeydy X2Go -ikkunaan</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>SSL -tunnelointi ei onnistu</translation>
+        <translation type="obsolete">SSL -tunnelointi ei onnistu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>SSL-tunnelin avaus ei onnistu:</translation>
+        <translation type="obsolete">SSL-tunnelin avaus ei onnistu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation>Hätäkeskeytus </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Odottaa proxyn sulkeutumista</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Epäonnistui, sulkee proxyn</translation>
+        <translation type="obsolete">Epäonnistui, sulkee proxyn</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>Lopetettu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>käynnistyy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>jatkaa</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Yhteys aikakatkaistu, keskeytyy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>keskeytyy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>Haluatko varmasti sulkea istunnon?
+        <translation type="obsolete">Haluatko varmasti sulkea istunnon?
 Avoimet tiedostot eivät talletu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Istunto</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Näyttö</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Luontiaika</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Yhteys epäonnistui<b>
+        <translation type="obsolete"><b>Yhteys epäonnistui<b>
 :</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (tiedosto ei aukea)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (tiedosto puuttuu)</translation>
+        <translation type="obsolete"> (tiedosto puuttuu)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (kansio puuttuu)</translation>
+        <translation type="obsolete"> (kansio puuttuu)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>Ohjaimella"--link" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella"--link" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>väärä arvo ohjaimessa"--clipboard"</translation>
+        <translation type="obsolete">väärä arvo ohjaimessa"--clipboard"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>Ohjaimella "--sound" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella "--sound" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>Ohjaimella "--geometry" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella "--geometry" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>Ohjaimella "--set-kbd" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella "--set-kbd" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>Ohjaimella "--ldap" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella "--ldap" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>Ohjaimella "--ldap1" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella "--ldap1" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>Ohjaimella "--ldap2" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella "--ldap2" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>Ohjaimella "--pack" on väärä arvo</translation>
+        <translation type="obsolete">Ohjaimella "--pack" on väärä arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Väärä parametri: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Ohjeet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>SSH -virhe</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -1885,7 +2536,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH -palvelu ei käynnistynyt.
+        <translation type="obsolete">SSH -palvelu ei käynnistynyt.
 
 Tarvitse SSH -palvelua tulostamiseen ja tiedostojen yhteiskäyttöön.
 
@@ -1896,14 +2547,13 @@ Jos näet tämä viestin, ilmoita virheestä
 X2Go -ohjelman virheseurantaan.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>SSH -palvleu ei ole käynnissä.
+        <translation type="obsolete">SSH -palvleu ei ole käynnissä.
 
 Tarvitsen SSH -palvelua tulostamiseen ja tiedostojen yhteiskäyttöön
 
@@ -1911,22 +2561,20 @@ Pyydä IT -tukihenkilöä asentamaan SSH
 -palvelu työasemaasi.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>SSH -palvelu ei pystynyt selvittämään sovelluspalvelimen julkista avainta.</translation>
+        <translation type="obsolete">SSH -palvelu ei pystynyt selvittämään sovelluspalvelimen julkista avainta.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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
 jota käytetään kansioiden ja tulostinten jakamiseen.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>SSH -palvelu ei saanut luettua sovelluksen
+        <translation type="obsolete">SSH -palvelu ei saanut luettua sovelluksen
 authoized_keys -tiedostoa.</translation>
     </message>
     <message>
@@ -1934,263 +2582,240 @@ authoized_keys -tiedostoa.</translation>
         <translation type="obsolete">Vaihtoehdot</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Mahdolliset pakkaustavat:</translation>
+        <translation type="obsolete">Mahdolliset pakkaustavat:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Pakkausmenetelmät</translation>
+        <translation type="obsolete">Pakkausmenetelmät</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>Vaihtoehtoa ei tässä versiossa</translation>
+        <translation type="obsolete">Vaihtoehtoa ei tässä versiossa</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Muutosluettelo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Git -tietoja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Kansion luonti ei onnistu:</translation>
+        <translation type="obsolete">Kansion luonti ei onnistu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA-tiedosto on tyhjä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Avaimen käyttöönotto ei onnistu:</translation>
+        <translation type="obsolete">Avaimen käyttöönotto ei onnistu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Neuvonta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation><b><br> (C. 2005-2016 <b>varmaan hyvä</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"><b><br> (C. 2005-2016 <b>varmaan hyvä</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2plugin tilan sponsori <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="obsolete"><br>x2plugin tilan sponsori <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation><b>Asiakasohjelma jolla voit käyttää X2Go palvelinohjelmaa. Tällä ohjelmalla voit kytkeytyä X2Go -palvelimeen ja käynnistää, pysäyttää, jatkaa ja lopettaa työpöytäistuntoja. X2Go -asiakasohjelma tallettaa erilaisten istuntojen parametrit ja se voi hakea autentitontitiedot automaattisesti LDAP-hakemistoista. Lisäksi sitä voidaan käyttää koko näyttö -tilassa kirjaustumisnäyttönä (jolloin se korvaa esim. xdm -kirjautumisnäytön). Tarkempia tietoja löytyy osoitteest [...]
+        <translation type="obsolete"><b>Asiakasohjelma jolla voit käyttää X2Go palvelinohjelmaa. Tällä ohjelmalla voit kytkeytyä X2Go -palvelimeen ja käynnistää, pysäyttää, jatkaa ja lopettaa työpöytäistuntoja. X2Go -asiakasohjelma tallettaa erilaisten istuntojen parametrit ja se voi hakea autentitontitiedot automaattisesti LDAP-hakemistoista. Lisäksi sitä voidaan käyttää koko näyttö -tilassa kirjaustumisnäyttönä (jolloin se korvaa esim. xdm -kirjautumisnäytön). Tarkempia tietoja l [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Gi Asiakasohjelma V. </translation>
+        <translation type="obsolete"><b>X2Gi Asiakasohjelma V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Tarkista LDAP-asetukset</translation>
+        <translation type="obsolete">Tarkista LDAP-asetukset</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>Toimikortti puuttuu</translation>
+        <translation type="obsolete">Toimikortti puuttuu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Toimikortin asetukset puuttuvat</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>X2Go ei tunnista korttia</translation>
+        <translation type="obsolete">X2Go ei tunnista korttia</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Tiedoston luonti epäonnistui:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
-        <translation>Yhteys X-palvelimeen ei aukea
+        <translation type="obsolete">Yhteys X-palvelimeen ei aukea
 Tarkista asetukset</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>Yhteys X-palvelimeen ei aukea
+        <translation type="obsolete">Yhteys X-palvelimeen ei aukea
 Tarkista asetukset</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>Yhteys X-palvelimeen ei aukea
+        <translation type="obsolete">Yhteys X-palvelimeen ei aukea
 Tarkista asennuksen oikeellisuus</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Kännistys ei onnistu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Etäpalvelin ei tue SSH-ehteyden avulla toimivaa levyjakoa
+        <translation type="obsolete">Etäpalvelin ei tue SSH-ehteyden avulla toimivaa levyjakoa
 Päivitä x2goserver palvelinohjelma</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Lukeminnen ei onnistu :</translation>
+        <translation type="obsolete">Lukeminnen ei onnistu :</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Kirjoittaminen ei onnistu :</translation>
+        <translation type="obsolete">Kirjoittaminen ei onnistu :</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Ikkunoinnin asetusten luku ei onnistu (ikkuna suljettu)?</translation>
+        <translation type="obsolete">Ikkunoinnin asetusten luku ei onnistu (ikkuna suljettu)?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go Istunto</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>"speed" -astuksella on virheellinen arvo</translation>
+        <translation type="obsolete">"speed" -astuksella on virheellinen arvo</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Salasana:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Näppäimistön tyyppi:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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ätunnus:<br>Näyttö:<br>Luontiaika:<br>Tila:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation>Keskeytä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Näytä yksityiskohdat</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Jatka</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Uusi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Kaikki oikeudet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Vain katselu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Tila</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Komento</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Palvelin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>Asiakasohjelman IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>Isunnon ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Käyttäjä</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Vain omat työpöydät</translation>
     </message>
@@ -2203,12 +2828,12 @@ voit asentaa sshd komennolla
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Palauta toimintopalkki</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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;Klikkaa tätä nappulaa&nbsp;&nbsp;&nbsp;<b>&nbsp;&nbsp;&nbsp;jotta palkki näkyisi jälleen&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -2216,141 +2841,157 @@ voit asentaa sshd komennolla
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Tulosta - X2Go -asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Olet ottanut pois päältä x2go-asiakasohjelman tulostustoiminnon.</translation>
+        <translation type="obsolete">Olet ottanut pois päältä x2go-asiakasohjelman tulostustoiminnon.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Voit palauttaa toiminnon x2go-asiakasohjelmassa (Valikko -> Valinnat -> Asetukset)</translation>
+        <translation type="obsolete">Voit palauttaa toiminnon x2go-asiakasohjelmassa (Valikko -> Valinnat -> Asetukset)</translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Talleta Tiedosto</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>Tulosta tiedosto (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Komento ei käynnisty:</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Tulostusvirhe</translation>
+        <translation type="obsolete">Tulostusvirhe</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Ruutu</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Esitä PDF-muodossa</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Tulostinasetukset</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Tulostin:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Tulosta käyttäen oletus -PDF-katselulohjelmaa
 (Esitysohjelma pitää olla asennettuna)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Tulostinkomento:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Esitysohjelman asetukset</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Avaa esitysohelmassa</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Komento:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Tallenna levylle</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Näytä tämä dialogi ennen tulostusta</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Aseta tulostimen ohjaustiedot.<br><br>Jos haluat tulostaa muodostamasi tiedoston, tarvitset siihen erillisen sovelluksen. Esimerkiksi voit käyttää <a hrer="http:pages.cs.wisc.edtu/~ghost/doc/GPL/index.htm">ghostprint</a> and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Lisätietoja löydät <a href="http://www.x2go.org/index.php?id=49">täältä</a>.</translation>
+        <translation type="obsolete">Aseta tulostimen ohjaustiedot.<br><br>Jos haluat tulostaa muodostamasi tiedoston, tarvitset siihen erillisen sovelluksen. Esimerkiksi voit käyttää <a hrer="http:pages.cs.wisc.edtu/~ghost/doc/GPL/index.htm">ghostprint</a> and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Lisätietoja löydät <a href="http://www.x2go.org/index.php?id=49">täältä</a>.</t [...]
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Tulostinkomento</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Komento</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2361,47 +3002,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Tulostusmuoto</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Valitse tulostusmuoto (riippuen tulostimestasi - jos käytätä CUPS -voit käyttää PDF -muotoa)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Tietorakenne</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Valitset tulostettavan aineiston muoto (muutamia komentoja tulostettava tiedosto tulostimen parametrinsa, jotkut vaativat datan oletuskanavasta):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>Oletus input-kanava (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Anna tiedostopolku ohjelmaparametrina</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2410,7 +3051,7 @@ Esimerkki:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><Path to gsprint.exe> -query -color</translation>
     </message>
@@ -2418,135 +3059,186 @@ Esimerkki:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Etäpalvelin ei vastaa. Haluatko keskeyttää istunnon?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Istunnon oleutusarvot...</translation>
+        <translation type="obsolete">Istunnon oleutusarvot...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Tee istunnosta ikoni työpöydällesi...</translation>
+        <translation type="obsolete">Tee istunnosta ikoni työpöydällesi...</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Poista istunto</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Istunnon toiminnot</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Valitse tyyppi</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Valitse tarkkuus</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Äänen päälleasetus</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Uusi istunto</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>suorittaa</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>pysäytetty</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP -yhteys</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Yhteys palvelimen omaan näyttöön</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Julkaistut sovellukset</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>koko näyttö</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Näyttö</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>ikkuna</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Maksimi</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>Päällä</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>Päältä</translation>
     </message>
@@ -2554,41 +3246,51 @@ Esimerkki:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Takaisin</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Tee instuntokuvake työpöydälle</translation>
+        <translation type="obsolete">Tee instuntokuvake työpöydälle</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Työpöytäkuvakkeet voidaan asettaa piilottamaan x2go -asiakasohjelma (hidden mode). Jos haluat käyttää ominaisuutta määritä kirjautuminen käyttämään gpg-avainta tai gpg -toimikorttia.
+        <translation type="obsolete">Työpöytäkuvakkeet voidaan asettaa piilottamaan x2go -asiakasohjelma (hidden mode). Jos haluat käyttää ominaisuutta määritä kirjautuminen käyttämään gpg-avainta tai gpg -toimikorttia.
 
 Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Näytä istunon kuvake kun se on aktiivinen</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Uusi istunto</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation>Linkki X2Go -istuntoon </translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Haluatko varmasti poistaa tämän istunnon?</translation>
     </message>
@@ -2596,38 +3298,42 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>&Lopeta</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Uusin istunto</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Istunnon oletusarvot</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>&Poista instunto</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Tee istunnosta ikoni työpöydälle...</translation>
+        <translation type="obsolete">&Tee istunnosta ikoni työpöydälle...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Istunnon hallinnointi</translation>
     </message>
@@ -2635,237 +3341,257 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Istunnon nimi:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< vaihda ikoni</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Polku:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Palvelin</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Palvelin:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Käyttäjä:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH .-portti:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Käytä RSA/DSA -avainta ssh -yhteyden luomiseen:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Yritä automaattista kirjautumista (ssh-välittäjää tai oletus-ssh-avainta käyttäen)</translation>
+        <translation type="obsolete">Yritä automaattista kirjautumista (ssh-välittäjää tai oletus-ssh-avainta käyttäen)</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI) autentikointi</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Anna GSSAPI -tunnistustiedot palvelimelle</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Käytä proxy-palvelinta SSH -yhteyden luomiseen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Proxy-palvelin</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Sama käyttäjätunnus kuin X2Go -palvelimeen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Sama salasana kuin X2Go -palvelimeen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>RSA/DSA-avain:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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>
         <source>ssh-agent or default ssh key</source>
-        <translation>ssh-agentti tai oletus -ssh-avain</translation>
+        <translation type="obsolete">ssh-agentti tai oletus -ssh-avain</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Tyyppi:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Portti:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Istuntotyyppi</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Istuntotyyppi:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Yhdista Windows terminal serveriin</translation>
+        <translation type="obsolete">Yhdista Windows terminal serveriin</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Yhdistä palvelimen omaan näyttöön</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Muokattu työpöytä</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Erillinen sovellus</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Julkaistut sovellukset</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Komento:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Edistyneet toiminnot...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Ohjelman hakupolku</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Suora RPP-yhteys</translation>
+        <translation type="obsolete">Suora RPP-yhteys</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Lue avain-tiedosto</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>VIrhe</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2go-asiakasohjelma on siirrettävässä moodissa. Käytä usb-laiteen hakupolkua jotta pääset joka paikasta käsiksi omiin tietoihisi</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="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RPP-portti:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Avaa kuva</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Kivat</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Palvelin:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP -palvelin:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop -komentorivin optiot:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Uusi istunto</translation>
     </message>
@@ -2873,14 +3599,14 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Näyttö</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>N&äppäimistö</translation>
     </message>
@@ -2889,112 +3615,125 @@ Käytätkö x2go-asiakasohjelmaa piilotettuna?</translation>
         <translation type="obsolete">Ääni</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>&Leikepöytä -tila</translation>
+        <translation type="obsolete">&Leikepöytä -tila</translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Koko näyttö</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Muokattu</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Ikkuna</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Käytä koko näyttöä</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Maksimikoko</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Aseta näytön arvot (DPI)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama -laajennus (tuki kahdelle tai useammalle näytölle)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Leveys:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Korkeus:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Näyttö:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Tunnista kaikki näytöt</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>Kaksisuuntainen leikkaus - liimaus</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Leikka ja liimaa päätelaitteesta palvelimeen</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Leikkaa ja liimaa palvelimesta päätelaitteeseen</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Poista leikepöytä käytöstä kokonaan</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Auto detect keyboard settings</source>
-        <translation>Tunnista näppäimistötyyppi automaattisesti</translation>
+        <translation type="obsolete">Tunnista näppäimistötyyppi automaattisesti</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Älä muuta näppäimistöasetuksia</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Muuta näppäimistön asetukset</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Malli:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Asettelu:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Alalaji:</translation>
     </message>
@@ -3040,22 +3779,21 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Asiakasohjelman tulostintuki</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>RDP -asiakasohjelma</translation>
+        <translation type="obsolete">RDP -asiakasohjelma</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Lisäohjaimet:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Komentorivi:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>fi</translation>
     </message>
@@ -3064,7 +3802,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>salasana</translation>
     </message>
@@ -3072,80 +3811,88 @@ sound system connections through firewalls</source>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Kansiot</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Polku</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Automaattinen avaus</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Lisää</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Poista</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Polku:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Tiedostonimen koodaus</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>paikallinen:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>palvelin:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Käytä ssh-yhteyden edelleenlähetystä palomuurien ohittamiseen</translation>
+        <translation type="obsolete">Käytä ssh-yhteyden edelleenlähetystä palomuurien ohittamiseen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Valitse kansio</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2go-yhteysohjelma toimiii mobiilitilassa. Käytä usb-laitteen hakemistoja tietojen hakemiseen</translation>
+        <translation type="obsolete">x2go-yhteysohjelma toimiii mobiilitilassa. Käytä usb-laitteen hakemistoja tietojen hakemiseen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1262</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3153,126 +3900,198 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
         <source>SSH proxy connection error</source>
-        <translation>SSH -proxyssa on yhteysvirhe</translation>
+        <translation type="obsolete">SSH -proxyssa on yhteysvirhe</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>SSH proxyssa on yhteysvirhe:</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>Virhe SSH-proxyn tunneloinnissa</translation>
+        <translation type="obsolete">Virhe SSH-proxyn tunneloinnissa</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>Libssh-kirjaston avausvirhe</translation>
+        <translation type="obsolete">Libssh-kirjaston avausvirhe</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>Ssh-istunnon luonti ei onnistu</translation>
+        <translation type="obsolete">Ssh-istunnon luonti ei onnistu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>Proxy -palvelimeen ei saatu yhteyttä</translation>
+        <translation type="obsolete">Proxy -palvelimeen ei saatu yhteyttä</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>Tänne ei saatu yhteyttä</translation>
+        <translation type="obsolete">Tänne ei saatu yhteyttä</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Autentikointi epäonnistui</translation>
+        <translation type="obsolete">Autentikointi epäonnistui</translation>
     </message>
     <message>
         <source>channel_forward_listen failed</source>
         <translation type="obsolete">channel_forward_listen epäonnistui</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation>SSH-asiakasohjellman käynnistys epäonnistui. Tarkista sen asennus ja GSSAPI -asetukset</translation>
+        <translation type="obsolete">SSH-asiakasohjellman käynnistys epäonnistui. Tarkista sen asennus ja GSSAPI -asetukset</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>Tarkista GSSAPI -asetukset tai käytä jotain muuta autentikointimenetelmää</translation>
+        <translation type="obsolete">Tarkista GSSAPI -asetukset tai käytä jotain muuta autentikointimenetelmää</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>Tiedoston avaus ei onnistu</translation>
+        <translation type="obsolete">Tiedoston avaus ei onnistu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>Tiedoston luonti etäpalvelimeen ei onnistu</translation>
+        <translation type="obsolete">Tiedoston luonti etäpalvelimeen ei onnistu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>Etätiedostoon kirjoitus ei onnistu</translation>
+        <translation type="obsolete">Etätiedostoon kirjoitus ei onnistu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>yhteys ei avaudu tähän kohteeseen </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward epäonnistui</translation>
+        <translation type="obsolete">channel_open_forward epäonnistui</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session epäonnistui</translation>
+        <translation type="obsolete">channel_open_session epäonnistui</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec epäonnistui</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>socket-yhteydessä on kirjoitusvirhe</translation>
+        <translation type="obsolete">socket-yhteydessä on kirjoitusvirhe</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>kanavan lukuvirhe</translation>
+        <translation type="obsolete">kanavan lukuvirhe</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
-        <translation>channel_write epäonnistui</translation>
+        <translation type="obsolete">channel_write epäonnistui</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>tcp-socketin lukuvirhe</translation>
+        <translation type="obsolete">tcp-socketin lukuvirhe</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Virhe socket-yhteyden luonnissa</translation>
+        <translation type="obsolete">Virhe socket-yhteyden luonnissa</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Virhe yhteyden avauksessa </translation>
     </message>
@@ -3280,12 +4099,12 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Suorittava ohjelma (*.exe)</translation>
     </message>
@@ -3293,69 +4112,74 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Ruutu</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Ota muutokset käyttöön käynnistämällä X2Go -asiakasohjelma uudelleen</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>käytä integroitua X-palvelinta</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation>älä käytä oletus-leikepöytää</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>käytä muokattua X-palvelinta</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>muokattu X-palvelin</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>ohjelma:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>käynnistä X-palvelin kun X2GO -asiakasohjelma käynnistyy</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>komennon valinnat:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>X-palvelimen komentorivin valinnat</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>ikkunan tila:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>kokonäytön tila:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>yksi sovellus:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_fr.ts b/res/i18n/x2goclient_fr.ts
index f25224c..89497df 100644
--- a/res/i18n/x2goclient_fr.ts
+++ b/res/i18n/x2goclient_fr.ts
@@ -157,11 +157,19 @@
     </message>
     <message>
         <source>This value is in conflict with other option</source>
-        <translation type="unfinished">Cette valeur est en conflit avec une autre option</translation>
+        <translation type="obsolete">Cette valeur est en conflit avec une autre option</translation>
     </message>
     <message>
         <source>Options conflict</source>
-        <translation type="unfinished">Conflits d'options</translation>
+        <translation type="obsolete">Conflits d'options</translation>
+    </message>
+    <message>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -195,13 +203,13 @@
         <translation>Ok</translation>
     </message>
     <message>
-        <source>Socket operation timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Failed: </source>
         <translation>Échec:</translation>
     </message>
+    <message>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDialog</name>
@@ -252,7 +260,7 @@
     </message>
     <message>
         <source>X-Server settings</source>
-        <translation>Préférences du serveur X</translation>
+        <translation type="obsolete">Préférences du serveur X</translation>
     </message>
     <message>
         <source>X11 application:</source>
@@ -268,7 +276,7 @@
     </message>
     <message>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Port SSH coté client pour l'export du système de fichiers:</translation>
+        <translation type="obsolete">Port SSH coté client pour l'export du système de fichiers:</translation>
     </message>
     <message>
         <source>Start session embedded inside website</source>
@@ -300,23 +308,23 @@
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished">Attention</translation>
+        <translation type="obsolete">Attention</translation>
     </message>
     <message>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient ne peut pas trouve d'application X11 adaptée. Merci d'installer Apple X11 ou de séléctionner le chemin de l'application</translation>
+        <translation type="obsolete">x2goclient ne peut pas trouve d'application X11 adaptée. Merci d'installer Apple X11 ou de séléctionner le chemin de l'application</translation>
     </message>
     <message>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Vous utilisez X11 (Server X-Window Apple) version </translation>
+        <translation type="obsolete">Vous utilisez X11 (Server X-Window Apple) version </translation>
     </message>
     <message>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>Cette version pose des problèmes avec les applications X en mode de couleurs 24bits. Vous devriez mettre à jour votre environement X11 (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">Cette version pose des problèmes avec les applications X en mode de couleurs 24bits. Vous devriez mettre à jour votre environement X11 (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Pas d'application X11 trouvée dans le chemin sélectionné.</translation>
+        <translation type="obsolete">Pas d'application X11 trouvée dans le chemin sélectionné.</translation>
     </message>
     <message>
         <source>&Connection</source>
@@ -334,6 +342,62 @@
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectionWidget</name>
@@ -490,12 +554,16 @@
     </message>
     <message>
         <source>share folders</source>
-        <translation>partager des dossiers</translation>
+        <translation type="obsolete">partager des dossiers</translation>
     </message>
     <message>
         <source>Select folder</source>
         <translation>Choisir un dossier</translation>
     </message>
+    <message>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FolderButton</name>
@@ -515,18 +583,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rename Folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Icon...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Folder...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Open picture</source>
         <translation type="unfinished"></translation>
     </message>
@@ -551,15 +607,27 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>". Folder is not empty. Please remove content of folder and try again.</source>
+        <source>Delete folder "</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete folder "</source>
+        <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Folder</source>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -578,7 +646,7 @@
     </message>
     <message>
         <source>Login failed!<br>Please try again</source>
-        <translation>Identification échouée !<br>Merci de réessayer</translation>
+        <translation type="obsolete">Identification échouée !<br>Merci de réessayer</translation>
     </message>
     <message>
         <source>Host key for server changed.
@@ -588,15 +656,15 @@ C'est maintenant: </translation>
     </message>
     <message>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Pour des raisons de sécurité, la connection va être stoppée.</translation>
+        <translation type="obsolete">Pour des raisons de sécurité, la connection va être stoppée.</translation>
     </message>
     <message>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation type="unfinished">La clef de ce serveur n'a pas été trouvée mais un autre type de clef existe. Un attaquant peut avoir changé la clef par défaut du serveur pour faire croire à votre client que la clef n'existe pas</translation>
+        <translation type="obsolete">La clef de ce serveur n'a pas été trouvée mais un autre type de clef existe. Un attaquant peut avoir changé la clef par défaut du serveur pour faire croire à votre client que la clef n'existe pas</translation>
     </message>
     <message>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Impossible de trouver le fichier des hôtes connus. Si vous acceptez l'hôte maintenant, le fichier sera créé automatiquement</translation>
+        <translation type="obsolete">Impossible de trouver le fichier des hôtes connus. Si vous acceptez l'hôte maintenant, le fichier sera créé automatiquement</translation>
     </message>
     <message>
         <source>The server is unknown. Do you trust the host key?
@@ -605,7 +673,7 @@ Public key hash: </source>
     </message>
     <message>
         <source>Host key verification failed</source>
-        <translation>La vérification de la clef d'hôte a échouée</translation>
+        <translation type="obsolete">La vérification de la clef d'hôte a échouée</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -621,7 +689,7 @@ Public key hash: </source>
     </message>
     <message>
         <source>Authentication failed</source>
-        <translation>Identification échouée</translation>
+        <translation type="obsolete">Identification échouée</translation>
     </message>
     <message>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
@@ -633,7 +701,7 @@ Public key hash: </source>
     </message>
     <message>
         <source>Secure connection failed</source>
-        <translation>Connection sécurisée échouée</translation>
+        <translation type="obsolete">Connection sécurisée échouée</translation>
     </message>
     <message>
         <source>Issued to:
@@ -699,6 +767,34 @@ Public key hash: </source>
         <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host key for this server was not found but anothertype 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>
+        <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>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediaWidget</name>
@@ -780,7 +876,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source>About X2GO client</source>
-        <translation>Apropos de X2Go Client</translation>
+        <translation type="obsolete">Apropos de X2Go Client</translation>
     </message>
     <message>
         <source>Share folder...</source>
@@ -832,7 +928,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source>Session management...</source>
-        <translation>Gestion de sessions...</translation>
+        <translation type="obsolete">Gestion de sessions...</translation>
     </message>
     <message>
         <source>Ctrl+E</source>
@@ -840,15 +936,15 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Créer une icone de session sur le bureau...</translation>
+        <translation type="obsolete">&Créer une icone de session sur le bureau...</translation>
     </message>
     <message>
         <source>&Set broker password...</source>
-        <translation>Configurer le mot de passe du broker...</translation>
+        <translation type="obsolete">Configurer le mot de passe du broker...</translation>
     </message>
     <message>
         <source>&Connectivity test...</source>
-        <translation>Test de &Connectivité...</translation>
+        <translation type="obsolete">Test de &Connectivité...</translation>
     </message>
     <message>
         <source>Show toolbar</source>
@@ -859,11 +955,6 @@ sound system connections through firewalls</source>
         <translation>À propos de Qt</translation>
     </message>
     <message>
-        <source>Ctrl+Q</source>
-        <comment>exit</comment>
-        <translation></translation>
-    </message>
-    <message>
         <source>&Session</source>
         <translation>&Session</translation>
     </message>
@@ -949,7 +1040,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Bouton de gauche de la souris pour cacher/afficher - Bouton de droite de la souris pour afficher le menu contextuel</translation>
+        <translation type="obsolete">Bouton de gauche de la souris pour cacher/afficher - Bouton de droite de la souris pour afficher le menu contextuel</translation>
     </message>
     <message>
         <source>Error</source>
@@ -961,7 +1052,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source>no X2Go server found in LDAP </source>
-        <translation>Pas de serveur X2Go trouvé dans LDAP</translation>
+        <translation type="obsolete">Pas de serveur X2Go trouvé dans LDAP</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1010,7 +1101,7 @@ Utiliser le mode caché de X2Go Client ?</translation>
     <message>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Connection échouée</b>
+        <translation type="obsolete"><b>Connection échouée</b>
 </translation>
     </message>
     <message>
@@ -1023,7 +1114,7 @@ Utiliser le mode caché de X2Go Client ?</translation>
     </message>
     <message>
         <source>No server availabel</source>
-        <translation>Pas de serveur disponible</translation>
+        <translation type="obsolete">Pas de serveur disponible</translation>
     </message>
     <message>
         <source>Select session:</source>
@@ -1055,7 +1146,7 @@ Utiliser le mode caché de X2Go Client ?</translation>
     </message>
     <message>
         <source>No accessible desktop found</source>
-        <translation>Aucun bureau distant trouvé</translation>
+        <translation type="obsolete">Aucun bureau distant trouvé</translation>
     </message>
     <message>
         <source>Filter</source>
@@ -1071,7 +1162,7 @@ Utiliser le mode caché de X2Go Client ?</translation>
     </message>
     <message>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>La profondeur de couleur de votre serveur X est différente de celle de votre session X2Go. Cela peut pauser problème pour se reconnecter et la plupart du temps, <b>vous allez perdre la session</b>. Vous êtes fortement encouragé à changer la profondeur de couleur de couleur de votre serveur X à </translation>
+        <translation type="obsolete">La profondeur de couleur de votre serveur X est différente de celle de votre session X2Go. Cela peut pauser problème pour se reconnecter et la plupart du temps, <b>vous allez perdre la session</b>. Vous êtes fortement encouragé à changer la profondeur de couleur de couleur de votre serveur X à </translation>
     </message>
     <message>
         <source>24 or 32</source>
@@ -1079,7 +1170,7 @@ Utiliser le mode caché de X2Go Client ?</translation>
     </message>
     <message>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation>bits et redémarrer votre serveur X avant de vous reconnecter à votre session.<br>Souhaitez-vous tout de même rétablir cette session ?</translation>
+        <translation type="obsolete">bits et redémarrer votre serveur X avant de vous reconnecter à votre session.<br>Souhaitez-vous tout de même rétablir cette session ?</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -1105,7 +1196,7 @@ La nouvelle clef est:</translation>
     </message>
     <message>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Impossible de trouver le fichier des hôtes connus. Si vouss acceptez la clef d'hôte ici, le fichier sera automatiquement créé</translation>
+        <translation type="obsolete">Impossible de trouver le fichier des hôtes connus. Si vouss acceptez la clef d'hôte ici, le fichier sera automatiquement créé</translation>
     </message>
     <message>
         <source>The server is unknown. Do you trust the host key?
@@ -1119,11 +1210,11 @@ Hash de la clef publique: </translation>
     </message>
     <message>
         <source>Host key verification failed</source>
-        <translation>La vérification de la clef d'hôte a échouée</translation>
+        <translation type="obsolete">La vérification de la clef d'hôte a échouée</translation>
     </message>
     <message>
         <source>Authentication failed</source>
-        <translation>L'autentification a échouée</translation>
+        <translation type="obsolete">L'autentification a échouée</translation>
     </message>
     <message>
         <source>Enter password for SSH proxy</source>
@@ -1131,7 +1222,7 @@ Hash de la clef publique: </translation>
     </message>
     <message>
         <source>Server not availabel</source>
-        <translation>Le serveur n'est pas disponible</translation>
+        <translation type="obsolete">Le serveur n'est pas disponible</translation>
     </message>
     <message>
         <source>suspending</source>
@@ -1147,7 +1238,7 @@ Hash de la clef publique: </translation>
     </message>
     <message>
         <source>Unable to create folder:</source>
-        <translation>Impossible de créer le dossier:</translation>
+        <translation type="obsolete">Impossible de créer le dossier:</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
@@ -1160,12 +1251,12 @@ Hash de la clef publique: </translation>
     <message>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>Impossible de créer un tunnel SSL:</translation>
+        <translation type="obsolete">Impossible de créer un tunnel SSL:</translation>
     </message>
     <message>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>Impossible de créer un tunnel SSL:</translation>
+        <translation type="obsolete">Impossible de créer un tunnel SSL:</translation>
     </message>
     <message>
         <source>Finished</source>
@@ -1188,11 +1279,6 @@ Hash de la clef publique: </translation>
         <translation>abandon en cours</translation>
     </message>
     <message>
-        <source>Are you sure you want to terminate this session?
-Unsaved documents will be lost</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1205,482 +1291,739 @@ Unsaved documents will be lost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><b>Connection failed</b>
-:
-</source>
+        <source> (can't open file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> (can't open file)</source>
+        <source>Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> (file not exists)</source>
+        <source>Unable to create file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> (directory not exists)</source>
+        <source>Unable to execute: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--link"</source>
+        <source>X2Go Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--sound"</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--geometry"</source>
+        <source>Keyboard layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--set-kbd"</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--ldap"</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--ldap1"</source>
+        <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--ldap2"</source>
+        <source>Applications...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"--pack"</source>
+        <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available pack methodes:</source>
+        <source>Show details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Support</source>
+        <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
+        <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+        <source>View only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><b>X2Go Client V. </source>
+        <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please check LDAP Settings</source>
+        <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No valid card found</source>
+        <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This card is unknown by X2Go system</source>
+        <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create file: </source>
+        <source>Client IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can't start X server
-Please check your settings</source>
+        <source>Session ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can't connect to X server
-Please check your settings</source>
+        <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can't start X Server
-Please check your installation</source>
+        <source>Only my desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to execute: </source>
+        <source>Restore toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remote server does not support file system export through SSH Tunnel
-Please update to a newer x2goserver package</source>
+        <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>
     <message>
-        <source>Unable to read :
-</source>
+        <source>Connecting to broker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to write :
-</source>
+        <source>WINDOWS-1252</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>X2Go Session</source>
+        <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source>Can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keyboard layout:</source>
+        <source>Translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ok</source>
+        <source>No X2Go sessions found, closing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cancel</source>
+        <source>Starting connection to server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
+        <source> to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Applications...</source>
+        <source>Authentication failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort</source>
+        <source>Connection failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show details</source>
+        <source> - Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Resume</source>
+        <source>New session started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New</source>
+        <source>Session resumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Full access</source>
+        <source>Unable to create folder: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View only</source>
+        <source>Unable to write file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
+        <source>Emergency exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Command</source>
+        <source>Waiting for proxy to exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type</source>
+        <source>Wrong parameter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Server</source>
+        <source>RSA file empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Client IP</source>
+        <source>Card not configured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session ID</source>
+        <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>
-        <source>User</source>
+        <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only my desktops</source>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restore toolbar</source>
+        <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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>
+        <source>Git Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connecting to broker</source>
+        <source>SSH Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WINDOWS-1252</source>
+        <source>SSH daemon failed to open the application's public key
+used for exporting folders and printers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ISO8859-1</source>
+        <source>Starting X2Go Client...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong value for argument"speed"</source>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Starting x2goclient...</source>
+        <source>About X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Starting x2goclient in portable mode... data directory is: </source>
+        <source>Started X2Go Client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Started  x2goclient.</source>
+        <source> found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can't load translator: </source>
+        <source>English language requested, not loading translator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Translator: </source>
+        <source>Non-fatal: can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> installed.</source>
+        <source>Trying to load language with lower preference, if existent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Closing x2goclient...</source>
+        <source>Session management ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Closed  x2goclient.</source>
+        <source>&Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No X2Go sessions found, closing.</source>
+        <source>&Set broker password ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Starting connection to server: </source>
+        <source>&Connectivity test ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> to </source>
+        <source>Share folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection Error(</source>
+        <source>A left click hides or restores the window. A right click displays the context menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Couldn't find a SSH connection.</source>
+        <source>Closing X2Go Client ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication failed: </source>
+        <source>Finished X2Go Client closing hooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connection failed: </source>
+        <source>Broker authentication failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> - Wrong password.</source>
+        <source>no X2Go Server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New session started</source>
+        <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session resumed</source>
+        <source>Couldn't find an SSH connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to create folder: </source>
+        <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.
+Do you want to terminate the connection?
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to write file: </source>
+        <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Emergency exit.</source>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Waiting for proxy to exit.</source>
+        <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>
-        <source>Failed, killing the proxy.</source>
+        <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wrong parameter: </source>
+        <source><b>Connection failed.</b>
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>RSA file empty.</source>
+        <source>No server available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not open key: </source>
+        <source>Server not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Card not configured.</source>
+        <source>No accessible desktop found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error getting window geometry (window closed)?</source>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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.
-Do you want to terminate the connection?
-</source>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <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>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
-For security reasons, it is recommended to stop the connection.
-Do you want to terminate the connection?
+        <source>Unable to create SSH tunnel for audio data:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Verification code:</source>
+        <source>failed to start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
+        <source>This likely means the binary is not available.
+The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pack Methodes</source>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Option is not availabel in this build</source>
+        <source>Execution failed, exit code was: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Changelog</source>
+        <source>didn't start up in time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Git Info</source>
+        <source>This error shouldn't come up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSH Error</source>
+        <source>didn't accept a write operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSH daemon could not be started.
-
-You'll need SSH daemon for printing and file sharing.
-
-Normally, this should not happen as X2Go Client for 
-Windows ships its internal sshd.exe.
-
-If you see this message, please report a bug against
-the X2Go bugtracker.</source>
+        <source>It is probably not running correctly or crashed in-between.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSH daemon is not running.
-
-You'll need SSH daemon for printing and file sharing
-
-Please ask your system administrator to provide the SSH
-service on your computer.</source>
+        <source>Unable to read from xmodmap.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSH daemon failed to open the application's public host key.</source>
+        <source>encountered an unknown error during start up or execution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSH daemon failed to open the application's public key
-used for exporting folders and printers.</source>
+        <source>experienced an undefined error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSH daemon failed to open the application's
-authoized_keys file.</source>
+        <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>
-        <source>wrong value for argument"--clipboard"</source>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintDialog</name>
     <message>
-        <source>Print</source>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You've deactivated the x2go client printing dialog.</source>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
+        <source>Are you sure you want to terminate this session?
+Unsaved documents will be lost.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Print - X2Go Client</source>
+        <source><b>Connection failed.</b>
+:
+</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintProcess</name>
     <message>
-        <source>Save File</source>
+        <source> (file does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>PDF Document (*.pdf)</source>
+        <source> (directory does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to execute command:
-</source>
+        <source>Invalid value for parameter "--link".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Printing error</source>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></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 type="unfinished"></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 [...]
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check whether the package providing "scdaemon" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote server does not support file system exports through SSH tunnels.
+Please update your x2goserver package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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:
+<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>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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:
+<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>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <source>Print</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Print - X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PrintProcess</name>
+    <message>
+        <source>Save File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PDF Document (*.pdf)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to execute command:
+</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintWidget</name>
     <message>
-        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
+        <source>Printing error.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PrintWidget</name>
     <message>
         <source>Form</source>
         <translation type="unfinished">Formulaire</translation>
@@ -1734,6 +2077,10 @@ authoized_keys file.</source>
         <source>Show this dialog before start printing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
@@ -1801,17 +2148,48 @@ lpr -P hp_laserjet</source>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SessionButton</name>
     <message>
-        <source>Session preferences...</source>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Create session icon on desktop...</source>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SessionButton</name>
     <message>
         <source>Delete session</source>
         <translation type="unfinished"></translation>
@@ -1888,6 +2266,14 @@ lpr -P hp_laserjet</source>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionExplorer</name>
@@ -1897,13 +2283,13 @@ lpr -P hp_laserjet</source>
     </message>
     <message>
         <source>Create session icon on desktop</source>
-        <translation type="unfinished">Créer une icone de session sur le bureau</translation>
+        <translation type="obsolete">Créer une icone de session sur le bureau</translation>
     </message>
     <message>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation type="unfinished">Les icones de bureau peuvent être configurées pour ne pas afficher X2Go Client (mode caché). Si vous voulez utiliser cette fonctionnalité, vous aurez besoin de configurer l'identification par clef GPG ou par Smart Card GPG.
+        <translation type="obsolete">Les icones de bureau peuvent être configurées pour ne pas afficher X2Go Client (mode caché). Si vous voulez utiliser cette fonctionnalité, vous aurez besoin de configurer l'identification par clef GPG ou par Smart Card GPG.
 
 Utiliser le mode caché de X2Go Client ?</translation>
     </message>
@@ -1923,6 +2309,16 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <source>Are you sure you want to delete this session?</source>
         <translation type="unfinished">Êtes vous sûr de vouloir effacer cette session ?</translation>
     </message>
+    <message>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionManageDialog</name>
@@ -1944,7 +2340,7 @@ Utiliser le mode caché de X2Go Client ?</translation>
     </message>
     <message>
         <source>&Create session icon on desktop...</source>
-        <translation type="unfinished">&Créer une icone de session sur le bureau...</translation>
+        <translation type="obsolete">&Créer une icone de session sur le bureau...</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -1955,6 +2351,10 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <source>Session management</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionWidget</name>
@@ -1987,10 +2387,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2023,10 +2419,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ssh-agent or default ssh key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Type:</source>
         <translation type="unfinished">Type:</translation>
     </message>
@@ -2043,10 +2435,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Connect to Windows terminal server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2079,10 +2467,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Direct RDP Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>RDP port:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2123,15 +2507,31 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished">Erreur</translation>
     </message>
     <message>
-        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
+        <source>Delegation of GSSAPI credentials to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delegation of GSSAPI credentials to the server</source>
+        <source>Path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path:</source>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
 </context>
@@ -2146,10 +2546,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>RDP Client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2214,10 +2610,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto detect keyboard settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do not configure keyboard</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2238,10 +2630,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&Clipboard Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bidirectional copy and paste</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2257,6 +2645,18 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <source>Disable clipboard completely</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShareWidget</name>
@@ -2285,10 +2685,6 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Select folder</source>
         <translation type="unfinished">Choisir un dossier</translation>
     </message>
@@ -2317,105 +2713,105 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <translation type="unfinished">Erreur</translation>
     </message>
     <message>
-        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SshMasterConnection</name>
     <message>
-        <source>SSH proxy connection error</source>
+        <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>
+</context>
+<context>
+    <name>SshMasterConnection</name>
     <message>
         <source>SSH proxy connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create SSH proxy tunnel</source>
+        <source>Cannot connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not initialize libssh</source>
+        <source>channel_request_exec failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not create ssh session</source>
+        <source>SSH proxy connection error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not connect to proxy server</source>
+        <source>Failed to create SSH proxy tunnel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not connect to </source>
+        <source>Cannot initialize libssh.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Authentication failed</source>
+        <source>Cannot create SSH session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not open file </source>
+        <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not create remote file </source>
+        <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not write to remote file </source>
+        <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot connect to </source>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>channel_open_forward failed</source>
+        <source>Cannot open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>channel_open_session failed</source>
+        <source>Cannot create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>channel_request_exec failed</source>
+        <source>Cannot write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>error writing to socket</source>
+        <source>channel_open_forward failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>error reading channel</source>
+        <source>channel_open_session failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>channel_write failed</source>
+        <source>Error writing to socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>error reading tcp socket</source>
+        <source>Error reading channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
+        <source>channel_write failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check your GSSApi configuration or choose another authentication method</source>
+        <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <source>Error creating socket</source>
+        <source>Error binding </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error binding </source>
+        <source>Error creating socket.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2484,5 +2880,9 @@ Utiliser le mode caché de X2Go Client ?</translation>
         <source> do not use primary clipboard</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_nb_no.ts b/res/i18n/x2goclient_nb_no.ts
index 575afbc..2fbbeac 100644
--- a/res/i18n/x2goclient_nb_no.ts
+++ b/res/i18n/x2goclient_nb_no.ts
@@ -157,11 +157,19 @@
     </message>
     <message>
         <source>This value is in conflict with other option</source>
-        <translation>Dette alternativet er i konflikt med et annet alternativ</translation>
+        <translation type="obsolete">Dette alternativet er i konflikt med et annet alternativ</translation>
     </message>
     <message>
         <source>Options conflict</source>
-        <translation>Alternativskonflikt</translation>
+        <translation type="obsolete">Alternativskonflikt</translation>
+    </message>
+    <message>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -196,12 +204,16 @@
     </message>
     <message>
         <source>Socket operation timed out</source>
-        <translation>Sokkel handlingen ble tidsavbrutt</translation>
+        <translation type="obsolete">Sokkel handlingen ble tidsavbrutt</translation>
     </message>
     <message>
         <source>Failed: </source>
         <translation>Feilet: </translation>
     </message>
+    <message>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConfigDialog</name>
@@ -251,7 +263,7 @@
     </message>
     <message>
         <source>X-Server settings</source>
-        <translation>X-Server innstillinger</translation>
+        <translation type="obsolete">X-Server innstillinger</translation>
     </message>
     <message>
         <source>X11 application:</source>
@@ -267,7 +279,7 @@
     </message>
     <message>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Klientside SSH port for bruk ved eksport av filsystem:</translation>
+        <translation type="obsolete">Klientside SSH port for bruk ved eksport av filsystem:</translation>
     </message>
     <message>
         <source>Start session embedded inside website</source>
@@ -299,23 +311,23 @@
     </message>
     <message>
         <source>Warning</source>
-        <translation>Advarsel</translation>
+        <translation type="obsolete">Advarsel</translation>
     </message>
     <message>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient kan ikke finne en passende X11 applikasjon. Vennligst installer Apple X11, eller oppgi stien til applikasjonen</translation>
+        <translation type="obsolete">x2goclient kan ikke finne en passende X11 applikasjon. Vennligst installer Apple X11, eller oppgi stien til applikasjonen</translation>
     </message>
     <message>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Du benytter X11 (Apple X-Window Server) versjon </translation>
+        <translation type="obsolete">Du benytter X11 (Apple X-Window Server) versjon </translation>
     </message>
     <message>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Denne versjonen forårsaker problemer med X-applikasjoner i 24biters fargemodus. Du burde oppdatere ditt X11 oppsett (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">. Denne versjonen forårsaker problemer med X-applikasjoner i 24biters fargemodus. Du burde oppdatere ditt X11 oppsett (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Ingen passende X11 applikasjon ble funnet i valgt sti</translation>
+        <translation type="obsolete">Ingen passende X11 applikasjon ble funnet i valgt sti</translation>
     </message>
     <message>
         <source>&Connection</source>
@@ -333,6 +345,62 @@
         <source>&Media</source>
         <translation>&Media</translation>
     </message>
+    <message>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ConnectionWidget</name>
@@ -488,12 +556,16 @@
     </message>
     <message>
         <source>share folders</source>
-        <translation>del mapper</translation>
+        <translation type="obsolete">del mapper</translation>
     </message>
     <message>
         <source>Select folder</source>
         <translation>Velg mappe</translation>
     </message>
+    <message>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FolderButton</name>
@@ -514,15 +586,15 @@
     </message>
     <message>
         <source>Rename Folder...</source>
-        <translation>Lag nytt navn på mappe...</translation>
+        <translation type="obsolete">Lag nytt navn på mappe...</translation>
     </message>
     <message>
         <source>Change Icon...</source>
-        <translation>Endre ikon ...</translation>
+        <translation type="obsolete">Endre ikon ...</translation>
     </message>
     <message>
         <source>Delete Folder...</source>
-        <translation>Slett mappe...</translation>
+        <translation type="obsolete">Slett mappe...</translation>
     </message>
     <message>
         <source>Open picture</source>
@@ -550,7 +622,7 @@
     </message>
     <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>" mappen er ikke tom. Fjern innholdet i mappa, og forsøk pånytt.</translation>
+        <translation type="obsolete">" mappen er ikke tom. Fjern innholdet i mappa, og forsøk pånytt.</translation>
     </message>
     <message>
         <source>Delete folder "</source>
@@ -560,6 +632,22 @@
         <source>New Folder</source>
         <translation>Ny mappe</translation>
     </message>
+    <message>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HelpDialog</name>
@@ -586,15 +674,15 @@ Den er nå: </translation>
     </message>
     <message>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation>
+        <translation type="obsolete">Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation>
     </message>
     <message>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard servernøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
+        <translation type="obsolete">Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard servernøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
     </message>
     <message>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
+        <translation type="obsolete">Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
     </message>
     <message>
         <source>The server is unknown. Do you trust the host key?
@@ -604,7 +692,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Host key verification failed</source>
-        <translation>Verifiseringen av vertsnøkkelen feilet</translation>
+        <translation type="obsolete">Verifiseringen av vertsnøkkelen feilet</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -620,7 +708,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Authentication failed</source>
-        <translation>Autentisering feilet</translation>
+        <translation type="obsolete">Autentisering feilet</translation>
     </message>
     <message>
         <source>Error</source>
@@ -628,7 +716,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Login failed!<br>Please try again</source>
-        <translation>Innlogging feilet! <br>Vennligst forsøk igjen</translation>
+        <translation type="obsolete">Innlogging feilet! <br>Vennligst forsøk igjen</translation>
     </message>
     <message>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
@@ -640,7 +728,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Secure connection failed</source>
-        <translation>Sikker tilkobling feilet</translation>
+        <translation type="obsolete">Sikker tilkobling feilet</translation>
     </message>
     <message>
         <source>Issued to:
@@ -714,6 +802,34 @@ Offentlig nøkkel: </translation>
         <source>Verification code:</source>
         <translation>Verifikasjonskode:</translation>
     </message>
+    <message>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host key for this server was not found but anothertype 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>
+        <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>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MediaWidget</name>
@@ -821,7 +937,7 @@ lydsystem forbindelser gjennom brannmurer</translation>
     <message>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
     </message>
     <message>
         <source>&Session</source>
@@ -845,7 +961,7 @@ Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Dette kan være et tegn på såkalt man-in-the-middle angrep.
+        <translation type="obsolete">Dette kan være et tegn på såkalt man-in-the-middle angrep.
 Noen kan forsøke å avlytte din forbindelse.
 Av hensyn til din sikkerhet, så bør du avbryte tilkoblingen.
 Vil du avbryte tilkoblingen?
@@ -862,7 +978,7 @@ Vil du oppdateren den nye vertsnøkkelen?</translation>
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type nøkkel finnes. En angriper kan endre standard vertsnøkkel for serveren for å lure din klient til å tro at nøkkelen ikke finnes.
+        <translation type="obsolete">Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type nøkkel finnes. En angriper kan endre standard vertsnøkkel for serveren for å lure din klient til å tro at nøkkelen ikke finnes.
 Av hensyn til din sikkerhet så bør du avbryte tilkoblingen.
 Vil du avbryte tilkoblingen?
 </translation>
@@ -893,7 +1009,7 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>Failed, killing the proxy.</source>
-        <translation>Feilet, dreper derfor proxy.</translation>
+        <translation type="obsolete">Feilet, dreper derfor proxy.</translation>
     </message>
     <message>
         <source>Wrong parameter: </source>
@@ -905,7 +1021,7 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>Can not open key: </source>
-        <translation>Kan ikke åpne nøkkelfilen: </translation>
+        <translation type="obsolete">Kan ikke åpne nøkkelfilen: </translation>
     </message>
     <message>
         <source>Card not configured.</source>
@@ -913,7 +1029,7 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Feil under uthenting av vindusgeometrien (Er vinduet lukket)?</translation>
+        <translation type="obsolete">Feil under uthenting av vindusgeometrien (Er vinduet lukket)?</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -1014,7 +1130,7 @@ Vil du avbryte tilkoblingen?
     <message>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>Klarer ikke å opprette SSL tunnel:
+        <translation type="obsolete">Klarer ikke å opprette SSL tunnel:
 </translation>
     </message>
     <message>
@@ -1059,35 +1175,35 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source> (file not exists)</source>
-        <translation> (filen finnes ikke)</translation>
+        <translation type="obsolete"> (filen finnes ikke)</translation>
     </message>
     <message>
         <source> (directory not exists)</source>
-        <translation> (mappen finnes ikke)</translation>
+        <translation type="obsolete"> (mappen finnes ikke)</translation>
     </message>
     <message>
         <source>wrong value for argument"--link"</source>
-        <translation>ugyldig verdi for parameteren "--link"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--link"</translation>
     </message>
     <message>
         <source>wrong value for argument"--sound"</source>
-        <translation>ugyldig verdi for parameteren "--sound"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--sound"</translation>
     </message>
     <message>
         <source>wrong value for argument"--geometry"</source>
-        <translation>ugyldig verdi for parameteren "--geometry"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--geometry"</translation>
     </message>
     <message>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>ugyldig verdi for parameteren "--set-kbd"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--set-kbd"</translation>
     </message>
     <message>
         <source>wrong value for argument"--ldap"</source>
-        <translation>ugyldig verdi for parameteren "--ldap"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--ldap"</translation>
     </message>
     <message>
         <source>wrong value for argument"--pack"</source>
-        <translation>ugyldig verdi for parameteren "--pack"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--pack"</translation>
     </message>
     <message>
         <source>wrong parameter: </source>
@@ -1095,7 +1211,7 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>Available pack methodes:</source>
-        <translation>Tilgjengelige pakkemetoder:</translation>
+        <translation type="obsolete">Tilgjengelige pakkemetoder:</translation>
     </message>
     <message>
         <source>Support</source>
@@ -1103,15 +1219,15 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
         <source>Please check LDAP Settings</source>
-        <translation>Vennligst sjekk LDAP innstillingene</translation>
+        <translation type="obsolete">Vennligst sjekk LDAP innstillingene</translation>
     </message>
     <message>
         <source>no X2Go Server found in LDAP </source>
-        <translation type="obsolete">LDAP enthält keinen X2Go Server </translation>
+        <translation type="unfinished">LDAP enthält keinen X2Go Server </translation>
     </message>
     <message>
         <source>Are you sure you want to delete this Session?</source>
@@ -1120,7 +1236,7 @@ Vil du avbryte tilkoblingen?
     <message>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Tilkoblingen feilet</b>
+        <translation type="obsolete"><b>Tilkoblingen feilet</b>
 </translation>
     </message>
     <message>
@@ -1143,7 +1259,7 @@ Vil du avbryte tilkoblingen?
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Tilkoblingen feilet</b>
+        <translation type="obsolete"><b>Tilkoblingen feilet</b>
 :
 </translation>
     </message>
@@ -1176,13 +1292,13 @@ Vil du avbryte tilkoblingen?
     <message>
         <source>Unable to read :
 </source>
-        <translation>Klarer ikke å lese:
+        <translation type="obsolete">Klarer ikke å lese:
 </translation>
     </message>
     <message>
         <source>Unable to write :
 </source>
-        <translation>Klarer ikke å skrive:
+        <translation type="obsolete">Klarer ikke å skrive:
 </translation>
     </message>
     <message>
@@ -1195,11 +1311,11 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>ugyldig verdi for parameteren "--ldap1"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--ldap1"</translation>
     </message>
     <message>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>ugyldig verdi for parameteren "--ldap2"</translation>
+        <translation type="obsolete">ugyldig verdi for parameteren "--ldap2"</translation>
     </message>
     <message>
         <source>Usage: x2goclient [Options]
@@ -1231,7 +1347,7 @@ Vil du avbryte tilkoblingen?
     </message>
     <message>
         <source>No valid card found</source>
-        <translation>Ingen gyldige kort ble funnet</translation>
+        <translation type="obsolete">Ingen gyldige kort ble funnet</translation>
     </message>
     <message>
         <source>This card is unknown by X2Go System</source>
@@ -1256,7 +1372,7 @@ Vil du avbryte tilkoblingen?
     <message>
         <source>Can't connect to X server
 Please check your settings</source>
-        <translation>Klarte ikke å koble til X-Serveren
+        <translation type="obsolete">Klarte ikke å koble til X-Serveren
 Vennligst sjekk innstillingene dine</translation>
     </message>
     <message>
@@ -1271,7 +1387,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene <b>vil du miste hele sesjonen</b>. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til </translation>
+        <translation type="obsolete">Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene <b>vil du miste hele sesjonen</b>. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til </translation>
     </message>
     <message>
         <source>24 or 32</source>
@@ -1279,7 +1395,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. <br>Gjenoppta denne sesjonen uansett?</translation>
+        <translation type="obsolete"> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. <br>Gjenoppta denne sesjonen uansett?</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -1291,7 +1407,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Go Client V. </translation>
+        <translation type="obsolete"><b>X2Go Client V. </translation>
     </message>
     <message>
         <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with 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 fullscreen loginscreen (replacement for lo [...]
@@ -1359,7 +1475,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>Session management...</source>
-        <translation>Sesjonshåndtering...</translation>
+        <translation type="obsolete">Sesjonshåndtering...</translation>
     </message>
     <message>
         <source>Show toolbar</source>
@@ -1367,7 +1483,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>About X2GO client</source>
-        <translation>Om X2GO klient</translation>
+        <translation type="obsolete">Om X2GO klient</translation>
     </message>
     <message>
         <source>Please check LDAP settings</source>
@@ -1375,7 +1491,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>no X2Go server found in LDAP </source>
-        <translation>Inge X2Go server ble funnet i LDAP </translation>
+        <translation type="obsolete">Inge X2Go server ble funnet i LDAP </translation>
     </message>
     <message>
         <source>Are you sure you want to delete this session?</source>
@@ -1387,7 +1503,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>No server availabel</source>
-        <translation>Ingen tilgjengelig server</translation>
+        <translation type="obsolete">Ingen tilgjengelig server</translation>
     </message>
     <message>
         <source>Not connected</source>
@@ -1399,7 +1515,7 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>Unable to create folder:</source>
-        <translation>Klarer ikke å opprette katalogen:</translation>
+        <translation type="obsolete">Klarer ikke å opprette katalogen:</translation>
     </message>
     <message>
         <source>Enter passphrase to decrypt a key</source>
@@ -1419,11 +1535,11 @@ Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>Connection Error(</source>
-        <translation>Tilkoblingsfeil(</translation>
+        <translation type="obsolete">Tilkoblingsfeil(</translation>
     </message>
     <message>
         <source>Couldn't find a SSH connection.</source>
-        <translation>Klarte ikke å finne en SSH tilkobling.</translation>
+        <translation type="obsolete">Klarte ikke å finne en SSH tilkobling.</translation>
     </message>
     <message>
         <source>Host key for server changed.
@@ -1441,7 +1557,7 @@ Den er nå: </translation>
     </message>
     <message>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
+        <translation type="obsolete">Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
     </message>
     <message>
         <source>The server is unknown. Do you trust the host key?
@@ -1451,7 +1567,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Host key verification failed</source>
-        <translation>Verifiseringen av vertsnøkkelen feilet</translation>
+        <translation type="obsolete">Verifiseringen av vertsnøkkelen feilet</translation>
     </message>
     <message>
         <source>Authentication failed: </source>
@@ -1459,7 +1575,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Authentication failed</source>
-        <translation>Pålogging feilet</translation>
+        <translation type="obsolete">Pålogging feilet</translation>
     </message>
     <message>
         <source>Enter password for SSH proxy</source>
@@ -1475,7 +1591,7 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>Server not availabel</source>
-        <translation>Serveren er ikke tilgjengelig</translation>
+        <translation type="obsolete">Serveren er ikke tilgjengelig</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
@@ -1484,7 +1600,7 @@ Offentlig nøkkel: </translation>
     <message>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>Klarte ikke å opprette SSL tunnel:
+        <translation type="obsolete">Klarte ikke å opprette SSL tunnel:
 </translation>
     </message>
     <message>
@@ -1501,35 +1617,35 @@ Offentlig nøkkel: </translation>
     </message>
     <message>
         <source>This card is unknown by X2Go system</source>
-        <translation>Dette kortet er ukjent for X2Go systemet</translation>
+        <translation type="obsolete">Dette kortet er ukjent for X2Go systemet</translation>
     </message>
     <message>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>Klarte ikke å starte X-Serveren
+        <translation type="obsolete">Klarte ikke å starte X-Serveren
 Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Serveren støtter ikke eksport av filsystemet over en SSH Tunnel
+        <translation type="obsolete">Serveren støtter ikke eksport av filsystemet over en SSH Tunnel
 Vennligst oppdater til en nyere x2goserver pakke</translation>
     </message>
     <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Opprett sesjonsikon på skrivebordet...</translation>
+        <translation type="obsolete">&Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
         <source>Starting x2goclient...</source>
-        <translation>Starter x2goclient...</translation>
+        <translation type="obsolete">Starter x2goclient...</translation>
     </message>
     <message>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>Starter x2goclient i portabel modus... data-katalogen er: </translation>
+        <translation type="obsolete">Starter x2goclient i portabel modus... data-katalogen er: </translation>
     </message>
     <message>
         <source>Started  x2goclient.</source>
-        <translation>Startet x2goclient.</translation>
+        <translation type="obsolete">Startet x2goclient.</translation>
     </message>
     <message>
         <source>Can't load translator: </source>
@@ -1541,15 +1657,15 @@ Vennligst oppdater til en nyere x2goserver pakke</translation>
     </message>
     <message>
         <source> installed.</source>
-        <translation> installert.</translation>
+        <translation type="obsolete"> installert.</translation>
     </message>
     <message>
         <source>&Set broker password...</source>
-        <translation>&Sett megler passord...</translation>
+        <translation type="obsolete">&Sett megler passord...</translation>
     </message>
     <message>
         <source>&Connectivity test...</source>
-        <translation>&Tilkoblings-test...</translation>
+        <translation type="obsolete">&Tilkoblings-test...</translation>
     </message>
     <message>
         <source>Operation failed</source>
@@ -1617,15 +1733,15 @@ Vennligst oppdater til en nyere x2goserver pakke</translation>
     </message>
     <message>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Venstre museknapp for å skjule/gjenopprette  -  Høyre museknapp viser sprettoppmeny</translation>
+        <translation type="obsolete">Venstre museknapp for å skjule/gjenopprette  -  Høyre museknapp viser sprettoppmeny</translation>
     </message>
     <message>
         <source>Closing x2goclient...</source>
-        <translation>Lukker x2goclient...</translation>
+        <translation type="obsolete">Lukker x2goclient...</translation>
     </message>
     <message>
         <source>Closed  x2goclient.</source>
-        <translation>Lukket x2goclient.</translation>
+        <translation type="obsolete">Lukket x2goclient.</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1674,7 +1790,7 @@ Use x2goclient hidden mode?</source>
     <message>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>Er du sikker på at du vil avslutte denne sesjonen?
+        <translation type="obsolete">Er du sikker på at du vil avslutte denne sesjonen?
 Ulagrede data vil gå tapt</translation>
     </message>
     <message>
@@ -1684,7 +1800,7 @@ Ulagrede data vil gå tapt</translation>
     <message>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>Klarer ikke å starte X Serveren
+        <translation type="obsolete">Klarer ikke å starte X Serveren
 Vennligst sjekk din installasjon</translation>
     </message>
     <message>
@@ -1741,7 +1857,7 @@ Du kan installere sshd med:
     </message>
     <message>
         <source>No accessible desktop found</source>
-        <translation>Ingen tilgjengelige skrivebord ble funnet</translation>
+        <translation type="obsolete">Ingen tilgjengelige skrivebord ble funnet</translation>
     </message>
     <message>
         <source>Full access</source>
@@ -1765,11 +1881,11 @@ Du kan installere sshd med:
     </message>
     <message>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="obsolete"><br>x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers 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>
+        <translation type="obsolete"><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers 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>
         <source>WINDOWS-1252</source>
@@ -1781,7 +1897,7 @@ Du kan installere sshd med:
     </message>
     <message>
         <source>wrong value for argument"speed"</source>
-        <translation>wrong value for argument"speed"</translation>
+        <translation type="obsolete">wrong value for argument"speed"</translation>
     </message>
     <message>
         <source>application/x2go:x2go:Configuration File for X2Go Session</source>
@@ -1793,11 +1909,11 @@ Du kan installere sshd med:
     </message>
     <message>
         <source>Pack Methodes</source>
-        <translation>Pakkemetode</translation>
+        <translation type="obsolete">Pakkemetode</translation>
     </message>
     <message>
         <source>Option is not availabel in this build</source>
-        <translation>Valget er ikke aktivet i denne versjonen</translation>
+        <translation type="obsolete">Valget er ikke aktivet i denne versjonen</translation>
     </message>
     <message>
         <source>Changelog</source>
@@ -1821,7 +1937,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH demonen kunne ikke starte.
+        <translation type="obsolete">SSH demonen kunne ikke starte.
 
 Du trenger SSH demone for å kunne skrive ut og for fildeling.
 
@@ -1838,7 +1954,7 @@ You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>SSH daemon could not be started.
+        <translation type="obsolete">SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
 
@@ -1847,7 +1963,7 @@ datamaskin.</translation>
     </message>
     <message>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>SSH demonen klarte ikke å åpne applikasjonens offentlige vertsnøkkel.</translation>
+        <translation type="obsolete">SSH demonen klarte ikke å åpne applikasjonens offentlige vertsnøkkel.</translation>
     </message>
     <message>
         <source>SSH daemon failed to open the application's public key
@@ -1857,11 +1973,481 @@ used for exporting folders and printers.</source>
     <message>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>SSH demonen klarte ikke å åpne applikasjonens authorized_keys fil.</translation>
+        <translation type="obsolete">SSH demonen klarte ikke å åpne applikasjonens authorized_keys fil.</translation>
     </message>
     <message>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>feil verdi til argumentet"--clipboard"</translation>
+        <translation type="obsolete">feil verdi til argumentet"--clipboard"</translation>
+    </message>
+    <message>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A left click hides or restores the window. A right click displays the context menu.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This likely means the binary is not available.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to terminate this session?
+Unsaved documents will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></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 type="unfinished"></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 [...]
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check whether the package providing "scdaemon" is installed.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remote server does not support file system exports through SSH tunnels.
+Please update your x2goserver package.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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:
+<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>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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:
+<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>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1876,11 +2462,19 @@ authoized_keys file.</source>
     </message>
     <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Du har deaktivert X2Go klientens utskriftsdialog.</translation>
+        <translation type="obsolete">Du har deaktivert X2Go klientens utskriftsdialog.</translation>
     </message>
     <message>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Du kan reaktivere denne dialogen ved å benytte x2goclient innstillingene (Meny -> Innstillinger -> Innstillinger)</translation>
+        <translation type="obsolete">Du kan reaktivere denne dialogen ved å benytte x2goclient innstillingene (Meny -> Innstillinger -> Innstillinger)</translation>
+    </message>
+    <message>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1901,7 +2495,11 @@ authoized_keys file.</source>
     </message>
     <message>
         <source>Printing error</source>
-        <translation>Utskriftsfeil</translation>
+        <translation type="obsolete">Utskriftsfeil</translation>
+    </message>
+    <message>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1962,7 +2560,11 @@ authoized_keys file.</source>
     </message>
     <message>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Vennligst sett opp innstillingene for utskrift på klientsiden.<br><br>Om du ønsker å skrive ut den opprettede filen så trengs en ekstern applikasjon. Typisk kan du benytte<a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; og <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Du kan finne ytterlig informasjon <a href="http://www.x2go.org/index.php?id=49"& [...]
+        <translation type="obsolete">Vennligst sett opp innstillingene for utskrift på klientsiden.<br><br>Om du ønsker å skrive ut den opprettede filen så trengs en ekstern applikasjon. Typisk kan du benytte<a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; og <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Du kan finne ytterlig informasjon <a href="http://www.x2go.org/index. [...]
+    </message>
+    <message>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2036,16 +2638,55 @@ Eksempel:
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Ingen respons mottatt fra serveren. Ønsker du å avslutte gjeldende sesjon?</translation>
     </message>
+    <message>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
         <source>Session preferences...</source>
-        <translation>Sesjonsinnstillinger...</translation>
+        <translation type="obsolete">Sesjonsinnstillinger...</translation>
     </message>
     <message>
         <source>Create session icon on desktop...</source>
-        <translation>Opprett sesjonsikon på skrivebordet...</translation>
+        <translation type="obsolete">Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
         <source>Delete session</source>
@@ -2123,6 +2764,14 @@ Eksempel:
         <source>Disabled</source>
         <translation>Deaktivert</translation>
     </message>
+    <message>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionExplorer</name>
@@ -2132,13 +2781,13 @@ Eksempel:
     </message>
     <message>
         <source>Create session icon on desktop</source>
-        <translation>Opprett sesjonsikon på skrivebordet</translation>
+        <translation type="obsolete">Opprett sesjonsikon på skrivebordet</translation>
     </message>
     <message>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Skrivebordsikoner kan konfigureres til å ikke vise x2goklient (skjult modus). Om du ønsker å benytte denne muligheten må du konfigurere pålogging ved bruk av en GPG-nøkkel, eller et GPG basert smartkort.
+        <translation type="obsolete">Skrivebordsikoner kan konfigureres til å ikke vise x2goklient (skjult modus). Om du ønsker å benytte denne muligheten må du konfigurere pålogging ved bruk av en GPG-nøkkel, eller et GPG basert smartkort.
 
 Ønsker du å aktivere skjult modus for x2goklient?</translation>
     </message>
@@ -2158,6 +2807,16 @@ Use x2goclient hidden mode?</source>
         <source>Are you sure you want to delete this session?</source>
         <translation>Er du sikker på at du ønsker å fjerne denne sesjonen?</translation>
     </message>
+    <message>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionManageDialog</name>
@@ -2179,7 +2838,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Opprett sesjonsikon på skrivebordet...</translation>
+        <translation type="obsolete">&Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -2190,6 +2849,10 @@ Use x2goclient hidden mode?</source>
         <source>Session management</source>
         <translation>Sesjonshåndtering</translation>
     </message>
+    <message>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionWidget</name>
@@ -2223,7 +2886,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Forsøk automatisk pålogging (SSH agent, eller standard SSH nøkkel)</translation>
+        <translation type="obsolete">Forsøk automatisk pålogging (SSH agent, eller standard SSH nøkkel)</translation>
     </message>
     <message>
         <source>Kerberos 5 (GSSAPI) authentication</source>
@@ -2263,7 +2926,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>ssh-agent or default ssh key</source>
-        <translation>SSH-agent, eller standard SSH nøkkel</translation>
+        <translation type="obsolete">SSH-agent, eller standard SSH nøkkel</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -2283,7 +2946,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>Connect to Windows terminal server</source>
-        <translation>Koble til Windows terminal server</translation>
+        <translation type="obsolete">Koble til Windows terminal server</translation>
     </message>
     <message>
         <source>XDMCP</source>
@@ -2319,7 +2982,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>Direct RDP Connection</source>
-        <translation>Direktekobling med RDP</translation>
+        <translation type="obsolete">Direktekobling med RDP</translation>
     </message>
     <message>
         <source>RDP port:</source>
@@ -2347,7 +3010,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation>
+        <translation type="obsolete">x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation>
     </message>
     <message>
         <source>Server:</source>
@@ -2369,6 +3032,26 @@ Use x2goclient hidden mode?</source>
         <source>Path:</source>
         <translation>Sti:</translation>
     </message>
+    <message>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2386,7 +3069,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>Auto detect keyboard settings</source>
-        <translation>Oppdag automatisk tastaturopplegget</translation>
+        <translation type="obsolete">Oppdag automatisk tastaturopplegget</translation>
     </message>
     <message>
         <source>Do not configure keyboard</source>
@@ -2410,7 +3093,7 @@ Use x2goclient hidden mode?</source>
     </message>
     <message>
         <source>RDP Client</source>
-        <translation>RDP klient</translation>
+        <translation type="obsolete">RDP klient</translation>
     </message>
     <message>
         <source>Fullscreen</source>
@@ -2520,7 +3203,7 @@ lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>&Clipboard Mode</source>
-        <translation>&Clipboard Modus</translation>
+        <translation type="obsolete">&Clipboard Modus</translation>
     </message>
     <message>
         <source>Bidirectional copy and paste</source>
@@ -2538,6 +3221,18 @@ lydsystem forbindelser gjennom brannmurer</translation>
         <source>Disable clipboard completely</source>
         <translation>Skru av utklippstavla</translation>
     </message>
+    <message>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShareWidget</name>
@@ -2579,7 +3274,7 @@ lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Benytt SSH port videresendring for å tunnelere lydsystem forbindelser gjennom brannmurer</translation>
+        <translation type="obsolete">Benytt SSH port videresendring for å tunnelere lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>Select folder</source>
@@ -2591,7 +3286,7 @@ lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation>
+        <translation type="obsolete">x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation>
     </message>
     <message>
         <source>WINDOWS-1252</source>
@@ -2601,12 +3296,20 @@ lydsystem forbindelser gjennom brannmurer</translation>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
+    <message>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <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>
 </context>
 <context>
     <name>SshMasterConnection</name>
     <message>
         <source>SSH proxy connection error</source>
-        <translation>SSH proxy tilkoblingsfeil</translation>
+        <translation type="obsolete">SSH proxy tilkoblingsfeil</translation>
     </message>
     <message>
         <source>SSH proxy connection error: </source>
@@ -2614,27 +3317,27 @@ lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>Klarte ikke å opprette SSH proxy tunnel</translation>
+        <translation type="obsolete">Klarte ikke å opprette SSH proxy tunnel</translation>
     </message>
     <message>
         <source>Can not initialize libssh</source>
-        <translation>Klarer ikke å initiere libssh</translation>
+        <translation type="obsolete">Klarer ikke å initiere libssh</translation>
     </message>
     <message>
         <source>Can not create ssh session</source>
-        <translation>Klarer ikke å opprette ssh sesjon</translation>
+        <translation type="obsolete">Klarer ikke å opprette ssh sesjon</translation>
     </message>
     <message>
         <source>Can not connect to proxy server</source>
-        <translation>Klarte ikke å koble til proxyserver</translation>
+        <translation type="obsolete">Klarte ikke å koble til proxyserver</translation>
     </message>
     <message>
         <source>Can not connect to </source>
-        <translation>Klarer ikke å koble til </translation>
+        <translation type="obsolete">Klarer ikke å koble til </translation>
     </message>
     <message>
         <source>Authentication failed</source>
-        <translation>Autentisering feilet</translation>
+        <translation type="obsolete">Autentisering feilet</translation>
     </message>
     <message>
         <source>channel_forward_listen failed</source>
@@ -2642,23 +3345,23 @@ lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation>Klarte ikke å starte SSH-klient. Sjekk ditt oppsett og din GSSApi innstillinger</translation>
+        <translation type="obsolete">Klarte ikke å starte SSH-klient. Sjekk ditt oppsett og din GSSApi innstillinger</translation>
     </message>
     <message>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>Sjekk ditt GSSApi oppsett, eller velg en annen autentiserings metode</translation>
+        <translation type="obsolete">Sjekk ditt GSSApi oppsett, eller velg en annen autentiserings metode</translation>
     </message>
     <message>
         <source>Can not open file </source>
-        <translation>Kan ikke åpne filen </translation>
+        <translation type="obsolete">Kan ikke åpne filen </translation>
     </message>
     <message>
         <source>Can not create remote file </source>
-        <translation>Klarer ikke å opprette fil over nettverket </translation>
+        <translation type="obsolete">Klarer ikke å opprette fil over nettverket </translation>
     </message>
     <message>
         <source>Can not write to remote file </source>
-        <translation>Klarer ikke å skrive til filen over nettverket </translation>
+        <translation type="obsolete">Klarer ikke å skrive til filen over nettverket </translation>
     </message>
     <message>
         <source>Cannot connect to </source>
@@ -2666,11 +3369,11 @@ lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward feilet</translation>
+        <translation type="obsolete">channel_open_forward feilet</translation>
     </message>
     <message>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session feilet</translation>
+        <translation type="obsolete">channel_open_session feilet</translation>
     </message>
     <message>
         <source>channel_request_exec failed</source>
@@ -2678,31 +3381,103 @@ lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <source>error writing to socket</source>
-        <translation>feil ved skriving til sokkelen</translation>
+        <translation type="obsolete">feil ved skriving til sokkelen</translation>
     </message>
     <message>
         <source>error reading channel</source>
-        <translation>feil under lesing av kanalen</translation>
+        <translation type="obsolete">feil under lesing av kanalen</translation>
     </message>
     <message>
         <source>channel_write failed</source>
-        <translation>channel_write feilet</translation>
+        <translation type="obsolete">channel_write feilet</translation>
     </message>
     <message>
         <source>error reading tcp socket</source>
-        <translation>feil ved lesing av tcp sokkelen</translation>
+        <translation type="obsolete">feil ved lesing av tcp sokkelen</translation>
+    </message>
+    <message>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
         <source>Error creating socket</source>
-        <translation>feil under opprettelse av sokkelen</translation>
+        <translation type="obsolete">feil under opprettelse av sokkelen</translation>
     </message>
     <message>
         <source>Error binding </source>
         <translation>Feil ved binding </translation>
     </message>
+    <message>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>XSettingsWidget</name>
@@ -2769,5 +3544,9 @@ lydsystem forbindelser gjennom brannmurer</translation>
         <source>single application:</source>
         <translation>enkeltapplikasjon:</translation>
     </message>
+    <message>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_nl.ts b/res/i18n/x2goclient_nl.ts
index b93db85..c4d8abd 100644
--- a/res/i18n/x2goclient_nl.ts
+++ b/res/i18n/x2goclient_nl.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Gepubliceerde applicaties</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Zoeken:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Start</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Sluiten</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Ontwikkeling</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Educatie</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Games</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Grafisch</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Gereedschap</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Overig</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Dialoog</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Oud wachtwoord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Nieuw wachtwoord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Wachtwoord bevestigen:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>Tekstlabel</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Wachtwoorden komen niet overeen</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Eigenschappen</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Opdrachten accepteren:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Opmerking:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Idle</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Printen</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Geannuleerd</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
@@ -186,68 +186,80 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Geen optie geselecteerd</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Deze waarde geeft een conflict met een andere optie</translation>
+        <translation type="obsolete">Deze waarde geeft een conflict met een andere optie</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Opties zijn tegenstrijdig</translation>
+        <translation type="obsolete">Opties zijn tegenstrijdig</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Testen van verbinding</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS connectie:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH connectie:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Verbindingssnelheid:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Mislukt</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
-        <translation>Time out opgetreden bij verbinden socket</translation>
+        <translation type="obsolete">Time out opgetreden bij verbinden socket</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Mislukt:</translation>
     </message>
@@ -255,163 +267,220 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Icoon in taakbalk weergeven</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>In taakbalk weergeven indien geminimaliseerd</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>In taakbalk weergeven indien gesloten</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <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="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Vanaf taakbalk herstellen nadat sessie is verbroken</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>Gebruik LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BasisDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Failover server 1 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Failover server 2 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>X-server instellingen</translation>
+        <translation type="obsolete">X-server instellingen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11 applicatie:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11 versie:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>X11 applicatie zoeken</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Client SSH poort voor exporteren besstandssysteem:</translation>
+        <translation type="obsolete">Client SSH poort voor exporteren besstandssysteem:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Sessie starten ingesloten binnen website</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Uitgebreide opties</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Standaard</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>&Annuleren</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Printen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Waarschuwing</translation>
+        <translation type="obsolete">Waarschuwing</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient kan geen geschikte X11 applicatie vinden. Installeer aub Apple X11 of selecteer het pad naar de applicatie</translation>
+        <translation type="obsolete">x2goclient kan geen geschikte X11 applicatie vinden. Installeer aub Apple X11 of selecteer het pad naar de applicatie</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>U gebruikt de X11 (Apple X-Window Server) versie </translation>
+        <translation type="obsolete">U gebruikt de X11 (Apple X-Window Server) versie </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Deze versie veroorzaakt problemen met X-applicaties in 24bit kleurenmodus. U moet uw X11 omgeving updaten
+        <translation type="obsolete">. Deze versie veroorzaakt problemen met X-applicaties in 24bit kleurenmodus. U moet uw X11 omgeving updaten
 (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Geen geschikte X11 applicatie gevonden in geselecteerde pad</translation>
+        <translation type="obsolete">Geen geschikte X11 applicatie gevonden in geselecteerde pad</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Verbinding</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation type="unfinished">&Input/Output</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation type="unfinished">&Multimedia</translation>
     </message>
@@ -423,32 +492,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Verbindingssnelheid</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Verbindingssnelheid:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>C&ompressie</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Methode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Compressiemethode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Afbeeldingskwaliteit:</translation>
     </message>
@@ -456,72 +525,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Dialoog</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Pagina afmeting:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Papier soort:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Papier bron:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Duplex printen</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Lange zijde</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Korte zijde</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Driver instellingen</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Optie</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Waarde</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Geen optie geselecteerd</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>tekst</translation>
     </message>
@@ -529,47 +598,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Sessie</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Verbinding</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation>&Input/Output</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation>&Multimedia</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&Gedeelde mappen</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>&Annuleren</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Standaarden</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Sessie voorkeuren</translation>
     </message>
@@ -577,38 +646,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>&Annuleren</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&delen</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Voorkeuren...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Aangepaste map...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Delete</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>gedeelde mappen</translation>
+        <translation type="obsolete">gedeelde mappen</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Selecteer map</translation>
     </message>
@@ -616,7 +689,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation>Sessies map</translation>
     </message>
@@ -624,72 +697,88 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Mappen</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation>Nieuwe map aanmaken</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
-        <translation>Map hernoemen...</translation>
+        <translation type="obsolete">Map hernoemen...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
-        <translation>Icoon wijzigen...</translation>
+        <translation type="obsolete">Icoon wijzigen...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
-        <translation>Map verwijderen...</translation>
+        <translation type="obsolete">Map verwijderen...</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Afbeeldingen</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>X2Go client</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation>Map naam:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation>Verwijderen niet mogelijk</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>". Deze map is niet leeg. Aub eerst de inhoud van deze map verwijderen en daarna opnieuw proberen.</translation>
+        <translation type="obsolete">". Deze map is niet leeg. Aub eerst de inhoud van deze map verwijderen en daarna opnieuw proberen.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation>Map verwijderen "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Nieuwe map</translation>
     </message>
@@ -697,7 +786,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
@@ -705,170 +794,198 @@
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host sleutel van server aangepast.
 Het is nu:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Vanwege veiligheidsredenen zal deze verbinding verbroken worden</translation>
+        <translation type="obsolete">Vanwege veiligheidsredenen zal deze verbinding verbroken worden</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>De host sleutel voor deze server is niet gevonden maar een ander type sleutel is aanwezig. Een aanvaller heeft mogelijk de standaard
+        <translation type="obsolete">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="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host 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>
+        <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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <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?
 Publieke sleutel hash:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Verificatie van host sleutel mislukt</translation>
+        <translation type="obsolete">Verificatie van host sleutel mislukt</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Verificatiecode:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Ingeven wachtwoordzin om een sleutel te decoderen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Authenticatie mislukt</translation>
+        <translation type="obsolete">Authenticatie mislukt</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Inloggen mislukt!<br>Opnieuw proberen aub</translation>
+        <translation type="obsolete">Inloggen mislukt!<br>Opnieuw proberen aub</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Veilige verbinding mislukt</translation>
+        <translation type="obsolete">Veilige verbinding mislukt</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Uitgegeven aan:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organisatie(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisatie eenheid(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Serienummer	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Uitgegeven door:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Geldigheid:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Uitgegeven op	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>Verloopt op	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Vingerafdruk:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>Afsluiten X2Go Client</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Uitzondering toevoegen</translation>
     </message>
@@ -876,44 +993,44 @@ Publieke sleutel hash:</translation>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Geluid</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Geluidsondersteuning inschakelen</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Start geluids daemon</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>Gebruik actieve geluids daemon</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Gebruik SSH poort forwarding voor het tunnelen van geluidssysteemverbindingen door firewalls</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Gebruik standaard geluidspoort</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Geluidspoort:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Printer ondersteuning aan de zijde van client</translation>
     </message>
@@ -921,404 +1038,763 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>X2goclient wordt gestart...</translation>
+        <translation type="obsolete">X2goclient wordt gestart...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>us</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>X2Go Client</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>verbinden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Internetbrowser</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>Email client</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>x2goclient wordt gestart in portable modus... data directory is:</translation>
+        <translation type="obsolete">x2goclient wordt gestart in portable modus... data directory is:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Instellingen ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Ondersteuning...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>Over X2Go client</translation>
+        <translation type="obsolete">Over X2Go client</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>Gestart  x2goclient.</translation>
+        <translation type="obsolete">Gestart  x2goclient.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation>Kan vertaler niet laden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Vertaler:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation> geïnstalleerd.</translation>
+        <translation type="obsolete"> geïnstalleerd.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Gedeelde map...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Applicaties...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Onderbreken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Beëindigen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Opnieuw verbinden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>X2Go scherm losmaken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Taakbalk minimaliseren</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Sessie:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Afsluiten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Nieuwe sessie ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Sessiebeheer...</translation>
+        <translation type="obsolete">Sessiebeheer...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Sessie icoon aanmaken op bureaublad ...</translation>
+        <translation type="obsolete">&Sessie icoon aanmaken op bureaublad ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Wachtwoord voor broker invoeren ...</translation>
+        <translation type="obsolete">&Wachtwoord voor broker invoeren ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&Verbindingstest ...</translation>
+        <translation type="obsolete">&Verbindingstest ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Taakbalk tonen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Over Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
         <translatorcomment>afsluiten</translatorcomment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Sessie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Opties</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Help</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Inloggen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Bewerking mislukt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Wachtwoord veranderd</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Verkeerd wachtwoord!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Verbinden met broker</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Authenticatie</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Herstellen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>Niet verbonden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Ontwikkeling</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Educatie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Games</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Grafisch</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Netwerk</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Gereedschap</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Overige</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Linker muisknop voor verbergen/herstellen - Rechter muisknop om menu te tonen</translation>
+        <translation type="obsolete">Linker muisknop voor verbergen/herstellen - Rechter muisknop om menu te tonen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
         <source>Closing x2goclient...</source>
-        <translation>X2goclient sluiten...</translation>
+        <translation type="obsolete">X2goclient sluiten...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
         <source>Closed  x2goclient.</source>
-        <translation>x2g0client afgesloten.</translation>
+        <translation type="obsolete">x2g0client afgesloten.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Controleer aub LDAP instellingen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>geen X2Go server gevonden in LDAP</translation>
+        <translation type="obsolete">geen X2Go server gevonden in LDAP</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1345,7 +1821,7 @@ X2goclient in verborgen modus gebruiken?</translation>
         <translation type="obsolete">X2Go link naar sessie </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Geen X2go sessies gevonden, afsluiten.</translation>
     </message>
@@ -1354,546 +1830,717 @@ X2goclient in verborgen modus gebruiken?</translation>
         <translation type="obsolete">Weet u zeker dat u deze sessie wilt verwijderen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP connectie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Connectie naar lokale desktop</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> aan </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation>Verbinden met server gestart: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation>.naar </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Verbindingsfout(</translation>
+        <translation type="obsolete">Verbindingsfout(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
         <source>Couldn't find a SSH connection.</source>
-        <translation>Kon geen SSH verbinding vinden.</translation>
+        <translation type="obsolete">Kon geen SSH verbinding vinden.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Verificatie code:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Wachtwoordzin ingeven om sleutel te decoderen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Host sleutel voor de server is gewijzigd.
 Het is nu: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Dit kan een indicatie zijn voor een " man in the middle" aanval.
+        <translation type="obsolete">Dit kan een indicatie zijn voor een " man in the middle" aanval.
 Iemand is u mogelijk aan het afluisteren.
 Vanwege veiligheidsoverwegingen is het aanbevolen de verbinding te verbreken.
 Wilt u de verbinding verbreken?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Verificatie van host sleutel mislukt</translation>
+        <translation type="obsolete">Verificatie van host sleutel mislukt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 Wilt u de nieuwe host sleutel updaten? </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>De host sleutel voor deze server is niet gevonden maar een ander type sleutel is aanwezig. Een aanvaller heeft mogelijk de standaard
+        <translation type="obsolete">De host sleutel voor deze server is niet gevonden maar een ander type sleutel is aanwezig. Een aanvaller heeft mogelijk de standaard
 server sleutel aangepast en wil uw client misleiden door deze te laten geloven dat de sleutel niet bestaat. 
 Vanwege veiligheidsoverwegingen is het aanbevolen om de verbinding te stoppen.
 Wilt u de verbinding verbreken?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host 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>
+        <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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <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="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Authenticatie mislukt: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Authenticatie mislukt</translation>
+        <translation type="obsolete">Authenticatie mislukt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Wachtwoord ingeven voor SSH proxy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Verbinding mislukt</b>
+        <translation type="obsolete"><b>Verbinding mislukt</b>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Verkeerd wachtwoord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Verbinding mislukt: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation> - Verkeerd wachtwoord.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>Geen server beschikbaar</translation>
+        <translation type="obsolete">Geen server beschikbaar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>Server niet beschikbaar</translation>
+        <translation type="obsolete">Server niet beschikbaar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Selecteer sessie:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>actief</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>onderbroken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Bureaublad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>enkele applicatie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>schaduw sessie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Geen toegankelijk bureaublad gevonden</translation>
+        <translation type="obsolete">Geen toegankelijk bureaublad gevonden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Selecteer bureaubladomgeving:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Uw huidige kleurdiepte verschilt van de kleurdiepte van uw x2go sessie. Dit kan problemen veroorzaken bij het opnieuw verbinden met deze sessie. In de meeste gevallen <b>zult u deze sessie dan ook verliezen</b> en moet u een nieuwe starten! Het is ten zeerste aanbevolen om de kleurdiepte van uw scherm aan te passen naar </translation>
+        <translation type="obsolete">Uw huidige kleurdiepte verschilt van de kleurdiepte van uw x2go sessie. Dit kan problemen veroorzaken bij het opnieuw verbinden met deze sessie. In de meeste gevallen <b>zult u deze sessie dan ook verliezen</b> en moet u een nieuwe starten! Het is ten zeerste aanbevolen om de kleurdiepte van uw scherm aan te passen naar </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 of 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation>bit en uw X-server te herstarten voordat u opnieuw verbinding maakt met deze x2go sessie.<br>Deze sessie toch hervatten?</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="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>onderbreken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>afsluiten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Verkeerd wachtwoord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Nieuwe sessie gestart</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Sessie hervat</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Aanmaken map niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Aanmaken bestand niet mogelijk: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>X2go scherm vastmaken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>Opzetten SSL tunnel niet mogelijk:</translation>
+        <translation type="obsolete">Opzetten SSL tunnel niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>Opzetten SSL tunnel niet mogelijk:</translation>
+        <translation type="obsolete">Opzetten SSL tunnel niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translatorcomment>?</translatorcomment>
         <translation>Afsluiten bij noodgeval.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Wachten op afsluiten van proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Mislukt, proxy wordt afgebroken.</translation>
+        <translation type="obsolete">Mislukt, proxy wordt afgebroken.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>starten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>hervatten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Timeout bij verbinding, afbreken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>afbreken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <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?
+        <translation type="obsolete">Weet u zeker dat u deze sessie wilt beëindigen?
 Niet opgeslagen documenten zullen verloren gaan</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Sessie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Beeldscherm</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Aanmaaktijd</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Verbinden mislukt</b>
+        <translation type="obsolete"><b>Verbinden mislukt</b>
 :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (kan bestand niet openen)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation>.(bestand bestaat niet)</translation>
+        <translation type="obsolete">.(bestand bestaat niet)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation>. (directory bestaat niet)</translation>
+        <translation type="obsolete">. (directory bestaat niet)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>verkeerde waarde voor argument"--link"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--link"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>verkeerde waarde voor argument"--klembord"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--klembord"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>verkeerde waarde voor argument"--geluid"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--geluid"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>verkeerde waarde voor argument"geometrie"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"geometrie"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>verkeerde waarde voor argument"--set-kbd"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--set-kbd"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>verkeerde waarde voor argument"--ldap"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--ldap"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>verkeerde waarde voor argument"--ldap1"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>verkeerde waarde voor argument"--ldap2"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--ldap2"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>verkeerde waarde voor argument"--pack"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"--pack"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Verkeerde parameter: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Beschikbare pack methoden:</translation>
+        <translation type="obsolete">Beschikbare pack methoden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
         <translatorcomment>?</translatorcomment>
-        <translation>Pack methoden</translation>
+        <translation type="obsolete">Pack methoden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>Optie is niet beschikbaar in deze uitgave</translation>
+        <translation type="obsolete">Optie is niet beschikbaar in deze uitgave</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Logboek met wijzigingen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Git info</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>SSH fout</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -1903,7 +2550,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH daemon kon niet gestart worden.
+        <translation type="obsolete">SSH daemon kon niet gestart worden.
 
 U bent de SSH daemon nodig voor printen en delen van bestanden.
 
@@ -1913,273 +2560,251 @@ bij de X2Go client voor Windows een eigen sshd.exe.ingesloten is.
 Als u dit bericht krijgt, geef dan aub deze fout door via de X2go bugtracker.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>SSH daemon is niet actief.
+        <translation type="obsolete">SSH daemon is niet actief.
 
 U bent de SSH daemon nodig voor printen en delen van bestanden
 
 Vraag aub uw systeembeheerder om uw computer te voorzien van de SSH service.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>SSH daemon kon de publieke sleutel van de applicatie niet openen.</translation>
+        <translation type="obsolete">SSH daemon kon de publieke sleutel van de applicatie niet openen.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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
 voor printen en het delen van mappen niet openen.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>Openen van de geautoriseerde sleutel van de applicatie door de SSH daemon mislukt.</translation>
+        <translation type="obsolete">Openen van de geautoriseerde sleutel van de applicatie door de SSH daemon mislukt.</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="obsolete">Opties</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Aanmaken map niet mogelijk:</translation>
+        <translation type="obsolete">Aanmaken map niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA bestand leeg.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Kan sleutel niet openen: </translation>
+        <translation type="obsolete">Kan sleutel niet openen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Ondersteuning</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="obsolete"><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <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.). B [...]
+        <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 k [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Go Client V. </translation>
+        <translation type="obsolete"><b>X2Go Client V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Controleer aub de LDAP instellingen</translation>
+        <translation type="obsolete">Controleer aub de LDAP instellingen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>Geen geldige kaart gevonden</translation>
+        <translation type="obsolete">Geen geldige kaart gevonden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Kaart is niet geconfigureerd.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>Deze kaart is onbekend binnen het X2Go systeem</translation>
+        <translation type="obsolete">Deze kaart is onbekend binnen het X2Go systeem</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Bestand aanmaken niet mogelijk: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
-        <translation>Verbinden met X server niet mogelijk
+        <translation type="obsolete">Verbinden met X server niet mogelijk
 Controleer aub uw instellingen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>Kan X server niet starten
+        <translation type="obsolete">Kan X server niet starten
 Controleer aub uw instellingen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>Kan X server niet starten
+        <translation type="obsolete">Kan X server niet starten
 Controleer aub uw installatie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Uitvoeren niet mogelijk: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>De remote server ondersteund exporteren van bestanden door SSH tunnel niet
+        <translation type="obsolete">De remote server ondersteund exporteren van bestanden door SSH tunnel niet
 Aub updaten naar het nieuwste x2goserver sofwarepakket</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Lezen niet mogelijk: </translation>
+        <translation type="obsolete">Lezen niet mogelijk: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Schrijven niet mogelijk:</translation>
+        <translation type="obsolete">Schrijven niet mogelijk:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Fout bij opvragen venster geometrie (venster gesloten)?</translation>
+        <translation type="obsolete">Fout bij opvragen venster geometrie (venster gesloten)?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go sessie</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>verkeerde waarde voor argument"snelheid"</translation>
+        <translation type="obsolete">verkeerde waarde voor argument"snelheid"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Toetsenbordindeling:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Toon details</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Hervatten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Volledige toegang</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Alleen bekijken</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Commando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>Client IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>Sessie ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Alleen mijn desktops</translation>
     </message>
@@ -2192,12 +2817,12 @@ u kunt sshd installeren met
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Taakbalk herstellen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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>
@@ -2205,142 +2830,158 @@ u kunt sshd installeren met
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Printen - X2Go Client
 </translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Print</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>U heeft de x2goclient printer dialoog uitgeschakeld.</translation>
+        <translation type="obsolete">U heeft de x2goclient printer dialoog uitgeschakeld.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>U kunt deze dialoog opnieuw activeren via de x2goclient instellingen dialoog (Menu -> Opties -> Instellingen)</translation>
+        <translation type="obsolete">U kunt deze dialoog opnieuw activeren via de x2goclient instellingen dialoog (Menu -> Opties -> Instellingen)</translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Bestand opslaan</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>PDF Document (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Uitvoeren van commando mislukt:</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Print fout</translation>
+        <translation type="obsolete">Print fout</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Print</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Bekijken als PDF</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Printer instellingen</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Printer:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Printen met gebruik van standaard Windows PDF Viewer
 (Viewer applicatie moet geïnstalleerd zijn)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Printer commando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Viewer instellingen</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Openen in viewer applicatie</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Commando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Opslaan op schijf</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Deze dialoog laten zien voor starten printen</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Configureer aub de printerinstellingen van uw client.<br><br>Als u het aangemaakte bestand wilt printen, bent u een externe applicatie nodig. Daarvoor kunt u <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; en <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>gebruiken. Meer informatie kunt u <a href="http://www.x2go.org/index.php?id=49">hier</a [...]
+        <translation type="obsolete">Configureer aub de printerinstellingen van uw client.<br><br>Als u het aangemaakte bestand wilt printen, bent u een externe applicatie nodig. Daarvoor kunt u <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; en <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>gebruiken. Meer informatie kunt u <a href="http://www.x2go.org/index.php?id=49&quo [...]
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Printer commando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Commando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2351,47 +2992,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Output formaat</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Kies aub het print formaat (met betrekking tot uw print omgeving - als u CUPS gebruikt kunt u PDF gebruiken)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Bestandsstructuur</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Kies aub de methode van afdrukken (een aantal opdrachten aanvaarden afdrukken van bestanden als programma-opties, sommige zijn in afwachting van informatie van de standaard invoer): </translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>standaard invoer (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Specificeer pad als programma parameter</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2400,7 +3041,7 @@ Voorbeeld:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><pad naar gsprint.exe> query -kleur</translation>
     </message>
@@ -2408,135 +3049,186 @@ Voorbeeld:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Geen respons ontvangen van de remote server. Wilt u de huidige sessie beëindigen?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Sessie voorkeuren...</translation>
+        <translation type="obsolete">Sessie voorkeuren...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Sessie icoon aanmaken op bureaublad...</translation>
+        <translation type="obsolete">Sessie icoon aanmaken op bureaublad...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Sessie verwijderen</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Sessie acties</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Selecteer type</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Selecteer resolutie</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Wissel geluidsondersteuning</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Nieuwe sessie</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>actief</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>onderbroken</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP connectie</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Verbinding naar lokaal bureaublad</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Gepubliceerde applicaties</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Scherm</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>venster</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Maximaal</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>Uitgeschakeld</translation>
     </message>
@@ -2544,41 +3236,51 @@ Voorbeeld:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Terug</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Sessie icoon op bureaublad aanmaken</translation>
+        <translation type="obsolete">Sessie icoon op bureaublad aanmaken</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Bureaublad iconen kunnen worden ingesteld zodat de x2goclient niet getoond zal worden (verborgen modus) Als u van deze mogelijkheid gebruik wilt maken moet u wel inloggen met een gpg sleutel of een gpg smartcard configureren.
+        <translation type="obsolete">Bureaublad iconen kunnen worden ingesteld zodat de x2goclient niet getoond zal worden (verborgen modus) Als u van deze mogelijkheid gebruik wilt maken moet u wel inloggen met een gpg sleutel of een gpg smartcard configureren.
 
 X2goclient in verborgen modus gebruiken?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Sessie icoon in taakbalk tonen tijdens gebruik</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Nieuwe sessie</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation>X2Go link naar sessie </translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Weet u zeker dat u deze sessie wilt verwijderen?</translation>
     </message>
@@ -2586,38 +3288,42 @@ X2goclient in verborgen modus gebruiken?</translation>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>A&fsluiten</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Nieuwe sessie</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Sessie voorkeuren</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>&Sessie verwijderen</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Sessie icoon aanmaken op bureaublad...</translation>
+        <translation type="obsolete">&Sessie icoon aanmaken op bureaublad...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Sessiebeheer</translation>
     </message>
@@ -2625,238 +3331,258 @@ X2goclient in verborgen modus gebruiken?</translation>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Sessie naam:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< icoon wijzigen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Pad:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Host:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Inloggen:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH poort:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Gebruik RSA/DSA sleutel voor ssh verbinding:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Probeer automatisch inloggen (ssh-agent of standaard ssh sleutel)</translation>
+        <translation type="obsolete">Probeer automatisch inloggen (ssh-agent of standaard ssh sleutel)</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI) authenticatie</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Verplaatsen van GSSAPI informatie naar de server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Gebruik proxy server voor SSH verbinding</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Proxy server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Hetzelfde inloggen als op X2Go server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Hetzelfde wachtwoord als op X2Go server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>RSA/DSA sleutel:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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>
         <source>ssh-agent or default ssh key</source>
-        <translation>ssh-agent of standaard ssh sleutel</translation>
+        <translation type="obsolete">ssh-agent of standaard ssh sleutel</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Poort:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Sessie type</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Sessie type:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Verbinding maken met Windows terminal server</translation>
+        <translation type="obsolete">Verbinding maken met Windows terminal server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Verbinden met lokale bureaublad</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Aangepast bureaublad</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Enkele applicatie</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Gepubliceerde applicaties</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Commando:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Uitgebreide opties...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Pad naar exe bestand</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Directe RDP verbinding</translation>
+        <translation type="obsolete">Directe RDP verbinding</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Open sleutel bestand</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient 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
+        <translation type="obsolete">x2goclient 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="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RDP poort:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Afbeeldingen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop commandoregel opties:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Nieuwe sessie</translation>
     </message>
@@ -2864,14 +3590,14 @@ maar bent</translation>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Beeldscherm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Toetsenbord</translation>
     </message>
@@ -2880,112 +3606,125 @@ maar bent</translation>
         <translation type="obsolete">Geluid</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>&Klembord modus</translation>
+        <translation type="obsolete">&Klembord modus</translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Volledig scherm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Aangepast</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Venster</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Gebruik volledig beeldscherm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Maximaal beschikbare</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Instellen DPI van beeldscherm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama extentie (ondersteuning voor twee of meer fysieke beeldschermen)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Breedte:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Hoogte:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Beeldscherm:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Identificeer alle beeldschermen</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>Bidirectioneel copy and past</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Copy and past van client naar server</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Copy and past van server naar client</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Klembord volledig uitschakelen</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Auto detect keyboard settings</source>
-        <translation>Automatische toetsenbordinstelling</translation>
+        <translation type="obsolete">Automatische toetsenbordinstelling</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Toetsenbord niet configureren</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Toetsenbord configureren</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Model: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Indeling: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Variant: </translation>
     </message>
@@ -3019,27 +3758,27 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Printer ondersteuning aan de zijde van client</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>RDP Client</translation>
+        <translation type="obsolete">RDP Client</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Extra parameters:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Commandoregel:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>us</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>wachtwoord</translation>
     </message>
@@ -3047,80 +3786,88 @@ sound system connections through firewalls</source>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Mappen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Pad</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Automatisch aankoppelen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Pad:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Bestandsnaam codering</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>Lokaal:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>remote:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Gebruik ssh poort forwarding voor het tunnelen van bestandsuitwisseling door firewalls</translation>
+        <translation type="obsolete">Gebruik ssh poort forwarding voor het tunnelen van bestandsuitwisseling door firewalls</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Selecteer map</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient is actief in portable modus. U moet een pad op uw usb device gebruiken om altijd toegang tot uw data te krijgen, waar u ook maar bent</translation>
+        <translation type="obsolete">x2goclient is actief in portable modus. U moet een pad op uw usb device gebruiken om altijd toegang tot uw data te krijgen, waar u ook maar bent</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3128,126 +3875,198 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>kan niet verbinden met</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>SSH proxy connection error</source>
-        <translation>SSH proxy verbindingsfout</translation>
+        <translation type="obsolete">SSH proxy verbindingsfout</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>SSH proxy verbindingsfout:</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>Opzetten SSH proxy tunnel mislukt</translation>
+        <translation type="obsolete">Opzetten SSH proxy tunnel mislukt</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>Kan libssh niet initialiseren</translation>
+        <translation type="obsolete">Kan libssh niet initialiseren</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>Kan geen ssh sessie opzetten</translation>
+        <translation type="obsolete">Kan geen ssh sessie opzetten</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>Kan niet verbinden met proxy server</translation>
+        <translation type="obsolete">Kan niet verbinden met proxy server</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>Kan niet verbinden met </translation>
+        <translation type="obsolete">Kan niet verbinden met </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Authenticatie mislukt</translation>
+        <translation type="obsolete">Authenticatie mislukt</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <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>
+        <translation type="obsolete">Starten van SSH client mislukt. Controleer aub uw installatie en GSSApi configuratie</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>Controleer uw GSSApi configuratie of kies een andere authenticatie methode</translation>
+        <translation type="obsolete">Controleer uw GSSApi configuratie of kies een andere authenticatie methode</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>Kan bestand niet openen </translation>
+        <translation type="obsolete">Kan bestand niet openen </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>Remote bestand aanmaken niet mogelijk </translation>
+        <translation type="obsolete">Remote bestand aanmaken niet mogelijk </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>Kan niet naar remote bestand schrijven</translation>
+        <translation type="obsolete">Kan niet naar remote bestand schrijven</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
         <translatorcomment>?</translatorcomment>
-        <translation>forwarden_open_kanaal mislukt</translation>
+        <translation type="obsolete">forwarden_open_kanaal mislukt</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
         <translatorcomment>?</translatorcomment>
-        <translation>sessie_open_kanaal mislukt</translation>
+        <translation type="obsolete">sessie_open_kanaal mislukt</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translatorcomment>?</translatorcomment>
         <translation>exec_kanaal_verzoek mislukt</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>fout bij schrijven naar socket</translation>
+        <translation type="obsolete">fout bij schrijven naar socket</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>fout bij lezen van kanaal</translation>
+        <translation type="obsolete">fout bij lezen van kanaal</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
         <translatorcomment>?</translatorcomment>
-        <translation>schrijven_kanaal mislukt</translation>
+        <translation type="obsolete">schrijven_kanaal mislukt</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>fout bij lezen tcp socket</translation>
+        <translation type="obsolete">fout bij lezen tcp socket</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Fout bij aanmaken socket</translation>
+        <translation type="obsolete">Fout bij aanmaken socket</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Fout bij binding</translation>
     </message>
@@ -3255,12 +4074,12 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Uitvoerbaar (*.exe)</translation>
     </message>
@@ -3268,69 +4087,74 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>U moet de X2Go client herstarten om de wijzigingen door te voeren </translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>gebruik geïntegreerde X server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation>Primaire klembord niet gebruiken</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>gebruik aangepaste X-server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>aangepaste X-server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>uitvoerbaar:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>start X-server op X2Go client start</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>commandoregel opties:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>X-server commandoregel opties</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>venster modus:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>modus volledig scherm:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>enkele applicatie:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_pt.ts b/res/i18n/x2goclient_pt.ts
index 82ebd30..70d6a8b 100644
--- a/res/i18n/x2goclient_pt.ts
+++ b/res/i18n/x2goclient_pt.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation type="unfinished"></translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
@@ -186,68 +186,68 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
-        <source>This value is in conflict with other option</source>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
-        <source>Options conflict</source>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
-        <source>Socket operation timed out</source>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -255,162 +255,191 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <source>Hide to system tray after connection is established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
-        <source>X-Server settings</source>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
-        <source>X11 application:</source>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
-        <source>X11 version:</source>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
-        <source>Find X11 application</source>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
-        <source>Clientside SSH port for file system export usage:</source>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
-        <source>Start session embedded inside website</source>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
-        <source>Advanced options</source>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
-        <source>Defaults</source>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
-        <source>&OK</source>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
-        <source>&Cancel</source>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
-        <source>Settings</source>
+        <location filename="../../src/configdialog.cpp" line="216"/>
+        <source>X11 application:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
-        <source>Printing</source>
+        <location filename="../../src/configdialog.cpp" line="227"/>
+        <source>X11 version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
-        <source>Warning</source>
+        <location filename="../../src/configdialog.cpp" line="242"/>
+        <source>Find X11 application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="269"/>
+        <source>Start session embedded inside website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
+        <source>Advanced options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="303"/>
+        <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
-        <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
+        <location filename="../../src/configdialog.cpp" line="304"/>
+        <source>&OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
-        <source>Your are using X11 (Apple X-Window Server) version </source>
+        <location filename="../../src/configdialog.cpp" line="305"/>
+        <source>&Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
-        <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
+        <location filename="../../src/configdialog.cpp" line="328"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
-        <source>No suitable X11 application found in selected path</source>
+        <location filename="../../src/configdialog.cpp" line="348"/>
+        <source>Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
@@ -418,32 +447,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -451,72 +480,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation type="unfinished"></translation>
     </message>
@@ -524,53 +553,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
-        <source>&Session</source>
-        <oldsource>&Settings</oldsource>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation type="unfinished"></translation>
     </message>
@@ -578,38 +601,38 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
-        <source>share folders</source>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -617,7 +640,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -625,72 +648,72 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
-        <source>Rename Folder...</source>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
-        <source>Change Icon...</source>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
-        <source>Delete Folder...</source>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
-        <source>". Folder is not empty. Please remove content of folder and try again.</source>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -698,7 +721,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -706,167 +729,167 @@
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
-        <source>For security reasons, connection will be stopped</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
+        <source>The server is unknown. Do you trust the host key?
+Public key hash: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
-        <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
-        <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="173"/>
-        <source>The server is unknown. Do you trust the host key?
-Public key hash: </source>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
+        <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
-        <source>Host key verification failed</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
+        <source>Enter passphrase to decrypt a key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <source>Yes</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <source>No</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
+        <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
-        <source>Verification code:</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
+        <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="httpbrokerclient.cpp" line="207"/>
-        <source>Enter passphrase to decrypt a key</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
-        <source>Authentication failed</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
-        <source>Error</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="170"/>
+        <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="httpbrokerclient.cpp" line="398"/>
-        <source>Login failed!<br>Please try again</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
-        <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="583"/>
-        <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>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
-        <source>Secure connection failed</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation type="unfinished"></translation>
     </message>
@@ -874,44 +897,44 @@ Public key hash: </source>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation type="unfinished"></translation>
     </message>
@@ -919,1211 +942,1417 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
-        <source>Starting x2goclient...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
-        <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
-        <source>About X2GO client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="489"/>
-        <source>Started  x2goclient.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
-        <source> installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
-        <source>Session management...</source>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
+        <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
-        <source>Ctrl+E</source>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
+        <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
-        <source>&Create session icon on desktop...</source>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
+        <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
-        <source>&Set broker password...</source>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
-        <source>&Connectivity test...</source>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
-        <source>Show toolbar</source>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
-        <source>About Qt</source>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
-        <source>Ctrl+Q</source>
-        <comment>exit</comment>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
-        <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
-        <source>Closing x2goclient...</source>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="onmainwindow.cpp" line="1456"/>
-        <source>Closed  x2goclient.</source>
+        <location filename="../../src/onmainwindow.cpp" line="1404"/>
+        <source>Closing X2Go Client ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
-        <source>Please check LDAP settings</source>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
-        <source>no X2Go server found in LDAP </source>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
-        <source>No X2Go sessions found, closing.</source>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
-        <source>KDE</source>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
-        <source>RDP connection</source>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
-        <source>XDMCP</source>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
-        <source>Connection to local desktop</source>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
-        <source> on </source>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
-        <source>Starting connection to server: </source>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="onmainwindow.cpp" line="2689"/>
-        <source> to </source>
+        <location filename="../../src/onmainwindow.cpp" line="3082"/>
+        <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
-        <source>Connection Error(</source>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
-        <source>Couldn't find a SSH connection.</source>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
-        <source>Verification code:</source>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
-        <source>Enter passphrase to decrypt a key</source>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
-        <source>Host key for server changed.
-It is now: </source>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
-        <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.
-Do you want to terminate the connection?
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
-        <source>Host key verification failed</source>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
-        <source>Yes</source>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
-        <source>No</source>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <source>This likely means the binary is not available.
+The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
-        <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>
+        <location filename="../../src/onmainwindow.cpp" line="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
-        <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
-For security reasons, it is recommended to stop the connection.
-Do you want to terminate the connection?
-</source>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
-        <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2932"/>
-        <source>The server is unknown. Do you trust the host key?
-Public key hash: </source>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
-        <source>Authentication failed: </source>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
-        <source>Authentication failed</source>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
-        <source>Enter password for SSH proxy</source>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
-        <source><b>Connection failed</b>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
-        <source><b>Wrong password!</b><br><br></source>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
-        <source>Connection failed: </source>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <source> - Wrong password.</source>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
-        <source>unknown</source>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
-        <source>No server availabel</source>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
-        <source>Server not availabel</source>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
-        <source>Select session:</source>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
-        <source>running</source>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
-        <source>suspended</source>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
-        <source>Desktop</source>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
-        <source>single application</source>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
-        <source>shadow session</source>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
-        <source>Information</source>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
-        <source>No accessible desktop found</source>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
-        <source>Filter</source>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
-        <source>Select desktop:</source>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
-        <source>Warning</source>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
-        <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="onmainwindow.cpp" line="4426"/>
-        <source>24 or 32</source>
+        <location filename="../../src/onmainwindow.cpp" line="8350"/>
+        <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="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
-        <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
+        <location filename="../../src/onmainwindow.cpp" line="8364"/>
+        <source><b>X2Go Client v. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4535"/>
-        <source>suspending</source>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
-        <source>terminating</source>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <source>Check whether the package providing "scdaemon" is installed.
+The current search path is: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
-        <source><b>Wrong Password!</b><br><br></source>
+        <location filename="../../src/onmainwindow.cpp" line="8695"/>
+        <source>didn't start yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
-        <source>New session started</source>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
-        <source>Session resumed</source>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <source>Unable to create folder: </source>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <source>Unable to write file: </source>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
-        <source>Attach X2Go window</source>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
-        <source>Unable to create SSL tunnel:
+        <location filename="../../src/onmainwindow.cpp" line="9351"/>
+        <source>Unable to create SSH tunnel for Folder Sharing and Printing support:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
-        <source>Unable to create SSL Tunnel:
+        <location filename="../../src/onmainwindow.cpp" line="9380"/>
+        <source>Unable to read:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
-        <source>Emergency exit.</source>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
-        <source>Waiting for proxy to exit.</source>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
-        <source>Failed, killing the proxy.</source>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
-        <source>Finished</source>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
-        <source>starting</source>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
+        <source>Please check LDAP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
-        <source>resuming</source>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
+        <source>No X2Go sessions found, closing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
-        <source>Connection timeout, aborting</source>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
+        <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
-        <source>aborting</source>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
+        <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
-        <source>Are you sure you want to terminate this session?
-Unsaved documents will be lost</source>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
+        <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
-        <source>Session</source>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
+        <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
-        <source>Display</source>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
+        <source> on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
-        <source>Creation time</source>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
+        <source>Starting connection to server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
-        <source><b>Connection failed</b>
-:
-</source>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
+        <source> to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
-        <source> (can't open file)</source>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
+        <source>Verification code:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
+        <source>Enter passphrase to decrypt a key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
+        <source>Host key for server changed.
+It is now: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
-        <source> (file not exists)</source>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
-        <source> (directory not exists)</source>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
+        <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="onmainwindow.cpp" line="6937"/>
-        <source>wrong value for argument"--link"</source>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
+        <source>The server is unknown. Do you trust the host key?
+Public key hash: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
-        <source>wrong value for argument"--clipboard"</source>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
+        <source>Authentication failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
-        <source>wrong value for argument"--sound"</source>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
+        <source>Enter password for SSH proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
-        <source>wrong value for argument"--geometry"</source>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
+        <source><b>Wrong password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
-        <source>wrong value for argument"--set-kbd"</source>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
+        <source>Connection failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
-        <source>wrong value for argument"--ldap"</source>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <source> - Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
-        <source>wrong value for argument"--ldap1"</source>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
-        <source>wrong value for argument"--ldap2"</source>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
+        <source>Select session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
-        <source>wrong value for argument"--pack"</source>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
+        <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
-        <source>Wrong parameter: </source>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
+        <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
-        <source>Help</source>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
-        <source>Available pack methodes:</source>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
+        <source>single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
-        <source>Pack Methodes</source>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
+        <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
-        <source>Option is not availabel in this build</source>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
-        <source>Changelog</source>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
-        <source>Git Info</source>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
+        <source>Select desktop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
-        <source>Unable to create folder:</source>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
-        <source>RSA file empty.</source>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
+        <source>24 or 32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
-        <source>Can not open key: </source>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
+        <source>suspending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
-        <source>Support</source>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
+        <source>terminating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
-        <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
+        <source><b>Wrong Password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
-        <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
+        <source>New session started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
-        <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
+        <source>Session resumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
-        <source><b>X2Go Client V. </source>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <source>Unable to create folder: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
-        <source>Please check LDAP Settings</source>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <source>Unable to write file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
-        <source>No valid card found</source>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
+        <source>Attach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
-        <source>Card not configured.</source>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
+        <source>Emergency exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
-        <source>This card is unknown by X2Go system</source>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
+        <source>Waiting for proxy to exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
-        <source>Unable to create file: </source>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
+        <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
-        <source>Can't connect to X server
-Please check your settings</source>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
+        <source>starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
-        <source>Can't start X server
-Please check your settings</source>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
+        <source>resuming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
-        <source>Can't start X Server
-Please check your installation</source>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
+        <source>Connection timeout, aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
-        <source>Unable to execute: </source>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <source>aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
-        <source>Remote server does not support file system export through SSH Tunnel
-Please update to a newer x2goserver package</source>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
+        <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
-        <source>Unable to read :
-</source>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
+        <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
-        <source>Unable to write :
-</source>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
+        <source>Creation time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
-        <source>WINDOWS-1252</source>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
+        <source> (can't open file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
-        <source>ISO8859-1</source>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
+        <source>Wrong parameter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
-        <source>Error getting window geometry (window closed)?</source>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
+        <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
-        <source>X2Go Session</source>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
+        <source>Changelog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
+        <source>Git Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
+        <source>RSA file empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
+        <source>Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
-        <source>wrong value for argument"speed"</source>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
+        <source>Card not configured.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
+        <source>Unable to create file: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
+        <source>Unable to execute: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
+        <source>WINDOWS-1252</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
+        <source>ISO8859-1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
+        <source>X2Go Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
-        <source>SSH Error</source>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
-        <source>SSH daemon could not be started.
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
 
-You'll need SSH daemon for printing and file sharing.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
 
-Normally, this should not happen as X2Go Client for 
-Windows ships its internal sshd.exe.
+Please also check the <b>Clientside SSH port</b> in the general settings.
 
-If you see this message, please report a bug against
-the X2Go bugtracker.</source>
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
-        <source>SSH daemon is not running.
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
 
-You'll need SSH daemon for printing and file sharing
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
 
-Please ask your system administrator to provide the SSH
-service on your computer.</source>
+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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
-        <source>SSH daemon failed to open the application's public host key.</source>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
-        <source>SSH daemon failed to open the application's public key
-used for exporting folders and printers.</source>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
-        <source>SSH daemon failed to open the application's
-authoized_keys file.</source>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
+        <source>SSH Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
+        <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="11997"/>
         <source>Restore toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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>
@@ -2131,140 +2360,140 @@ authoized_keys file.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
-        <source>You've deactivated the x2go client printing dialog.</source>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
-        <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
-        <source>Printing error</source>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
-        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2272,54 +2501,54 @@ lpr -P hp_laserjet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2327,135 +2556,178 @@ Example:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
-        <source>Session preferences...</source>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
-        <source>Create session icon on desktop...</source>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2463,39 +2735,39 @@ Example:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
-        <source>Create session icon on desktop</source>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
-        <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
 
-Use x2goclient hidden mode?</source>
+Use X2Go Client's hidden mode?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2503,38 +2775,38 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
-        <source>&Create session icon on desktop...</source>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2542,237 +2814,237 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
-        <source>Try auto login (ssh-agent or default ssh key)</source>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
-        <source>ssh-agent or default ssh key</source>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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="175"/>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
-        <source>Connect to Windows terminal server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
-        <source>Direct RDP Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
-        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2780,149 +3052,150 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
-        <source>&Clipboard Mode</source>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
-        <source>Auto detect keyboard settings</source>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
-        <source>RDP Client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2930,80 +3203,80 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
-        <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
-        <source>Select folder</source>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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="sharewidget.cpp" line="175"/>
-        <source>Error</source>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
+        <source>Select folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
-        <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3011,122 +3284,118 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
-        <source>SSH proxy connection error</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
-        <source>SSH proxy connection error: </source>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
-        <source>Failed to create SSH proxy tunnel</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
-        <source>Can not initialize libssh</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
-        <source>Can not create ssh session</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
-        <source>Can not connect to proxy server</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
-        <source>Can not connect to </source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
-        <source>Authentication failed</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
-        <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
-        <source>Check your GSSApi configuration or choose another authentication method</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
-        <source>Can not open file </source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
-        <source>Can not create remote file </source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
-        <source>Can not write to remote file </source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
-        <source>channel_open_forward failed</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
-        <source>channel_open_session failed</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
-        <source>channel_request_exec failed</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
-        <source>error writing to socket</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
-        <source>error reading channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
-        <source>channel_write failed</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
+        <source>SSH proxy connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
-        <source>error reading tcp socket</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
+        <source>channel_request_exec failed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
-        <source>Error creating socket</source>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3134,12 +3403,12 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3147,69 +3416,74 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_ru.ts b/res/i18n/x2goclient_ru.ts
index d74a3aa..b6a8adb 100644
--- a/res/i18n/x2goclient_ru.ts
+++ b/res/i18n/x2goclient_ru.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Удаленные приложения</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Поиск:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Пуск</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Закрыть</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Мультимедиа</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Разработка</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Обучение</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Игры</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Графика</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Установки</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Утилиты</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Другие</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Старый пароль:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Новый пароль:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Подтвердить пароль:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>метка</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Пароли не совпадают</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Ожидание</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Остановлен</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Состояние:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Принимает задания:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Комментарий:</translation>
     </message>
@@ -186,68 +186,76 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Нет выбранных параметров</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Выбранное значение конфликтует с другими опциями</translation>
+        <translation type="obsolete">Выбранное значение конфликтует с другими опциями</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Конфликт опций</translation>
+        <translation type="obsolete">Конфликт опций</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Тест соединения</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS соединение:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH соединение:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Скорость соединения:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
-        <source>Socket operation timed out</source>
-        <translation></translation>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Ошибка:</translation>
     </message>
@@ -255,7 +263,7 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>Использовать LDAP</translation>
     </message>
@@ -264,12 +272,12 @@
         <translation type="obsolete">Установки LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>URL Сервера:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
@@ -318,17 +326,17 @@
         <translation type="obsolete">Рабочий каталог:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>О&тмена</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Установки</translation>
     </message>
@@ -349,31 +357,24 @@
         <translation type="obsolete">Поиск X11</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Предупреждение</translation>
+        <translation type="obsolete">Предупреждение</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient не смог найти установленное на Вашем компьютере приложение X11. Пожалуйста установите X11 или укажите путь к установленному приложению</translation>
+        <translation type="obsolete">x2goclient не смог найти установленное на Вашем компьютере приложение X11. Пожалуйста установите X11 или укажите путь к установленному приложению</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Вы используете приложение X11 версии </translation>
+        <translation type="obsolete">Вы используете приложение X11 версии </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Данная версия имеет проблемы с изображением в 24-х битных цветовых режимах. Обновите пожалуйста ваше X11 приложение (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">. Данная версия имеет проблемы с изображением в 24-х битных цветовых режимах. Обновите пожалуйста ваше X11 приложение (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Приложение X11 не найдено в заданом каталоге</translation>
+        <translation type="obsolete">Приложение X11 не найдено в заданом каталоге</translation>
     </message>
     <message>
         <source>Clientside SSH Port For File System Export Usage:</source>
@@ -384,105 +385,169 @@
         <translation type="obsolete">Установки LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Failover Server 1 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Failover Server 2 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
         <source>X-Server settings</source>
-        <translation>Установки X-Сервера</translation>
+        <translation type="obsolete">Установки X-Сервера</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>Версия X11:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>Поиск X11</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>SSH порт на стороне клиента для экспорта файловой системы:</translation>
+        <translation type="obsolete">SSH порт на стороне клиента для экспорта файловой системы:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Отображать сессию встроенной в веб страницу</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Отображать пиктограму в системном трее</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>Спрятать в системный трей при сворачивании</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Спрятать в системный трей при закрытии</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Спрятать в системный трей после установки соединения</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Восстановить при разрыве соединения</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Продвинутые установки</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>С&оединение</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation>&Ввод/Вывод</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation>&Медиа</translation>
     </message>
@@ -494,32 +559,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Тип соединения</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Тип соединения:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>С&жатие</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Метод:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Метод сжатия:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Качество изображения:</translation>
     </message>
@@ -527,72 +592,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Формат бумаги:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Тип бумаги:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Подача бумаги:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Двусторонняя печать</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>По широкой стороне</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>По узкой стороне</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Опции драйвера</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Опция</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Нет выбранных параметров</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>текст</translation>
     </message>
@@ -600,12 +665,12 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Сессия</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>С&оединение</translation>
     </message>
@@ -614,27 +679,27 @@
         <translation type="obsolete">&Экспорт каталогов</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation>&Ввод/Вывод</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation>&Медиа</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>О&тмена</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
@@ -827,7 +892,7 @@
         <translation type="obsolete">Окно</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&Экспорт каталогов</translation>
     </message>
@@ -922,7 +987,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Новая сессия</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Установки сессии - </translation>
     </message>
@@ -966,26 +1031,31 @@ sound system connections through firewalls</source>
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>О&тмена</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&Соединить</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Настройки ...</translation>
     </message>
     <message>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Custom Folder ...</source>
         <translation type="obsolete">&Другой каталог ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Удалить</translation>
@@ -999,17 +1069,16 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Выбор каталога</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Другой каталог ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
         <source>share folders</source>
-        <translation>Экспорт каталогов</translation>
+        <translation type="obsolete">Экспорт каталогов</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Выбор каталога</translation>
     </message>
@@ -1017,7 +1086,7 @@ sound system connections through firewalls</source>
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1025,72 +1094,72 @@ sound system connections through firewalls</source>
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
-        <source>Rename Folder...</source>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
-        <source>Change Icon...</source>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
-        <source>Delete Folder...</source>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation type="unfinished">Открыть изображение</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation type="unfinished">Изображения</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
-        <source>". Folder is not empty. Please remove content of folder and try again.</source>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1098,7 +1167,7 @@ sound system connections through firewalls</source>
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
@@ -1114,172 +1183,200 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/ru</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Ключ на сервере изменен:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Из соображений безопасности соединение будет разорвано</translation>
+        <translation type="obsolete">Из соображений безопасности соединение будет разорвано</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Ключ для этого сервера не найден, но другой вариант ключа существует. Злоумышленик мог изменить ключ сервера по умолчания, что бы ввести ваш клиент в заблуждение, что этот ключ не существует</translation>
+        <translation type="obsolete">Ключ для этого сервера не найден, но другой вариант ключа существует. Злоумышленик мог изменить ключ сервера по умолчания, что бы ввести ваш клиент в заблуждение, что этот ключ не существует</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Не могу найти файл с ключами. Если вы примете этот ключ, файл будет создан автоматически</translation>
+        <translation type="obsolete">Не могу найти файл с ключами. Если вы примете этот ключ, файл будет создан автоматически</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Сервер не известен. Доверяете ли вы этому ключу?
 Public key hash: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Ошибка проверки ключа</translation>
+        <translation type="obsolete">Ошибка проверки ключа</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Код проверки:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Введите фразу-пароль для ключа</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Ошибка авторизации</translation>
+        <translation type="obsolete">Ошибка авторизации</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Ошибка авторизации<br>Повторите попытку</translation>
+        <translation type="obsolete">Ошибка авторизации<br>Повторите попытку</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Безопасное соединение невозможно</translation>
+        <translation type="obsolete">Безопасное соединение невозможно</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Issued to:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Issued by:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerprints:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Добавить исключение</translation>
     </message>
@@ -1291,45 +1388,45 @@ Public key hash: </translation>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Активировать звук</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Запускать звуковой сервер</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>Использовать запущенный звуковой сервер</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Использовать SSH туннель
 для звуковой системы</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Использовать порт по умолчанию</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Печать на стороне клиента</translation>
     </message>
@@ -1337,8 +1434,8 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>ru</translation>
     </message>
@@ -1347,30 +1444,30 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/ru</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Поддержка ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Сессия:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Выход</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
@@ -1379,7 +1476,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">&Новая сессия ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1388,26 +1485,151 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Управление сессиями...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Установки ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>Ошибка SSH</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -1417,7 +1639,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>Не удается запустить сервер SSH.
+        <translation type="obsolete">Не удается запустить сервер SSH.
 
 Сервер SSH нужен для печати и экспорта ФС.
 
@@ -1427,38 +1649,35 @@ the X2Go bugtracker.</source>
 Если вы видите это сообщение, пожалуйста сообщите об ошибке.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>Сервер SSH не обнаружен.
+        <translation type="obsolete">Сервер SSH не обнаружен.
 
 Сервер SSH необходим для печати и экспорта ФС
 
 Пожалуйста обратитесь к системному администратору за установкой сервера SSH.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>Серверу SSH не удалось открыть "public host key" приложения.</translation>
+        <translation type="obsolete">Серверу SSH не удалось открыть "public host key" приложения.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <source>SSH daemon failed to open the application's public key
 used for exporting folders and printers.</source>
         <translation>Серверу SSH не удалось открыть "public host key" приложения используемый для экспорта ФС и принтеров.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>Серверу SSH не удалось открыть "authorized_keys" файл приложения.</translation>
+        <translation type="obsolete">Серверу SSH не удалось открыть "authorized_keys" файл приложения.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Восстановить панель инструментов</translation>
     </message>
@@ -1467,198 +1686,187 @@ authoized_keys file.</source>
         <translation type="obsolete">О программе "X2GO Client"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Сессия</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Сессия</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Опции</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Помощь</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Пользователь:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Код проверки:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Это может быть признаком попытки взлома.
+        <translation type="obsolete">Это может быть признаком попытки взлома.
 Из соображений безопасности рекомендуется прекратить соединение.
 Прервать соединение?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Ключ для этого сервера не найден, но другой вариант ключа существует. Злоумышленик мог изменить ключ сервера по умолчания, что бы ввести ваш клиент в заблуждение, что этот ключ не существует.
+        <translation type="obsolete">Ключ для этого сервера не найден, но другой вариант ключа существует. Злоумышленик мог изменить ключ сервера по умолчания, что бы ввести ваш клиент в заблуждение, что этот ключ не существует.
 Прекратить соединение?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Новая сессия запущенна</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Сессия восстановленна</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Невозможно создать каталог:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Невозможно записать файл:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation>Аварийный выход.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Ожидание завершения прокси.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Провал, завершаем прокси.</translation>
+        <translation type="obsolete">Провал, завершаем прокси.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>неверное значение для параметра "--clipboard"</translation>
+        <translation type="obsolete">неверное значение для параметра "--clipboard"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Неверный параметр:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Помощь</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Методы сжатия</translation>
+        <translation type="obsolete">Методы сжатия</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>Опция недоступна в этой сборке</translation>
+        <translation type="obsolete">Опция недоступна в этой сборке</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Изменения</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Информация Git</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA файл пуст.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Невозможно открыть ключ:</translation>
+        <translation type="obsolete">Невозможно открыть ключ:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Карта не сконфигурирована.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Ошибка чтения геометрии окна (окно закрыто)?</translation>
+        <translation type="obsolete">Ошибка чтения геометрии окна (окно закрыто)?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Раскладка Клавиатуры:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Приложения...</translation>
     </message>
@@ -1667,93 +1875,84 @@ Do you want to terminate the connection?
         <translation type="obsolete">Неверный ответ брокера</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Проверте настройки LDAP</translation>
+        <translation type="obsolete">Проверте настройки LDAP</translation>
     </message>
     <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
         <source>no X2Go Server found in LDAP </source>
-        <translation type="obsolete">Сервер X2Go не найден в LDAP </translation>
+        <translation type="unfinished">Сервер X2Go не найден в LDAP </translation>
     </message>
     <message>
         <source>Are you sure you want to delete this Session?</source>
         <translation type="obsolete">Удалить сессию?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> на </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Ошибка соединения</b><br></translation>
+        <translation type="obsolete"><b>Ошибка соединения</b><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Неверный пароль!</b><br><br></translation>
     </message>
@@ -1762,51 +1961,51 @@ Do you want to terminate the connection?
         <translation type="obsolete">Не доступен ни один сервер</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Сессия:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Завершить</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Новая</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Дисплей</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
@@ -1815,94 +2014,81 @@ Do you want to terminate the connection?
         <translation type="obsolete">Время создания</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>IP клиента</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>ID сессии</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>активна</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>прервана</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Глубина цвета вашего дисплея не соответствует глубине цвета данной сессии. Это может помешать восстановлению сессии и в большинстве случаев<b>сессия будет утеряна</b> Рекомендуется изменить глубину цвета вашего дисплея на(sp)</translation>
+        <translation type="obsolete">Глубина цвета вашего дисплея не соответствует глубине цвета данной сессии. Это может помешать восстановлению сессии и в большинстве случаев<b>сессия будет утеряна</b> Рекомендуется изменить глубину цвета вашего дисплея на(sp)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 или 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> бит и перезапустить X-сервер до восстановления сессии.<br>Попробовать восстановить сессию не смотря на данное предупреждение?</translation>
+        <translation type="obsolete"> бит и перезапустить X-сервер до восстановления сессии.<br>Попробовать восстановить сессию не смотря на данное предупреждение?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Ошибка соединения(</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
-        <source>Couldn't find a SSH connection.</source>
-        <translation></translation>
+        <translation type="obsolete">Ошибка соединения(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Введите фразу-пароль для ключа</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Ключ на сервере изменен:</translation>
@@ -1916,82 +2102,67 @@ It is now: </source>
         <translation type="obsolete">Ключ для этого сервера не найден, но другой вариант ключа существует. Злоумышленик мог изменить ключ сервера по умолчания, что бы ввести ваш клиент в заблуждение, что этот ключ не существует</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Не могу найти файл с ключами. Если вы примете этот ключ, файл будет создан автоматически</translation>
+        <translation type="obsolete">Не могу найти файл с ключами. Если вы примете этот ключ, файл будет создан автоматически</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Сервер не известен. Доверяете ли вы этому ключу?
 Public key hash: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Ошибка проверки ключа</translation>
+        <translation type="obsolete">Ошибка проверки ключа</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Ошибка авторизации</translation>
+        <translation type="obsolete">Ошибка авторизации</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Введите пароль для SSH прокси</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>Сервер не доступен</translation>
+        <translation type="obsolete">Сервер не доступен</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>прерывается</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>завершается</translation>
     </message>
@@ -2004,200 +2175,420 @@ Public key hash: </translation>
         <translation type="obsolete">Невозможно записать файл:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>Ошибка создания SSL тунеля:
+        <translation type="obsolete">Ошибка создания SSL тунеля:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>соединение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
-        <source>starting</source>
-        <translation>запуск</translation>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
-        <source>resuming</source>
-        <translation>восстановление</translation>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
-        <source>Connection timeout, aborting</source>
-        <translation>Таймаут соединения, отмена</translation>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
-        <source>aborting</source>
-        <translation>отмена</translation>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation Time:<br>Status:</b></source>
-        <translation type="obsolete"><b>ID сессии:<br>Сервер:<br>Пользователь:<br>Дисплей:<br>Время создания:<br>Статус:</b></translation>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10906"/>
-        <source>Abort</source>
-        <translation>Отмена</translation>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Share Folder...</source>
-        <translation type="obsolete">Экспорт каталога...</translation>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Details</source>
-        <translation type="obsolete">Показать детали</translation>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
-        <source><b>Connection failed</b>
-:
-</source>
-        <translation><b>Ошибка соединения</b>(new line):
-</translation>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
-        <source> (can't open file)</source>
-        <translation> (невозможно открыть файл)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
-        <source> (file not exists)</source>
-        <translation> (файл не существует)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
-        <source> (directory not exists)</source>
-        <translation> (каталог не существует)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
-        <source>wrong value for argument"--link"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="onmainwindow.cpp" line="6970"/>
-        <source>wrong value for argument"--sound"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
-        <source>wrong value for argument"--geometry"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
-        <source>wrong value for argument"--set-kbd"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
-        <source>wrong value for argument"--ldap"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
-        <source>wrong value for argument"--ldap1"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
-        <source>wrong value for argument"--ldap2"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
-        <source>wrong value for argument"--pack"</source>
-        <translation></translation>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>wrong parameter: </source>
-        <translation type="obsolete">wrong parameter: </translation>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">Опции</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="onmainwindow.cpp" line="7223"/>
-        <source>Available pack methodes:</source>
-        <translation>Available pack methodes:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
-        <source>Support</source>
-        <translation>Поддержка</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
-        <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can't read host rsa key:</source>
-        <translation type="obsolete">Невозможно прочитать RSA ключ:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
-        <source>Unable to read :
-</source>
-        <translation>Невозможно прочитать :
-</translation>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
-        <source>Unable to write :
-</source>
-        <translation>Невозможно записать :
-</translation>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
-        <source><b>X2Go Client V. </source>
-        <translation><b>X2Go Client V. </translation>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with 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 fullscreen loginscreen (replacement for lo [...]
-        <translation type="obsolete"></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подо [...]
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
-        <source>No valid card found</source>
-        <translation>Формат карты неизвестен</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This card is unknown by X2Go System</source>
-        <translation type="obsolete">Эта карта не сконфигурирована для использования с X2Go</translation>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
-        <source>Unable to create file: </source>
-        <translation>Невозможно создать файл: </translation>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <source>This likely means the binary is not available.
+The current search path is: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can't connect to X-Server</source>
+        <location filename="../../src/onmainwindow.cpp" line="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
+        <source>starting</source>
+        <translation>запуск</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
+        <source>resuming</source>
+        <translation>восстановление</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
+        <source>Connection timeout, aborting</source>
+        <translation>Таймаут соединения, отмена</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
+        <source>aborting</source>
+        <translation>отмена</translation>
+    </message>
+    <message>
+        <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation Time:<br>Status:</b></source>
+        <translation type="obsolete"><b>ID сессии:<br>Сервер:<br>Пользователь:<br>Дисплей:<br>Время создания:<br>Статус:</b></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
+        <source>Abort</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <source>Share Folder...</source>
+        <translation type="obsolete">Экспорт каталога...</translation>
+    </message>
+    <message>
+        <source>Show Details</source>
+        <translation type="obsolete">Показать детали</translation>
+    </message>
+    <message>
+        <source><b>Connection failed</b>
+:
+</source>
+        <translation type="obsolete"><b>Ошибка соединения</b>(new line):
+</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
+        <source> (can't open file)</source>
+        <translation> (невозможно открыть файл)</translation>
+    </message>
+    <message>
+        <source> (file not exists)</source>
+        <translation type="obsolete"> (файл не существует)</translation>
+    </message>
+    <message>
+        <source> (directory not exists)</source>
+        <translation type="obsolete"> (каталог не существует)</translation>
+    </message>
+    <message>
+        <source>wrong parameter: </source>
+        <translation type="obsolete">wrong parameter: </translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="obsolete">Опции</translation>
+    </message>
+    <message>
+        <source>Available pack methodes:</source>
+        <translation type="obsolete">Available pack methodes:</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
+        <source>Support</source>
+        <translation>Поддержка</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> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+    </message>
+    <message>
+        <source>Can't read host rsa key:</source>
+        <translation type="obsolete">Невозможно прочитать RSA ключ:</translation>
+    </message>
+    <message>
+        <source>Unable to read :
+</source>
+        <translation type="obsolete">Невозможно прочитать :
+</translation>
+    </message>
+    <message>
+        <source>Unable to write :
+</source>
+        <translation type="obsolete">Невозможно записать :
+</translation>
+    </message>
+    <message>
+        <source><b>X2Go Client V. </source>
+        <translation type="obsolete"><b>X2Go Client V. </translation>
+    </message>
+    <message>
+        <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with 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 fullscreen loginscreen (replacement for lo [...]
+        <translation type="obsolete"></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подо [...]
+    </message>
+    <message>
+        <source>No valid card found</source>
+        <translation type="obsolete">Формат карты неизвестен</translation>
+    </message>
+    <message>
+        <source>This card is unknown by X2Go System</source>
+        <translation type="obsolete">Эта карта не сконфигурирована для использования с X2Go</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
+        <source>Unable to create file: </source>
+        <translation>Невозможно создать файл: </translation>
+    </message>
+    <message>
+        <source>Can't connect to X-Server</source>
         <translation type="obsolete">Невозможно присоединиться к X-серверу</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
         <oldsource>Can't connect to X-Server
 Please check your settings</oldsource>
-        <translation>Невозможно присоединиться к X-серверу
+        <translation type="obsolete">Невозможно присоединиться к X-серверу
 Проверьте настройки</translation>
     </message>
     <message>
@@ -2223,42 +2614,42 @@ Please check your settings</source>
         <translation type="obsolete">Почтовый клиент</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Оконный менеджер</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>приложение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>теневая сессия</translation>
     </message>
@@ -2267,292 +2658,248 @@ Please check your settings</source>
         <translation type="obsolete"><br>Ошибка настроек "sudo"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Невозможно выполнить: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Веб-броузер</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>Почтовый клиент</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Новая сессия ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Управление сессиями...</translation>
+        <translation type="obsolete">Управление сессиями...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>О программе "X2GO Client"</translation>
+        <translation type="obsolete">О программе "X2GO Client"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Проверьте настройки LDAP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>Сервер X2Go не найден в LDAP </translation>
+        <translation type="obsolete">Сервер X2Go не найден в LDAP </translation>
     </message>
     <message>
         <source>Are you sure you want to delete this session?</source>
         <translation type="obsolete">Удалить сессию?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Неверный пароль!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>Не доступен ни один сервер</translation>
+        <translation type="obsolete">Не доступен ни один сервер</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <oldsource>Active connection</oldsource>
         <translation>Соединение не установлено</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Время создания</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Невозможно создать каталог:</translation>
+        <translation type="obsolete">Невозможно создать каталог:</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
         <translation type="obsolete">Невозможно записать файл:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>Ошибка создания SSL тунеля:
+        <translation type="obsolete">Ошибка создания SSL тунеля:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Экспорт каталога...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Показать детали</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>Эта карта не сконфигурирована для использования с X2Go</translation>
+        <translation type="obsolete">Эта карта не сконфигурирована для использования с X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>Невозможно запустить X-Сервер
+        <translation type="obsolete">Невозможно запустить X-Сервер
 Проверьте настройки</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Удаленный сервер не поддерживает экспорт файловой системы через SSH туннель
+        <translation type="obsolete">Удаленный сервер не поддерживает экспорт файловой системы через SSH туннель
 Пожалуйста обновите пакет x2goserver</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Создать ярлык сессии на рабочем столе...</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="60"/>
-        <source>Starting x2goclient...</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="256"/>
-        <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="489"/>
-        <source>Started  x2goclient.</source>
-        <translation></translation>
+        <translation type="obsolete">&Создать ярлык сессии на рабочем столе...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
-        <source> installed.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Установить пароль на брокере...</translation>
+        <translation type="obsolete">&Установить пароль на брокере...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&Тест соединения...</translation>
+        <translation type="obsolete">&Тест соединения...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Пароль изменен</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Неверный пароль!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Авторизация</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Мультимедиа</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Разработка</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Обучение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Игры</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Графика</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Сеть</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Установки</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>Система</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Утилиты</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Другие</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
         <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource>
-        <translation>Щелчок левой кнопкой: спрятать/восстановить - правой: отобразить контекстное меню</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
-        <source>Closing x2goclient...</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
-        <source>Closed  x2goclient.</source>
-        <translation></translation>
+        <translation type="obsolete">Щелчок левой кнопкой: спрятать/восстановить - правой: отобразить контекстное меню</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -2579,32 +2926,31 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">Сессия X2Go не найдена</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP соединение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>Отсоединить окно</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>Присоединить окно</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>завершена</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>Вы уверены, что хотите удалить эту сессию?
+        <translation type="obsolete">Вы уверены, что хотите удалить эту сессию?
 Все несохраненные документы будут утеряны</translation>
     </message>
     <message>
@@ -2612,27 +2958,30 @@ Unsaved documents will be lost</source>
         <translation type="obsolete"></b><br> (C. 2006-2009 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер вхо [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>Невозможно запустить X Server
+        <translation type="obsolete">Невозможно запустить X Server
 Переустановите X2Go Client</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>Сессия X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Свернуть панель</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <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="12043"/>
         <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>
@@ -2649,65 +2998,260 @@ you can install sshd with
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Выбрать десктоп:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Только смотреть</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Доступный десктоп не найден</translation>
+        <translation type="obsolete">Доступный десктоп не найден</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Полный доступ</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Только мои десктопы</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Повторить соединение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Соединение с брокером</translation>
     </message>
@@ -2716,29 +3260,26 @@ you can install sshd with
         <translation type="obsolete"></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2goplugin был разработан при поддержке <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="obsolete"><br>x2goplugin был разработан при поддержке <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более [...]
+        <translation type="obsolete"><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1251</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>KOI8-R</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>wrong value for argument"speed"</translation>
+        <translation type="obsolete">wrong value for argument"speed"</translation>
     </message>
     <message>
         <source>application/x2go:x2go:Configuration File for X2Go Session</source>
@@ -2748,22 +3289,30 @@ you can install sshd with
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Отключение диалога печати.</translation>
+        <translation type="obsolete">Отключение диалога печати.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Для активации диалога печати воспользуйтесь диалогом установок (меню -> опции -> установки)</translation>
+        <translation type="obsolete">Для активации диалога печати воспользуйтесь диалогом установок (меню -> опции -> установки)</translation>
     </message>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Печать - X2Go Client</translation>
     </message>
@@ -2771,118 +3320,126 @@ you can install sshd with
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Сохранить файл</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>Документ PDF (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Невозможно выполнить команду:</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Ошибка печати</translation>
+        <translation type="obsolete">Ошибка печати</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Просмотр PDF</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Настройки печати</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Команда печати:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Настройки просмотра</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Открыть программой просмотра</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Команда:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Сохранить на диске</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Открывать этот диалог перед печатью</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Настройка програмы печати<br><br>Для печати сгенерированных файлов вам понадобится специальная программа печати. Мы рекомендуем использовать <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; и <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Более детальную информацию о настройках программы печати вы можете найти <a href="http://www.x2go.org/index.php?id=4 [...]
+        <translation type="obsolete">Настройка програмы печати<br><br>Для печати сгенерированных файлов вам понадобится специальная программа печати. Мы рекомендуем использовать <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; и <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Более детальную информацию о настройках программы печати вы можете найти <a href="http://www.x2go.or [...]
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Принтер:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Печать при помощи стандартной программы Windows для просмотра PDF
 (Программа просмотра должна быть установленна)</translation>
     </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Команда печати</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2893,47 +3450,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Формат вывода</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Пожалуйста выберите формат файла печати (если вы используете CUPS, вы можете выбрать PDF)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Структура данных</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Пожалуйста выберите метод ввода файла печати (некоторые программы требуют указать имя файла печати в параметрах командной строки, другие читают данные из устройства стандартного ввода):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>стандартный ввод (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Указать путь к файлу в параметре командной строки</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2942,7 +3499,7 @@ Example:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><Путь к gsprint.exe> -query -color</translation>
     </message>
@@ -2950,10 +3507,53 @@ Example:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Нет ответа от сервера. Прервать текущую сессию?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
@@ -2978,127 +3578,135 @@ Example:
         <translation type="obsolete">Активировать звук</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Новая сессия</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Удаленные приложения</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>Полноэкранная сессия</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Дисплей</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Максимальное</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>активирован</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>деактивирован</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>окно</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Установки сессии...</translation>
+        <translation type="obsolete">Установки сессии...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Создать ярлык сессии на рабочем столе...</translation>
+        <translation type="obsolete">Создать ярлык сессии на рабочем столе...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Удалить сессию</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Тип сессии</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Выбрать разрешение</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>активна</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>прервана</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP соединение</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -3106,41 +3714,51 @@ Example:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation type="unfinished">Создать ярлык сессии на рабочем столе</translation>
+        <translation type="obsolete">Создать ярлык сессии на рабочем столе</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation type="unfinished">Ярлык сессии может инициировать соединение без отображения клиента X2Go (скрытый режим). Если вы хотите использовать скрытый режим, вам необходимо настроить ключ для соединения или использовать PGP смарт карту.
+        <translation type="obsolete">Ярлык сессии может инициировать соединение без отображения клиента X2Go (скрытый режим). Если вы хотите использовать скрытый режим, вам необходимо настроить ключ для соединения или использовать PGP смарт карту.
 
 Активировать скрытый режим?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation type="unfinished">Показывать значок системной области при исполнении</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation type="unfinished">Новая сессия</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation type="unfinished">Удалить сессию?</translation>
     </message>
@@ -3148,7 +3766,7 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>&Выход</translation>
     </message>
@@ -3165,7 +3783,7 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">У&далить сессию</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Удалить</translation>
@@ -3175,280 +3793,304 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">Управление сессиями</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Новая сессия</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Установки сессии</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>У&далить сессию</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Управление сессиями</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Создать ярлык сессии на рабочем столе...</translation>
+        <translation type="obsolete">&Создать ярлык сессии на рабочем столе...</translation>
     </message>
 </context>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Имя сессии:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< изменить значок</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation type="unfinished">Расположение:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Сервер</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Хост:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Пользователь:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH порт:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>RSA/DSA ключ для ssh соединения:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Автоматическое соединение с SSH ключом по умолчанию или программой ssh-agent</translation>
+        <translation type="obsolete">Автоматическое соединение с SSH ключом по умолчанию или программой ssh-agent</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Авторизация Kerberos 5 (GSSAPI)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Делегация GSSAPI на сервер</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Использовать прокси сервер для SSH соединения</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Прокси сервер</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Такое же имя пользователя как на сервере X2Go</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Такой же пароль как на сервере X2Go</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>Ключ RSA/DSA:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
         <source>ssh-agent or default ssh key</source>
-        <translation>Автоматическое соединение с SSH ключом по умолчанию или программой ssh-agent</translation>
+        <translation type="obsolete">Автоматическое соединение с SSH ключом по умолчанию или программой ssh-agent</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Тип сессии</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Тип сессии:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Соединение с терминальным сервером Windows</translation>
+        <translation type="obsolete">Соединение с терминальным сервером Windows</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Другой оконный менеджер</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Приложение</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Удаленные приложения</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Команда:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Продвинутые установки...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Путь к исполняемому файлу</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Прямое RDP соединение</translation>
+        <translation type="obsolete">Прямое RDP соединение</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RDP порт:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Открыть изображение</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Открыть файл с ключом</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Все файлы</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Сервер:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>Опции командной строки rdesktop:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Новая сессия</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>Сервер XDMCP:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient запущен в "переносимом" режиме. Пожалуйста выберите путь находящийся в пределах используемого носителя для того, что бы всегда иметь доступ к Вашим данным</translation>
+        <translation type="obsolete">x2goclient запущен в "переносимом" режиме. Пожалуйста выберите путь находящийся в пределах используемого носителя для того, что бы всегда иметь доступ к Вашим данным</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Дисплей</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Клавиатура</translation>
     </message>
@@ -3457,121 +4099,133 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">Звук</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>&Буфер Обмена</translation>
+        <translation type="obsolete">&Буфер Обмена</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>Двусторонний буфер обмена</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Копирование и вставка с сервера на клиент</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Копирование и вставка с клиента на сервер</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Деактивировать буфер обмена</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
         <source>Auto detect keyboard settings</source>
-        <translation>Автоматическая настройка клавиатуры</translation>
+        <translation type="obsolete">Автоматическая настройка клавиатуры</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Не настраивать клавиатуру</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Настроить клавиатуру</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Модель:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Раскладка:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Вариант:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>Клиент RDP</translation>
+        <translation type="obsolete">Клиент RDP</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Другой</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Окно</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Использовать весь дисплей</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Максимально доступное</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Установить DPI</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama (поддержка двух и более физических дисплеев)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Ширина:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Высота:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Дисплей:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Идентифицировать дисплеи</translation>
     </message>
     <message>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Keep current keyboard Settings</source>
         <translation type="obsolete">Использовать текущие установки</translation>
     </message>
@@ -3614,17 +4268,17 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Печать на стороне клиента</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Дополнительные параметры:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Командная строка:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>ru</translation>
     </message>
@@ -3633,7 +4287,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/ru</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>пароль</translation>
     </message>
@@ -3641,203 +4296,227 @@ sound system connections through firewalls</source>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Каталоги</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Расположение</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Соединять автоматически</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Расположение:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Использовать SSH туннель для экспорта файловой системы</translation>
+        <translation type="obsolete">Использовать SSH туннель для экспорта файловой системы</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Выбор каталога</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Кодировка имен файлов</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1251</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>KOI8-R</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>локальная:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>удалённая:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>x2goclient запущен в "переносимом" режиме. Пожалуйста выберите путь находящийся в пределах используемого носителя для того, что бы всегда иметь доступ к Вашим данным</translation>
+        <translation type="obsolete">x2goclient запущен в "переносимом" режиме. Пожалуйста выберите путь находящийся в пределах используемого носителя для того, что бы всегда иметь доступ к Вашим данным</translation>
     </message>
 </context>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
         <source>SSH proxy connection error</source>
-        <translation>Ошибка соединения с SSH прокси сервером</translation>
+        <translation type="obsolete">Ошибка соединения с SSH прокси сервером</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>Ошибка соединения с SSH прокси сервером:</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
-        <source>Failed to create SSH proxy tunnel</source>
-        <translation>Ошибка создания SSH прокси тунеля</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
-        <source>Can not initialize libssh</source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
-        <source>Can not create ssh session</source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
-        <source>Can not connect to proxy server</source>
-        <translation>Невозможно присоединиться к прокси серверу</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
-        <source>Can not connect to </source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
-        <source>Authentication failed</source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
-        <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation>Невозможно запустить клиент SSH. Проверте настройки GSSAPI</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
-        <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>Проверте настройки GSSAPI или выберите другой метод авторизации</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
-        <source>Can not open file </source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
-        <source>Can not create remote file </source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
-        <source>Can not write to remote file </source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
-        <source>Cannot connect to </source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
-        <source>channel_open_forward failed</source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
-        <source>channel_open_session failed</source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
-        <source>channel_request_exec failed</source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
-        <source>error writing to socket</source>
-        <translation></translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
-        <source>error reading channel</source>
-        <translation></translation>
+        <source>Failed to create SSH proxy tunnel</source>
+        <translation type="obsolete">Ошибка создания SSH прокси тунеля</translation>
+    </message>
+    <message>
+        <source>Can not connect to proxy server</source>
+        <translation type="obsolete">Невозможно присоединиться к прокси серверу</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
-        <source>channel_write failed</source>
+        <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
+        <translation type="obsolete">Невозможно запустить клиент SSH. Проверте настройки GSSAPI</translation>
+    </message>
+    <message>
+        <source>Check your GSSApi configuration or choose another authentication method</source>
+        <translation type="obsolete">Проверте настройки GSSAPI или выберите другой метод авторизации</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
+        <source>Cannot connect to </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
-        <source>error reading tcp socket</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
+        <source>channel_request_exec failed</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
-        <source>Error creating socket</source>
-        <translation></translation>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation></translation>
     </message>
@@ -3845,12 +4524,12 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Открыть Файл</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Исполняемый файл (*.exe)</translation>
     </message>
@@ -3858,70 +4537,75 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Перезапустите программу, что бы изменения вступили в силу</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>использовать встроенный X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation>Не использовать первичный буффер обмена</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>использовать другой X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>Другой X-Сервер</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>Исполняемый файл:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>запускать X-Server при запуске X2Go Client</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>аргументы командной строки:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>Опции командной строки X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>оконный режим:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>полноэкранный режим:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>приложение:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sshProcess</name>
diff --git a/res/i18n/x2goclient_sv.ts b/res/i18n/x2goclient_sv.ts
index 9b023d2..72ba38d 100644
--- a/res/i18n/x2goclient_sv.ts
+++ b/res/i18n/x2goclient_sv.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Publicerade applikationer</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Sök:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Starta</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>S&täng</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Ljud och video</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Programmering</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Utbildning</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Verktyg</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Övrigt</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Gammalt lösenord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Nytt lösenord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Bekräfta lösenord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>TextLabel</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Lösenorden matchar inte</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Mottar jobb:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Placering:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Vilande</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Skriver ut</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Stoppad</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
@@ -186,69 +186,81 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Inget valt</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Detta värde är i konflikt med ett annat värde</translation>
+        <translation type="obsolete">Detta värde är i konflikt med ett annat värde</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Värdekonflikt</translation>
+        <translation type="obsolete">Värdekonflikt</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Anslutningstest</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS-anslutning:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH-anslutning:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Anslutningshastighet:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Misslyckades</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 kB/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
         <translatorcomment>Couldn't find a good translation for socket</translatorcomment>
-        <translation>Socketoperation överskred tidsgräns</translation>
+        <translation type="obsolete">Socketoperation överskred tidsgräns</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Misslyckades: </translation>
     </message>
@@ -256,162 +268,219 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Allmänna</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Visa ikon i systemfältet</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>Dölj i systemfältet när minimerad</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Dölj i systemfältet när stängd</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <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="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <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="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>Använd LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>Bas DN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Redundant server 1 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Redundant server 2 URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>X-server inställningar</translation>
+        <translation type="obsolete">X-server inställningar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11-applikation:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11-version:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>Hitta X11-applikation</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>SSH-port på klienten för export av filsystem:</translation>
+        <translation type="obsolete">SSH-port på klienten för export av filsystem:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Starta session inuti webbplats</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Avancerade alternativ</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Standardinställningar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Utskrifter</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>Varning</translation>
+        <translation type="obsolete">Varning</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient kunde inte hitta någon X11-applikation. Installera Apple X11 eller ange sökväg till applikationen</translation>
+        <translation type="obsolete">x2goclient kunde inte hitta någon X11-applikation. Installera Apple X11 eller ange sökväg till applikationen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Du använder X11 (Apple X-Windows Server) version </translation>
+        <translation type="obsolete">Du använder X11 (Apple X-Windows Server) version </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>Denna version orsakar problem med X11-applikation i 24-bitars färgdjup. Du bör uppdatera din X11-miljö (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">Denna version orsakar problem med X11-applikation i 24-bitars färgdjup. Du bör uppdatera din X11-miljö (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Ingen X11-applikation hittades i angiven sökväg</translation>
+        <translation type="obsolete">Ingen X11-applikation hittades i angiven sökväg</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Anslutning</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation>&In-/Utdata</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation>&Multimedia</translation>
     </message>
@@ -423,32 +492,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Anslutningshastighet</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Anslutningshastighet:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>K&omprimering</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Metod:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Komprimeringsmetod:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Bildkvalitet:</translation>
     </message>
@@ -456,72 +525,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Sidstorlek:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Papperstyp:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Papperskälla:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Dubbelsidig utskrift</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Långsida</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Kortsida</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Drivrutinsinställningar</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Alternativ</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Värde</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Inget alternativ valt</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>text</translation>
     </message>
@@ -529,47 +598,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Session</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Anslutning</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation>&In-/Utdata</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation>&Multimedia</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&Delade mappar</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Standardinställningar</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Sessionsinställningar - </translation>
     </message>
@@ -577,38 +646,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&Dela</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Inställningar...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Anpassad mapp...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Radera</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>Dela mappar</translation>
+        <translation type="obsolete">Dela mappar</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Välj mapp</translation>
     </message>
@@ -616,7 +689,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation>Sessionsmapp</translation>
     </message>
@@ -624,72 +697,88 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Mappar</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation>Skapa ny mapp</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
-        <translation>Döp om mapp...</translation>
+        <translation type="obsolete">Döp om mapp...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
-        <translation>Ändra ikon...</translation>
+        <translation type="obsolete">Ändra ikon...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
-        <translation>Ta bort mapp...</translation>
+        <translation type="obsolete">Ta bort mapp...</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation>Öppna bild</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>X2Go-klient</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation>Mappnamn:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation>Kunde ej ta bort "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>". Mappen är inte tom. Var vänlig töm mappen och försök igen.</translation>
+        <translation type="obsolete">". Mappen är inte tom. Var vänlig töm mappen och försök igen.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation>Ta bort mapp "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Ny mapp</translation>
     </message>
@@ -697,7 +786,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Alternativ</translation>
     </message>
@@ -715,176 +804,204 @@
         <translation type="obsolete">pc105/se</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Inloggning misslyckades!<br>Var god försök igen</translation>
+        <translation type="obsolete">Inloggning misslyckades!<br>Var god försök igen</translation>
     </message>
     <message>
         <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
         <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="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Nyckel för server har ändrats.
 Den är nu: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Anslutningen avbryts av säkerhetsskäl</translation>
+        <translation type="obsolete">Anslutningen avbryts av säkerhetsskäl</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Servern svarade inte med förväntad nyckeltyp. Det kan innebära att servern är komprometterad</translation>
+        <translation type="obsolete">Servern svarade inte med förväntad nyckeltyp. Det kan innebära att servern är komprometterad</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host 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>
+        <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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Okänd server. Litar du på denna nyckel?
 Publik nyckel: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Verifiering av serverns nyckel misslyckades</translation>
+        <translation type="obsolete">Verifiering av serverns nyckel misslyckades</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Verifieringskod:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Ange lösenord för att dekryptera nyckel</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
         <source>Authentication failed</source>
-        <translation>Autentisering misslyckades</translation>
+        <translation type="obsolete">Autentisering misslyckades</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Säker anslutning misslyckades</translation>
+        <translation type="obsolete">Säker anslutning misslyckades</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Utgivet till:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation>Serienummer	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Utgivare:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Giltighetstid:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation>Utgivningsdatum	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation>giltigt till	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Fingeravtryck:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>Avsluta X2Go-klienten</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>Lägg till undantag</translation>
     </message>
@@ -892,45 +1009,45 @@ Publik nyckel: </translation>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Ljud</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>Aktivera ljudstöd</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>Starta ljudserver</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>Använd aktiv ljudserver</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Använd SSH port forwarding för att tunnla
 ljudström genom brandväggar</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>Använd standardport för ljud</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>Ljudport:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>Stöd för utskrifter via klienten</translation>
     </message>
@@ -938,13 +1055,12 @@ ljudström genom brandväggar</translation>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>Startar x2goclient...</translation>
+        <translation type="obsolete">Startar x2goclient...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>se</translation>
     </message>
@@ -953,387 +1069,901 @@ ljudström genom brandväggar</translation>
         <translation type="obsolete">pc105/se</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>X2Go-klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>ansluter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Webbläsare</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>E-postklient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>Startar x2goclient i portabelt läge ... datakatalog är: </translation>
+        <translation type="obsolete">Startar x2goclient i portabelt läge ... datakatalog är: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Inställningar...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Hjälp ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>Om X2Go-klient</translation>
+        <translation type="obsolete">Om X2Go-klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>Startade x2goclient.</translation>
+        <translation type="obsolete">Startade x2goclient.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation>Kan inte ladda översättare: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Översättare: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation> installerad.</translation>
+        <translation type="obsolete"> installerad.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Dela mapp ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Vila</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Återanslut</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>Koppla lös X2Go-fönster</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Minimera verktygsrad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Session:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Avsluta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Ny session...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
         <translatorcomment>Added Alt shortcut, same letter as Ctrl shortcut (like &New session...)</translatorcomment>
-        <translation>S&essionshantering...</translation>
+        <translation type="obsolete">S&essionshantering...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>S&kapa sessionsgenväg på Skrivbordet...</translation>
+        <translation type="obsolete">S&kapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Ange agentlösenord...</translation>
+        <translation type="obsolete">&Ange agentlösenord...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&Testa anslutning...</translation>
+        <translation type="obsolete">&Testa anslutning...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Visa verktygsrad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Om Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Alternativ</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Hjälp</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Användare:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>Operation misslyckades</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Lösenord ändrat</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Fel lösenord!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Ansluter till agent</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentisering</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Återställ</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>Ej ansluten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Ljud och video</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Programmering</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Utbildning</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Grafik</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Verktyg</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Övrigt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Vänster musknapp för att dölja/återställa - Höger musknapp för att visa snabbmeny</translation>
+        <translation type="obsolete">Vänster musknapp för att dölja/återställa - Höger musknapp för att visa snabbmeny</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
         <source>Closing x2goclient...</source>
-        <translation>Stänger x2goclient...</translation>
+        <translation type="obsolete">Stänger x2goclient...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
         <source>Closed  x2goclient.</source>
-        <translation>Stängt x2goclient.</translation>
+        <translation type="obsolete">Stängt x2goclient.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Kontrollera LDAP-inställningar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>ingen X2Go-server hittades i LDAP</translation>
+        <translation type="obsolete">ingen X2Go-server hittades i LDAP</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1360,26 +1990,21 @@ Använd dolt läge?</translation>
         <translation type="obsolete">Länk till X2Go-session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Inga X2Go-sessioner hittades, stänger.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--clipboard"</source>
-        <translation>fel värde för argument "--clipboard"</translation>
+        <translation type="obsolete">fel värde för argument "--clipboard"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>SSH-fel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
 You'll need SSH daemon for printing and file sharing.
@@ -1389,7 +2014,7 @@ Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH-kunde inte startas.
+        <translation type="obsolete">SSH-kunde inte startas.
 
 Du behöver SSH för skrivar- och fildelning.
 
@@ -1400,14 +2025,13 @@ Om du ser detta meddelande, rapportera en bugg i
 X2Go:s bugghanteringssystem. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
 You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>SSH är inte igång.
+        <translation type="obsolete">SSH är inte igång.
 
 Du behöver SSH för skrivar- och fildelning.
 
@@ -1415,22 +2039,20 @@ Var vänlig be din systemadministratör att tillhandahålla SSH
 på din dator.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
         <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>SSH kunde inte öppna applikationens publika servernyckel.</translation>
+        <translation type="obsolete">SSH kunde inte öppna applikationens publika servernyckel.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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
 som används för export av mappar och skrivare.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
         <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>SSH kunde inte öppna applikationens
+        <translation type="obsolete">SSH kunde inte öppna applikationens
 authorized_keys-fil.</translation>
     </message>
     <message>
@@ -1442,58 +2064,56 @@ authorized_keys-fil.</translation>
         <translation type="obsolete">Är du säker på att du vill radera denna session?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP-anslutning</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Anslutning till lokalt Skrivbord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> på </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation>Startar anslutning till server: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation> till </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Anslutningsfel(</translation>
+        <translation type="obsolete">Anslutningsfel(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
         <source>Couldn't find a SSH connection.</source>
-        <translation>Kunde inte hitta en SSH-anslutning.</translation>
+        <translation type="obsolete">Kunde inte hitta en SSH-anslutning.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Ange lösenord för att dekryptera nyckel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Nyckel för server har ändrats.
@@ -1508,475 +2128,500 @@ Den är nu: </translation>
         <translation type="obsolete">Servern svarade inte med förväntad nyckeltyp. Det kan innebära att servern är komprometterad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host 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>
+        <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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Okänd server. Litar du på denna nyckel?
 Publik nyckel: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Verifiering av serverns nyckel misslyckades</translation>
+        <translation type="obsolete">Verifiering av serverns nyckel misslyckades</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Verifieringskod:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Detta kan vara en indikation på en "man in the middle"-attack.
+        <translation type="obsolete">Detta kan vara en indikation på en "man in the middle"-attack.
 Någon kan avlyssna kommunikationen.
 Av säkerhetsskäl är det rekommenderat att du avslutar anslutningen.
 Vill du avsluta anslutningen?
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 Vill du uppdatera servernyckeln?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Servernyckeln hittades inte, men en annan nyckeltyp finns. En attackerare kan ändra typen på servernyckeln för att lura din klient att tro att nyckeln inte finns.
+        <translation type="obsolete">Servernyckeln hittades inte, men en annan nyckeltyp finns. En attackerare kan ändra typen på servernyckeln för att lura din klient att tro att nyckeln inte finns.
 Av säkerhetsskäl är det rekommenderat att du avslutar anslutningen.
 Vill du avsluta anslutningen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Autentisering misslyckades: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Autentisering misslyckades</translation>
+        <translation type="obsolete">Autentisering misslyckades</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Ange lösenord för SSH-proxy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Anslutning misslyckades</b>
+        <translation type="obsolete"><b>Anslutning misslyckades</b>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Fel lösenord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Anslutning misslyckades: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation> - Fel lösenord.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>okänt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>Ingen server tillgänglig</translation>
+        <translation type="obsolete">Ingen server tillgänglig</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>Server ej tillgänglig</translation>
+        <translation type="obsolete">Server ej tillgänglig</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Välj session:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>vilande</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Skrivbord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>Applikation</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>Skuggsession</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Inget tillgängligt Skrivbord hittades</translation>
+        <translation type="obsolete">Inget tillgängligt Skrivbord hittades</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Välj Skrivbord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Ditt nuvarande färgdjup matchar inte X2Go-sessionens färgdjup. Det kan orsaka problem vid återanslutning av sessionen och i de flesta fall <b>förlorar du sessionen</b> och måste starta en ny! Det är starkt rekommenderat att du ändrar färdgjup till </translation>
+        <translation type="obsolete">Ditt nuvarande färgdjup matchar inte X2Go-sessionens färgdjup. Det kan orsaka problem vid återanslutning av sessionen och i de flesta fall <b>förlorar du sessionen</b> och måste starta en ny! Det är starkt rekommenderat att du ändrar färdgjup till </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 eller 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> bitar och startar om X-servern innan du återansluter till denna X2Go-session.<br>Återanslut session ändå?</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="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>försätter i vila</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>avslutar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Fel lösenord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Ny session startad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Session återupptagen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Kunde ej skapa katalog: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Kunde ej skriva till fil: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5825"/>
         <source>Emergency exit.</source>
         <translation>Akut avslut.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Väntar på att proxy ska avslutas.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Misslyckades, dödar proxy.</translation>
+        <translation type="obsolete">Misslyckades, dödar proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Felaktig parameter: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Hjälp</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Packningsmetoder</translation>
+        <translation type="obsolete">Packningsmetoder</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>Alternativet är inte tillgängligt i denna version</translation>
+        <translation type="obsolete">Alternativet är inte tillgängligt i denna version</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Ändringslogg</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Git-information</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Kunde inte skapa mapp:</translation>
+        <translation type="obsolete">Kunde inte skapa mapp:</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
         <translation type="obsolete">Kunde ej skriva till fil:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>Koppla X2Go-fönster</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>Kunde ej skapa SSL-tunnel:
+        <translation type="obsolete">Kunde ej skapa SSL-tunnel:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>Kunde ej skapa SSL-tunnel:
+        <translation type="obsolete">Kunde ej skapa SSL-tunnel:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>avslutad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>startar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>återansluter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Anslutning passerade tidsgränsen, avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <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?
+        <translation type="obsolete">Är du säker på att du vill avsluta sessionen?
 Data som ej sparats kommer att förloras</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Display</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Skapad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Anslutning misslyckades</b>
+        <translation type="obsolete"><b>Anslutning misslyckades</b>
 :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (kan inte öppna fil)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (filen finns inte)</translation>
+        <translation type="obsolete"> (filen finns inte)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (mapp finns inte)</translation>
+        <translation type="obsolete"> (mapp finns inte)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>fel värde för "--link"</translation>
+        <translation type="obsolete">fel värde för "--link"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>fel värde för "--sound"</translation>
+        <translation type="obsolete">fel värde för "--sound"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>fel värde för "--geometry"</translation>
+        <translation type="obsolete">fel värde för "--geometry"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>fel värde för "--set-kbd"</translation>
+        <translation type="obsolete">fel värde för "--set-kbd"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>fel värde för "--ldap"</translation>
+        <translation type="obsolete">fel värde för "--ldap"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>fel värde för "--ldap1"</translation>
+        <translation type="obsolete">fel värde för "--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>fel värde för "--ldap2"</translation>
+        <translation type="obsolete">fel värde för "--ldap2"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>fel värde för "--pack"</translation>
+        <translation type="obsolete">fel värde för "--pack"</translation>
     </message>
     <message>
         <source>wrong parameter: </source>
@@ -1987,22 +2632,20 @@ Data som ej sparats kommer att förloras</translation>
         <translation type="obsolete">Alternativ</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Tillgängliga kompressionsmetoder:</translation>
+        <translation type="obsolete">Tillgängliga kompressionsmetoder:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA-fil tom.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Kan inte öppna nyckel: </translation>
+        <translation type="obsolete">Kan inte öppna nyckel: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Hjälp</translation>
     </message>
@@ -2011,50 +2654,43 @@ Data som ej sparats kommer att förloras</translation>
         <translation type="obsolete"></b><br> (&copy; 2006-2012 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
+        <translation type="obsolete"><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <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">www.x2go.org</a>; för vidare information.</translation>
+        <translation type="obsolete"><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">www.x2go.org</a>; för vidare information.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Go-klient V. </translation>
+        <translation type="obsolete"><b>X2Go-klient V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Kontrollera LDAP-inställningar</translation>
+        <translation type="obsolete">Kontrollera LDAP-inställningar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>Inget giltigt kort hittades</translation>
+        <translation type="obsolete">Inget giltigt kort hittades</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Kort ej konfigurerat.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>Kortet är okänt</translation>
+        <translation type="obsolete">Kortet är okänt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Kunde ej skapa filen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
         <source>Can't start X server
 Please check your settings</source>
-        <translation>Kan ej starta X-server
+        <translation type="obsolete">Kan ej starta X-server
 Kontrollera dina inställningar</translation>
     </message>
     <message>
@@ -2062,12 +2698,11 @@ Kontrollera dina inställningar</translation>
         <translation type="obsolete">Kan ej ansluta till X-server</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
         <oldsource>Can't connect to X-Server
 Please check your settings</oldsource>
-        <translation>Kan ej ansluta till X-server
+        <translation type="obsolete">Kan ej ansluta till X-server
 Kontrollera dina inställningar</translation>
     </message>
     <message>
@@ -2077,172 +2712,162 @@ Please check your settings</source>
 Kontrollera dina inställningar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>Kan ej starta X-server
+        <translation type="obsolete">Kan ej starta X-server
 Kontrollera installation</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Kunde ej exekvera: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Servern stöder ej filsystemsexport via SSH-tunnel
+        <translation type="obsolete">Servern stöder ej filsystemsexport via SSH-tunnel
 Uppdatera till en nyare version av x2goserver</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Kunde ej läsa :
+        <translation type="obsolete">Kunde ej läsa :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Kunde ej skriva till :
+        <translation type="obsolete">Kunde ej skriva till :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Ett fel uppstod när fönstergeometri hämtades (fönster stängt)?</translation>
+        <translation type="obsolete">Ett fel uppstod när fönstergeometri hämtades (fönster stängt)?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go-session</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>fel värde för "speed"</translation>
+        <translation type="obsolete">fel värde för "speed"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Lösenord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translatorcomment>Swenglish, but commonly used.</translatorcomment>
         <translation>Tangentbordslayout:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Applikationer...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (&copy; 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"></b><br> (&copy; 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Visa detaljer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Återanslut</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Fullständig åtkomst</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Endast visa</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>Klient-IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>Sessions-ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Användare</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Bara mina Skrivbord</translation>
     </message>
@@ -2255,12 +2880,12 @@ du kan installera sshd med (Debian/Ubuntu)
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Återställ verktygsrad</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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>
@@ -2272,142 +2897,158 @@ du kan installera sshd med (Debian/Ubuntu)
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Utskrift - X2Go-klient</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Utskrift</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>Du har inaktiverat utskriftsdialogen i X2Go.</translation>
+        <translation type="obsolete">Du har inaktiverat utskriftsdialogen i X2Go.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Du kan återaktivera denna dialog via X2Go-klientens inställningar (Meny -> Alternativ -> Inställningar)</translation>
+        <translation type="obsolete">Du kan återaktivera denna dialog via X2Go-klientens inställningar (Meny -> Alternativ -> Inställningar)</translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Spara fil</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>PDF-dokument (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Kunde ej exekverka kommando:
 </translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Utskriftsfel</translation>
+        <translation type="obsolete">Utskriftsfel</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Visa som PDF</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Utskriftsinställningar</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Skrivare:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Skriv ut via Windows standard PDF-visare
 (PDF-visare måste installeras)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Utskriftskommando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Inställningar för visning</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Öppna i applikation</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Spara till disk</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Visa denna dialog innan utskrift</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>Konfigurera utskriftsinställningar för klienten.<br><br>Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; och <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Mer information finns <a href="http://www.x2go.org/index.php?id=49">här</a>.</translation>
+        <translation type="obsolete">Konfigurera utskriftsinställningar för klienten.<br><br>Om du vill skriva ut den skapade filen så behöver du en extern applikation. Du kan oftast använda <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; och <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Mer information finns <a href="http://www.x2go.org/index.php?id=49">här</a [...]
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Utskriftskommando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2417,47 +3058,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Utskriftsformat</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Välj filformat för utskrift (om du använder CUPS så kan du använda PDF)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Datastruktur</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Välj metod för utskrift av fil (vissa kommandon har egna parametrar för utskrift, andra väntar på indata):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>Indata (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Ange sökväg som programparameter</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2465,7 +3106,7 @@ Example:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><Sökväg till gsprint.exe> -query -color</translation>
     </message>
@@ -2473,135 +3114,186 @@ Example:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Inget svar från fjärrserver. Vill du avsluta den aktuella sessionen?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Sessionsinställningar...</translation>
+        <translation type="obsolete">Sessionsinställningar...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Skapa sessionsgenväg på Skrivbordet...</translation>
+        <translation type="obsolete">Skapa sessionsgenväg på Skrivbordet...</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Radera session</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Sessionshantering</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Välj typ</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Välj upplösning</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Växla ljudstöd</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Ny session</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>vilande</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP-anslutning</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Anslutning till lokalt Skrivbord</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Publicerade applikationer</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>Fullskärm</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Display </translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>fönster</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>Maximerad</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>På</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>Av</translation>
     </message>
@@ -2609,41 +3301,51 @@ Example:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Tillbaka</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Skapa sessionsgenväg på Skrivbordet</translation>
+        <translation type="obsolete">Skapa sessionsgenväg på Skrivbordet</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Skrivbordsgenvägar kan konfigureras att inte visa X2Go-klienten (dolt läge). Om du vill aktivera den funktionen måste du använda inloggning med GPG-nyckel eller GPG-smartkort. 
+        <translation type="obsolete">Skrivbordsgenvägar kan konfigureras att inte visa X2Go-klienten (dolt läge). Om du vill aktivera den funktionen måste du använda inloggning med GPG-nyckel eller GPG-smartkort. 
 
 Använd dolt läge?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Visa ikon i systemfältet när aktiv</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Ny session</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation>Länk till X2Go-session</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Är du säker på att du vill radera denna session?</translation>
     </message>
@@ -2651,39 +3353,43 @@ Använd dolt läge?</translation>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Ny session</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translatorcomment>There are "..." on every other button so why not here ...</translatorcomment>
         <translation>&Sessionsinställningar...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>&Radera session</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>S&kapa sessionsgenväg på Skrivbordet...</translation>
+        <translation type="obsolete">S&kapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Radera</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Sessionshantering</translation>
     </message>
@@ -2691,237 +3397,257 @@ Använd dolt läge?</translation>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Sessionsnamn:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< klicka för att ändra ikon</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Sökväg:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Servernamn:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Användare:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH-port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Använd denna RSA-/DSA-nyckel för SSH-anslutning:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Prova automatisk inloggning (ssh-agent eller standard SSH-nyckel)</translation>
+        <translation type="obsolete">Prova automatisk inloggning (ssh-agent eller standard SSH-nyckel)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI)-autentisering</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Delegering av GSSAPI autentiseringsuppgifter till server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Använd proxyserver för SSH-anslutning</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Proxyserver</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>Samma inloggning som för X2Go Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>Samma lösenord som för X2Go Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>RSA-/DSA-nyckel:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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>
         <source>ssh-agent or default ssh key</source>
-        <translation>ssh-agent eller standard SSH-nyckel</translation>
+        <translation type="obsolete">ssh-agent eller standard SSH-nyckel</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Sessionstyp</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Sessionstyp:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Anslut till Windows Terminal Server (RDP)</translation>
+        <translation type="obsolete">Anslut till Windows Terminal Server (RDP)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Anslut till lokalt Skrivbord</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>Anpassat Skrivbord</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Applikation</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Publicerade applikationer</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Avancerade alternativ...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Sökväg till exekverbar fil</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Direktanslutning via RDP</translation>
+        <translation type="obsolete">Direktanslutning via RDP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RDP-port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Öppna bild</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Öppna nyckelfil</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Alla filer</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever 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>
+        <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="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP-server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop kommandoradsalternativ:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Ny session</translation>
     </message>
@@ -2929,14 +3655,14 @@ Använd dolt läge?</translation>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Skärm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Tangentbord</translation>
     </message>
@@ -2945,121 +3671,133 @@ Använd dolt läge?</translation>
         <translation type="obsolete">Ljud</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
         <source>&Clipboard Mode</source>
-        <translation>&Urklippsläge</translation>
+        <translation type="obsolete">&Urklippsläge</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>Dubbelriktad klippa och klistra</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>Klippa och klistra från klient till server</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Klippa och klistra från server till klient</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Deaktivera Urklipp helt</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
         <source>Auto detect keyboard settings</source>
-        <translation>Detektera tangentbordsinställningar automatiskt</translation>
+        <translation type="obsolete">Detektera tangentbordsinställningar automatiskt</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Konfigurera inte tangentbordet</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Konfigurera tangentbordet</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Modell: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Layout: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Variant: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
         <source>RDP Client</source>
-        <translation>RDP-klient</translation>
+        <translation type="obsolete">RDP-klient</translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Fullskärm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Anpassad</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Fönster</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Använd hela skärmen</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Maximerad</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Ange skärmupplösning (DPI)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama (stöd för två eller fler skärmar)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Bredd:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Höjd:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Skärm:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Identifiera alla skärmar</translation>
     </message>
     <message>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Keep current keyboard Settings</source>
         <translation type="obsolete">Behåll aktuella tangentbordsinställningar</translation>
     </message>
@@ -3103,17 +3841,17 @@ ljudström genom brandväggar</translation>
         <translation type="obsolete">Stöd för utskrifter via klienten</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Extra parametrar:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Kommandorad:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>se</translation>
     </message>
@@ -3122,7 +3860,8 @@ ljudström genom brandväggar</translation>
         <translation type="obsolete">pc105/se</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>lösenord</translation>
     </message>
@@ -3130,80 +3869,88 @@ ljudström genom brandväggar</translation>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Mappar</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Sökväg</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Montera automatiskt</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Lägg till</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Radera</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Sökväg:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Kodtabell för filnamn</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>lokal:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>fjärr:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Använd SSH port forwarding för att tunnla filsystemsanslutningar genom brandväggar</translation>
+        <translation type="obsolete">Använd SSH port forwarding för att tunnla filsystemsanslutningar genom brandväggar</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Välj mapp</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever 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>
+        <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="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3211,126 +3958,198 @@ ljudström genom brandväggar</translation>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
         <source>SSH proxy connection error</source>
-        <translation>Anslutningsfel SSH-proxy</translation>
+        <translation type="obsolete">Anslutningsfel SSH-proxy</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>Anslutningsfel SSH-proxy:</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>Kunde ej skapa SSH-proxytunnel</translation>
+        <translation type="obsolete">Kunde ej skapa SSH-proxytunnel</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>Kan ej initialisera libssh</translation>
+        <translation type="obsolete">Kan ej initialisera libssh</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>Kan ej skapa SSH-session</translation>
+        <translation type="obsolete">Kan ej skapa SSH-session</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>Kan ej ansluta till proxyserver</translation>
+        <translation type="obsolete">Kan ej ansluta till proxyserver</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>Kan inte ansluta till </translation>
+        <translation type="obsolete">Kan inte ansluta till </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Autentisering misslyckades</translation>
+        <translation type="obsolete">Autentisering misslyckades</translation>
     </message>
     <message>
         <source>channel_forward_listen failed</source>
         <translation type="obsolete">channel_forward_listen misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <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>
+        <translation type="obsolete">Start av SSH-klient misslyckades. Kontrollera din installation och GSSAPI-konfiguration</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>Kontrollera din GSSAPI-konfiguration eller välj en annan autentiseringsmetod</translation>
+        <translation type="obsolete">Kontrollera din GSSAPI-konfiguration eller välj en annan autentiseringsmetod</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>Kan inte öppna fil </translation>
+        <translation type="obsolete">Kan inte öppna fil </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>Kan inte skapa fjärrfil </translation>
+        <translation type="obsolete">Kan inte skapa fjärrfil </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>Kan inte skriva till fjärrfil </translation>
+        <translation type="obsolete">Kan inte skriva till fjärrfil </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>kan inte ansluta till </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward misslyckades</translation>
+        <translation type="obsolete">channel_open_forward misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session misslyckades</translation>
+        <translation type="obsolete">channel_open_session misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>ett fel uppstod vid skrivning till socket</translation>
+        <translation type="obsolete">ett fel uppstod vid skrivning till socket</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>ett fel uppstod när kanal skulle läsas</translation>
+        <translation type="obsolete">ett fel uppstod när kanal skulle läsas</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
-        <translation>channel_write misslyckades</translation>
+        <translation type="obsolete">channel_write misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>ett fel uppstod när tcp socket skulle läsas</translation>
+        <translation type="obsolete">ett fel uppstod när tcp socket skulle läsas</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Ett fel uppstod när socket skulle skapas</translation>
+        <translation type="obsolete">Ett fel uppstod när socket skulle skapas</translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Ett fel uppstod vid anslutning till socket </translation>
     </message>
@@ -3338,12 +4157,12 @@ ljudström genom brandväggar</translation>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Exekverbar (*.exe)</translation>
     </message>
@@ -3351,69 +4170,74 @@ ljudström genom brandväggar</translation>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Du måste starta om X2Go-klienten för att ändringar ska aktiveras</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>Använd integrerad X-server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation> Använd inte primär urklippsbuffert</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>Använd anpassad X-server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>Anpassad X-server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>Binär:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>Starta X-server när X2Go-klienten startas</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>Kommandoradsalternativ:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>Kommandoradsalternativ för X-server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>Fönsterläge:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>Fullskärmsläge:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>Applikation:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_tr.ts b/res/i18n/x2goclient_tr.ts
index 200f09f..33fc885 100644
--- a/res/i18n/x2goclient_tr.ts
+++ b/res/i18n/x2goclient_tr.ts
@@ -1,80 +1,80 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="tr">
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Tanımlı Uygulamalar</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Ara:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Başlat</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Kapat</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Çokluortam</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Geliştirme</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Eğitim</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Oyun</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Grafikler</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Ofis</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Araç</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Diğer</translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Pencere</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Eski parola:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Yeni parola:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Parola onayla:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation>MetinEtiketi</translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>Parolalar eşleşmiyor</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Biçim</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>İsim:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Özellikler</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Durum:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>İşler kabul ediliyor:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Tür:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Konum:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Açıklama:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Boşta</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Yazdırılıyor</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Durduruldu</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Evet</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Hayır</translation>
     </message>
@@ -186,68 +186,80 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation>Hiç seçenek seçilmedi</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>Bu değer başka bir seçenek ile çakıyor</translation>
+        <translation type="obsolete">Bu değer başka bir seçenek ile çakıyor</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>Seçenek çakışması</translation>
+        <translation type="obsolete">Seçenek çakışması</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>Bağlantı testi</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS bağlantısı:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH bağlantısı:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>Bağlantı hızı:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Başarısız oldu</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>Tamam</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
-        <translation>Soket işleminde zaman aşımı</translation>
+        <translation type="obsolete">Soket işleminde zaman aşımı</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Başarısız: </translation>
     </message>
@@ -255,190 +267,256 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="56"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="65"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>Sistem çekmecesinde simgeyi göster</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="72"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>Küçültüldüğünde sistem çekmecesine gizle</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>Kapatıldığında sistem çekmecesine gizle</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <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="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>Bağlantı kesildikten sonra sistem çekmecesine gizle</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="93"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>LDAP Kullan</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="117"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation>Sunucu Adresi:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="120"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>Yük devretme sunucu 1 adresi:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="122"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>Yük devretme sunucu 2 adresi:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="204"/>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="646"/>
+        <source>&Input/Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="647"/>
+        <source>&Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>X-Sunucu ayarları</translation>
+        <translation type="obsolete">X-Sunucu ayarları</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="213"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11 uygulaması:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="224"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11 sürümü:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="239"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>X11 uygulaması bul</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="256"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Dosya sistemi dışa aktarımı kullanımı için istemci tarafı SSH bağlantı noktası:</translation>
+        <translation type="obsolete">Dosya sistemi dışa aktarımı kullanımı için istemci tarafı SSH bağlantı noktası:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="266"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>Oturumu web sayfasına gömülü başlat</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="270"/>
-        <location filename="configdialog.cpp" line="573"/>
-        <location filename="configdialog.cpp" line="585"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>Gelişmiş seçenekler</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="297"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>Varsayılanlar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="298"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>&Tamam</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="299"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>&İptal</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="322"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="342"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>Yazdırılıyor</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="509"/>
-        <location filename="configdialog.cpp" line="527"/>
-        <location filename="configdialog.cpp" line="546"/>
         <source>Warning</source>
-        <translation>Uyarı</translation>
+        <translation type="obsolete">Uyarı</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="510"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>x2goclient uygun bir X11 Uygulaması bulamadı. Lütfen Apple X11 kurun veya uygulamanın yolunu seçin</translation>
+        <translation type="obsolete">x2goclient uygun bir X11 Uygulaması bulamadı. Lütfen Apple X11 kurun veya uygulamanın yolunu seçin</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="528"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>Kullandığınız X11 (Apple X-Window Sunucusu) sürümü </translation>
+        <translation type="obsolete">Kullandığınız X11 (Apple X-Window Sunucusu) sürümü </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="530"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. Bu sürüm 24bit renk kipinde X-uygulamalarıyla sorunlara neden olmaktadır. X11 ortamınızı güncellemelisiniz (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">. Bu sürüm 24bit renk kipinde X-uygulamalarıyla sorunlara neden olmaktadır. X11 ortamınızı güncellemelisiniz (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="547"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>Seçilen yolda uygun bir X11 uygulaması bulunamadı</translation>
+        <translation type="obsolete">Seçilen yolda uygun bir X11 uygulaması bulunamadı</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="583"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>&Bağlantı</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="584"/>
         <source>&Settings</source>
-        <translation>&Ayarlar</translation>
+        <translation type="obsolete">&Ayarlar</translation>
     </message>
 </context>
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>Bağlantı &hızı</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Bağlantı hızı:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>Sı&kıştırma</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Yöntem:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Sıkıştırma yöntemi:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Resim kalitesi:</translation>
     </message>
@@ -446,72 +524,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Pencere</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Sayfa boyutu:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Kağıt türü:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Kağıt kaynağı:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Önlü Arkalı Yazdırma</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Hiçbiri</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Uzun kenar</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Kısa kenar</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Sürücü ayarları</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Seçenek</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Değer</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Hiç seçenek seçilmedi</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>metin</translation>
     </message>
@@ -519,42 +597,51 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="57"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>&Oturum</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="58"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>&Bağlantı</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
         <source>&Settings</source>
-        <translation>&Ayarlar</translation>
+        <translation type="obsolete">&Ayarlar</translation>
+    </message>
+    <message>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
+        <source>&Input/Output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
+        <source>&Media</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>&Klasörleri paylaş</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="63"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>&Tamam</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>&İptal</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="65"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>Varsayılanlar</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="123"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>Oturum tercihleri - </translation>
     </message>
@@ -562,38 +649,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>&İptal</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>&paylaş</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>&Tercihler...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>&Özel klasör ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>klasörleri paylaş</translation>
+        <translation type="obsolete">klasörleri paylaş</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>Klasör seç</translation>
     </message>
@@ -601,7 +692,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation>Oturum klasörü</translation>
     </message>
@@ -609,72 +700,88 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation>Klasörler</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation>Yeni Klasör Oluştur</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
         <source>Rename Folder...</source>
-        <translation>Klasörü Yeniden Adlandır...</translation>
+        <translation type="obsolete">Klasörü Yeniden Adlandır...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
         <source>Change Icon...</source>
-        <translation>Simgeyi Değiştir...</translation>
+        <translation type="obsolete">Simgeyi Değiştir...</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
         <source>Delete Folder...</source>
-        <translation>Klasörü Sil...</translation>
+        <translation type="obsolete">Klasörü Sil...</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation>Resmi aç</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation>Resimler</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation>X2Go İstemcisi</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation>Klasör Adı:</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
-        <source>Unable to remove "</source>
-        <translation>Bu dizin silinemiyor "</translation>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
+        <source>Unable to remove "</source>
+        <translation>Bu dizin silinemiyor "</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
-        <source>". Folder is not empty. Please remove content of folder and try again.</source>
-        <translation>". Dizin boş değil. Lütfen dizinin içeriğini silip tekrar deneyin.</translation>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
-        <source>Delete folder "</source>
-        <translation>Dizini sil "</translation>
+        <source>". Folder is not empty. Please remove content of folder and try again.</source>
+        <translation type="obsolete">". Dizin boş değil. Lütfen dizinin içeriğini silip tekrar deneyin.</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
+        <source>Delete folder "</source>
+        <translation>Dizini sil "</translation>
+    </message>
+    <message>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation>Yeni Klasör</translation>
     </message>
@@ -682,7 +789,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation>Seçenekler</translation>
     </message>
@@ -690,1373 +797,1990 @@
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Sunucu için konak anahtarı değişti.
 Şimdiki: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>Güvenlik nedenleriyle bağlantı sonlandırılacak</translation>
+        <translation type="obsolete">Güvenlik nedenleriyle bağlantı sonlandırılacak</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Bu sunucu için konak anahtarı bulunamadı, ancak başka bir tür anahtar bulundu. Bir saldırgan istemcinizin anahtarın olmadığını düşünmesini sağlamak için ana sunucunu anahtarını değiştirmiş olabilir.</translation>
+        <translation type="obsolete">Bu sunucu için konak anahtarı bulunamadı, ancak başka bir tür anahtar bulundu. Bir saldırgan istemcinizin anahtarın olmadığını düşünmesini sağlamak için ana sunucunu anahtarını değiştirmiş olabilir.</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Bilinen istemciler dosyası bulunamadı. Eğer istemci anahtarını kabul ettiyseniz dosya burada otomatik olarak oluşturulacaktır</translation>
+        <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="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Sunucu bilinmiyor. Konak anahtarına güveniyor musunuz?
 Açık anahtar özeti: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation>Makine anahtarının doğrulanması başarısız oldu</translation>
+        <translation type="obsolete">Makine anahtarının doğrulanması başarısız oldu</translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="170"/>
+        <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="179"/>
         <source>Yes</source>
         <translation>Evet</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation>Hayır</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation>Doğrulama kodu:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Bir anahtarı deşifrelemek için parolayı girin</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
+        <source>Common Name(CN)	</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
+        <source>Organization(O)	</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
+        <source>Organizational Unit(OU)	</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
+        <source>Serial Number	</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
+        <source>Issued on	</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
+        <source>expires on	</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
+        <source>SHA1	</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
+        <source>MD5	</source>
+        <translation type="unfinished">MD5     {5	?}</translation>
+    </message>
+    <message>
         <source>Authentication failed</source>
-        <translation>Kimlik doğrulaması başarısız</translation>
+        <translation type="obsolete">Kimlik doğrulaması başarısız</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>Giriş başarısız oldu!<br>Lütfen tekrar deneyin</translation>
+        <translation type="obsolete">Giriş başarısız oldu!<br>Lütfen tekrar deneyin</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <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="httpbrokerclient.cpp" line="583"/>
-        <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>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
+        <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>
     <message>
-        <location filename="httpbrokerclient.cpp" line="588"/>
         <source>Secure connection failed</source>
-        <translation>Güvenli bağlantı hatası</translation>
+        <translation type="obsolete">Güvenli bağlantı hatası</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation>Yayınlatan:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
         <source>Common Name(CN) </source>
-        <translation>Ortak İsim (CN)    </translation>
+        <translation type="obsolete">Ortak İsim (CN)    </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
         <source>Organization(O) </source>
-        <translation>Kurum (O)
+        <translation type="obsolete">Kurum (O)
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
         <source>Organizational Unit(OU) </source>
-        <translation>Kurumsal Birim (OU)    </translation>
+        <translation type="obsolete">Kurumsal Birim (OU)    </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
         <source>Serial Number   </source>
-        <translation>Seri Numarası  </translation>
+        <translation type="obsolete">Seri Numarası  </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation>Yayınlayan:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation>Geçerlilik:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
         <source>Issued on   </source>
-        <translation>Yayınlama tarihi
+        <translation type="obsolete">Yayınlama tarihi
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
         <source>expires on  </source>
-        <translation>Zaman aşımı tarihi </translation>
+        <translation type="obsolete">Zaman aşımı tarihi </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation>Parmak izi:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
         <source>SHA1    </source>
-        <translation>SHA1   </translation>
+        <translation type="obsolete">SHA1   </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
         <source>MD5 </source>
-        <translation>MD5    </translation>
+        <translation type="obsolete">MD5    </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation>X2Go İstemcisinden Çık</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation>İstisna ekle</translation>
     </message>
 </context>
 <context>
+    <name>MediaWidget</name>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
+        <source>Sound</source>
+        <translation type="unfinished">Ses</translation>
+    </message>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
+        <source>Enable sound support</source>
+        <translation type="unfinished">Ses desteğini etkinleştir</translation>
+    </message>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
+        <source>Start sound daemon</source>
+        <translation type="unfinished">Ses sürecini başlat</translation>
+    </message>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
+        <source>Use running sound daemon</source>
+        <translation type="unfinished">Çalışan ses sürecini kullan</translation>
+    </message>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
+        <source>Use SSH port forwarding to tunnel
+sound system connections through firewalls</source>
+        <translation type="unfinished">Güvenlik duvarları üzerinden ses sistemi bağlantılarını
+tünellemek için ssh port yönlendirmesini kullanın</translation>
+    </message>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
+        <source>Use default sound port</source>
+        <translation type="unfinished">Varsayılan ses portunu kullan</translation>
+    </message>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
+        <source>Sound port:</source>
+        <translation type="unfinished">Ses portu:</translation>
+    </message>
+    <message>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
+        <source>Client side printing support</source>
+        <translation type="unfinished">İstemci tarafı yazdırma desteği</translation>
+    </message>
+</context>
+<context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
         <source>Starting x2goclient...</source>
-        <translation>x2goclient istemcisi başlatılıyor...</translation>
+        <translation type="obsolete">x2goclient istemcisi başlatılıyor...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>tr</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>X2Go İstemcisi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>bağlanıyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>Internet tarayıcı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>E-posta istemcisi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>Uçbirim</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation>x2goclient taşınabilir kipte başlatılıyor... veri dizini: </translation>
+        <translation type="obsolete">x2goclient taşınabilir kipte başlatılıyor... veri dizini: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>&Ayarlar...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>Destek ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>X2GO istemcisi hakkında</translation>
+        <translation type="obsolete">X2GO istemcisi hakkında</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="489"/>
         <source>Started  x2goclient.</source>
-        <translation>x2goclient  başlatıldı.</translation>
+        <translation type="obsolete">x2goclient  başlatıldı.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
-        <source>Can't load translator: </source>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
+        <source>Can't load translator: </source>
         <translation>Çevirici yüklenemiyor: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation>Çevirmen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
         <source> installed.</source>
-        <translation> kuruldu.</translation>
+        <translation type="obsolete"> kuruldu.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>Klasör paylaş...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation>Uygulamalar...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>Askıya Al</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>Sonlandır</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>Yeniden bağlan</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>X2Go penceresini ayır</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>Araç çubuğunu küçült</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>Oturum:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>&Çıkış</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>Çık</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>&Yeni oturum ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>Oturum yönetimi...</translation>
+        <translation type="obsolete">Oturum yönetimi...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Masaüstüne oturum simgesi oluştur...</translation>
+        <translation type="obsolete">&Masaüstüne oturum simgesi oluştur...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>&Aracı parolası ata...</translation>
+        <translation type="obsolete">&Aracı parolası ata...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>&Bağlantı testi...</translation>
+        <translation type="obsolete">&Bağlantı testi...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>Araç çubuğunu göster</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>Qt Hakkında</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation>Ctrl+Q</translation>
+        <translation type="obsolete">Ctrl+Q</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>&Oturum</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>&Seçenekler</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>&Yardım</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>Giriş:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>İşlem başarısız oldu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>Parola değiştirildi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>Yanlış parola!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>Aracıya bağlanıyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>Kimlik Doğrulama</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>Geri Yükle</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>Bağlı değil</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation>Çokluortam</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation>Geliştirme</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation>Eğitim</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation>Oyun</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation>Grafikler</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation>Ağ</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation>Ofis</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation>Araç</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation>Diğer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <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="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>Gizlemek/geri yüklemek için farenin sol tuşu - İçerik menüsünü görüntülemek için farenin sağ tuşu</translation>
+        <translation type="obsolete">Gizlemek/geri yüklemek için farenin sol tuşu - İçerik menüsünü görüntülemek için farenin sağ tuşu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
         <source>Closing x2goclient...</source>
-        <translation>x2goclient kapatılıyor...</translation>
+        <translation type="obsolete">x2goclient kapatılıyor...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
         <source>Closed  x2goclient.</source>
-        <translation>x2goclient  kapatıldı.</translation>
+        <translation type="obsolete">x2goclient  kapatıldı.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>Lütfen LDAP ayarlarını kontrol edin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>LDAP'ta X2Go sunucusu yok </translation>
+        <translation type="obsolete">LDAP'ta X2Go sunucusu yok </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>X2Go oturumu bulunamadı, kapatılıyor.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP bağlantısı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>Yerel masa üstüne bağlantı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> üzerinde </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation>Sunucuya bağlantı başlatılıyor: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation> sunucusuna </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
         <source>Connection Error(</source>
-        <translation>Bağlantı Hatası(</translation>
+        <translation type="obsolete">Bağlantı Hatası(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
-        <source>Couldn't find a SSH connection.</source>
-        <translation>Bir SSH bağlantısı bulunamadı.</translation>
+        <source>Couldn't find a SSH connection.</source>
+        <translation type="obsolete">Bir SSH bağlantısı bulunamadı.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation>Doğrulama kodu:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Anahtarı deşifrelemek için parola girin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Sunucunun konak anahtarı değişti.
 Şimdiki: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
         <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.
 Do you want to terminate the connection?
 </source>
-        <translation>Bu aradaki adam saldırısının bir göstergesi olabilir.
+        <translation type="obsolete">Bu aradaki adam saldırısının bir göstergesi olabilir.
 Biri trafiğinizi dinliyor olabilir.
 Güvenlik nedenleriyle bağlantıyı sonlandırmanız önerilir.
 Bağlantıyı sonlandırmak istiyor musunuz?
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>Makine anahtarının doğrulanması başarısız oldu</translation>
+        <translation type="obsolete">Makine anahtarının doğrulanması başarısız oldu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>Evet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>Hayır</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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.
 Konak anahtarını güncellemek istiyor musunuz?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2889"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation>Bu sunucu için konak anahtarı bulunamadı, ancak başka bir tür anahtar bulundu. Bir saldırgan istemcinizin anahtarın olmadığını düşünmesini sağlamak için ana sunucunu anahtarını değiştirmiş olabilir.
+        <translation type="obsolete">Bu sunucu için konak anahtarı bulunamadı, ancak başka bir tür anahtar bulundu. Bir saldırgan istemcinizin anahtarın olmadığını düşünmesini sağlamak için ana sunucunu anahtarını değiştirmiş olabilir.
 Güvenlik nedenleriyle bağlantıyı sonlandırmanız önerilir.
 Bağlantıyı sonlandırmak istiyor musunuz?
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>Bilinen istemciler dosyası bulunamadı. Eğer istemci anahtarını kabul ettiyseniz dosya burada otomatik olarak oluşturulacaktır</translation>
+        <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="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <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="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation>Kimlik doğrulama başarısız oldu: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>Kimlik doğrulama başarısız</translation>
+        <translation type="obsolete">Kimlik doğrulama başarısız</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation>Vekil SSH için parola girin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>Bağlantı başarısız</b>
+        <translation type="obsolete"><b>Bağlantı başarısız</b>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Yanlış parola!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation>Bağlantı başarısız: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation> - Yanlış parola.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>Erişilebilir sunucu yok</translation>
+        <translation type="obsolete">Erişilebilir sunucu yok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>Sunucu erişilebilir değil</translation>
+        <translation type="obsolete">Sunucu erişilebilir değil</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>Oturumu başlat:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>çalışıyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>bekletiliyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>Masaüstü</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>tek uygulama</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation>gölge oturumu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>Bilgi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>Erişilebilir masaüstü bulunamadı</translation>
+        <translation type="obsolete">Erişilebilir masaüstü bulunamadı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>Filtre</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>Masaüstü seçin:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
-        <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>Geçerli renk derinliğiniz x2go oturumunuzdakinden farklı. Bu oturuma yeniden bağlanmanızda sorunlara yol açabilir ve çoğu durumda <b>oturumunuzu kaybedersiniz</b> ve yeni bir oturum başlatmanız gerekir! Renk derinliğinizi şuna değiştirmeniz şiddetle önerilir </translation>
+        <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
+        <translation type="obsolete">Geçerli renk derinliğiniz x2go oturumunuzdakinden farklı. Bu oturuma yeniden bağlanmanızda sorunlara yol açabilir ve çoğu durumda <b>oturumunuzu kaybedersiniz</b> ve yeni bir oturum başlatmanız gerekir! Renk derinliğinizi şuna değiştirmeniz şiddetle önerilir </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24 veya 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation> bit ve bu x2go oturumuna yeniden bağlanmadan X sunucunuzu yeniden başlatın.<br>Oturuma yine de devam edilsin mi?</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="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>bekletiliyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>sonlandırılıyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Hatalı Parola!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation>Yeni oturum başlatıldı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation>Oturuma geri dönüldü</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation>Klasör oluşturulamadı: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation>Dosya yazılamıyor: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>X2Go penceresine ekle</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>SSL tüneli oluşturulamadı:
+        <translation type="obsolete">SSL tüneli oluşturulamadı:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>SSL Tüneli oluşturulamadı:
+        <translation type="obsolete">SSL Tüneli oluşturulamadı:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation>Acil çıkış.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Çıkış için vekil sunucu bekleniyor.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
         <source>Failed, killing the proxy.</source>
-        <translation>Başarısız oldu, vekil sunucu durduruluyor.</translation>
+        <translation type="obsolete">Başarısız oldu, vekil sunucu durduruluyor.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>Tamamlandı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>başlatılıyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>devam ediliyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>Bağlantı zaman aşımına uğradı, iptal ediliyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>iptal ediliyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>Bu oturumu sonlandırmak istediğinizden emin misiniz?
+        <translation type="obsolete">Bu oturumu sonlandırmak istediğinizden emin misiniz?
 Kaydedilmemiş belgeler kaybolacak</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>Oturum</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>Göster</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>Oluşturma zamanı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Bağlantı başarısız</b>
+        <translation type="obsolete"><b>Bağlantı başarısız</b>
 :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
-        <source> (can't open file)</source>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
+        <source> (can't open file)</source>
         <translation> (dosya açılamıyor)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (dosya yok)</translation>
+        <translation type="obsolete"> (dosya yok)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (dizin mevcut değil)</translation>
+        <translation type="obsolete"> (dizin mevcut değil)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
-        <source>wrong value for argument"--link"</source>
-        <translation>"--link" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--link"</source>
+        <translation type="obsolete">"--link" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
-        <source>wrong value for argument"--clipboard"</source>
-        <translation>"--clipboard" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--clipboard"</source>
+        <translation type="obsolete">"--clipboard" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
-        <source>wrong value for argument"--sound"</source>
-        <translation>"--sound" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--sound"</source>
+        <translation type="obsolete">"--sound" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
-        <source>wrong value for argument"--geometry"</source>
-        <translation>"--geometry" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--geometry"</source>
+        <translation type="obsolete">"--geometry" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
-        <source>wrong value for argument"--set-kbd"</source>
-        <translation>"--set-kbd" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--set-kbd"</source>
+        <translation type="obsolete">"--set-kbd" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
-        <source>wrong value for argument"--ldap"</source>
-        <translation>"--ldap" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--ldap"</source>
+        <translation type="obsolete">"--ldap" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
-        <source>wrong value for argument"--ldap1"</source>
-        <translation>"--ldap1" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--ldap1"</source>
+        <translation type="obsolete">"--ldap1" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
-        <source>wrong value for argument"--ldap2"</source>
-        <translation>"--ldap2" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--ldap2"</source>
+        <translation type="obsolete">"--ldap2" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
-        <source>wrong value for argument"--pack"</source>
-        <translation>"--pack" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"--pack"</source>
+        <translation type="obsolete">"--pack" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation>Yanlış parametre: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation>Yardım</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>Kullanılabilir paketleme yöntemleri:</translation>
+        <translation type="obsolete">Kullanılabilir paketleme yöntemleri:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
         <source>Pack Methodes</source>
-        <translation>Paketleme Yöntemleri</translation>
+        <translation type="obsolete">Paketleme Yöntemleri</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
         <source>Option is not availabel in this build</source>
-        <translation>Bu inşa için özellik kullanılabilir değil</translation>
+        <translation type="obsolete">Bu inşa için özellik kullanılabilir değil</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation>Değişim günlüğü</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation>Git Bilgisi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>Dizin oluşturulamadı:</translation>
+        <translation type="obsolete">Dizin oluşturulamadı:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation>RSA dosyası boş.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
         <source>Can not open key: </source>
-        <translation>Anahtar açılamıyor: </translation>
+        <translation type="obsolete">Anahtar açılamıyor: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>Destek</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
         <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation></b><br> (C. 2005-2016 <b>açıkça iyi</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+        <translation type="obsolete"></b><br> (C. 2005-2016 <b>açıkça iyi</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
-        <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br> x2goplugin kipi <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> tarafından desteklenmektedir<br></translation>
+        <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
+        <translation type="obsolete"><br> x2goplugin kipi <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a> tarafından desteklenmektedir<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
         <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation><br>X2Go ağını temel alan hesaplama ortamını kullanan istemci. Bu İstemci X2Go sunucu(lar)ına bağlanabilir ve masaüstü oturumlarını başlatabilir, durdurabilir, oturumlara geri dönebilir ve çalışan oturumları sonlandırabilir. X2Go İstemcisi farklı sunucu bağlantılarını saklayabilir ve LDAP dizinlerinden veri ile otomatik kimlik doğrulama talep edebilir. Bunun yanında tam ekran oturum açma ekranı (xdm gibi yazılımların yerine) olarak da kullanılabilir. Daha fazla [...]
+        <translation type="obsolete"><br>X2Go ağını temel alan hesaplama ortamını kullanan istemci. Bu İstemci X2Go sunucu(lar)ına bağlanabilir ve masaüstü oturumlarını başlatabilir, durdurabilir, oturumlara geri dönebilir ve çalışan oturumları sonlandırabilir. X2Go İstemcisi farklı sunucu bağlantılarını saklayabilir ve LDAP dizinlerinden veri ile otomatik kimlik doğrulama talep edebilir. Bunun yanında tam ekran oturum açma ekranı (xdm gibi yazılımların yerine) olarak da kullanılab [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Go İstemcisi V. </translation>
+        <translation type="obsolete"><b>X2Go İstemcisi V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>Lütfen LDAP Ayarlarını kontrol edin</translation>
+        <translation type="obsolete">Lütfen LDAP Ayarlarını kontrol edin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>Geçerli kart bulunamadı</translation>
+        <translation type="obsolete">Geçerli kart bulunamadı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation>Kart yapılandırılmadı.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>Kart X2Go sistemi tarafından bilinmiyor</translation>
+        <translation type="obsolete">Kart X2Go sistemi tarafından bilinmiyor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>Dosya oluşturulamadı: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
-        <source>Can't connect to X server
+        <source>Can't connect to X server
 Please check your settings</source>
-        <translation>X sunucusuna bağlanılamadı
+        <translation type="obsolete">X sunucusuna bağlanılamadı
 Lütfen ayarlarınızı kontrol edin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
-        <source>Can't start X server
+        <source>Can't start X server
 Please check your settings</source>
-        <translation>X sunucusu başlatılamadı
+        <translation type="obsolete">X sunucusu başlatılamadı
 Lütfen ayarlarınızı kontrol edin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
-        <source>Can't start X Server
+        <source>Can't start X Server
 Please check your installation</source>
-        <translation>X Sunucusu başlatılamadı\Lütfen kurulumunuzu kontrol edin</translation>
+        <translation type="obsolete">X Sunucusu başlatılamadı\Lütfen kurulumunuzu kontrol edin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>Komut çalıştırılamadı: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>Uzak sunucu SSH Tünel üzerinden dosya sistemini aktarmayı desteklemiyor
+        <translation type="obsolete">Uzak sunucu SSH Tünel üzerinden dosya sistemini aktarmayı desteklemiyor
 Lütfen x2goserver paketini daha yeni bir sürüme güncelleyin</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>Okunamadı :
+        <translation type="obsolete">Okunamadı :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>Yazılamadı :
+        <translation type="obsolete">Yazılamadı :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
         <source>Error getting window geometry (window closed)?</source>
-        <translation>Pencere geometrisi alınırken hata (pencere kapalı mı)?</translation>
+        <translation type="obsolete">Pencere geometrisi alınırken hata (pencere kapalı mı)?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go Oturumu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
-        <source>wrong value for argument"speed"</source>
-        <translation>"speed" değişkeni için hatalı değer</translation>
+        <source>wrong value for argument"speed"</source>
+        <translation type="obsolete">"speed" değişkeni için hatalı değer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>Parola:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>Klavye düzeni:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>Tamam</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="10906"/>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
         <source>Abort</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
         <source>Show details</source>
         <translation>Ayrıntıları göster</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
         <source>Resume</source>
         <translation>Devam et</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
         <source>New</source>
         <translation>Yeni</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
         <source>Full access</source>
         <translation>Tam erişim</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
         <source>View only</source>
         <translation>Sadece görüntüleme</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
         <source>Status</source>
         <translation>Durum</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
         <source>Command</source>
         <translation>Komut</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
         <source>Server</source>
         <translation>Sunucu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
         <source>Client IP</source>
         <translation>İstemci IP adresi</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
         <source>Session ID</source>
         <translation>Oturum Kimliği</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
         <source>User</source>
         <translation>Kullanıcı</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
         <source>Only my desktops</source>
         <translation>Sadece beim masaüstlerimde</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation>SSH Hatası</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
         <source>SSH daemon could not be started.
 
-You'll need SSH daemon for printing and file sharing.
+You'll need SSH daemon for printing and file sharing.
 
 Normally, this should not happen as X2Go Client for 
 Windows ships its internal sshd.exe.
 
 If you see this message, please report a bug against
 the X2Go bugtracker.</source>
-        <translation>SSH süreci başlatılamadı.
+        <translation type="obsolete">SSH süreci başlatılamadı.
 
 SSH sürecine yazdırma ve dosya paylaşımı için ihtiyacınız olacak.
 
@@ -2067,14 +2791,13 @@ Eğer bu iletiyi görüyorsanız lütfen X2Go hata takip sisteminde
 bir hata kaydı açın.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
         <source>SSH daemon is not running.
 
-You'll need SSH daemon for printing and file sharing
+You'll need SSH daemon for printing and file sharing
 
 Please ask your system administrator to provide the SSH
 service on your computer.</source>
-        <translation>SSH süreci çalışmıyor.
+        <translation type="obsolete">SSH süreci çalışmıyor.
 
 SSH sürecine yazdırma ve dosya paylaşımı için ihtiyacınız olacak
 
@@ -2082,31 +2805,29 @@ Lütfen sistem yöneticinizden bilgisayarınıza SSH servisi
 sağlamasını isteyin.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
-        <source>SSH daemon failed to open the application's public host key.</source>
-        <translation>SSH süreci uygulamanın açık konak anahtarını açmakta başarısız oldu.</translation>
+        <source>SSH daemon failed to open the application's public host key.</source>
+        <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="onmainwindow.cpp" line="11336"/>
-        <source>SSH daemon failed to open the application's public key
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
+        <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
 için kullanılan açık anahtarını açamadı.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11347"/>
-        <source>SSH daemon failed to open the application's
+        <source>SSH daemon failed to open the application's
 authoized_keys file.</source>
-        <translation>SSH süreci uygulamanın authoized_keys dosyasını
+        <translation type="obsolete">SSH süreci uygulamanın authoized_keys dosyasını
 açmakta başarısız oldu.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
         <source>Restore toolbar</source>
         <translation>Araç çubuğunu yeniden yükle</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
         <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>
@@ -2114,142 +2835,158 @@ açmakta başarısız oldu.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Yazdır - X2Go İstemcisi</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
+        <location filename="../../src/printdialog.cpp" line="31"/>
         <source>Print</source>
         <translation>Yazdır</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
-        <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>X2Go istemcisinin yazdırma penceresini kapattınız.</translation>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You've deactivated the x2go client printing dialog.</source>
+        <translation type="obsolete">X2Go istemcisinin yazdırma penceresini kapattınız.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>Bu pencereyi x2goclient ayarlar menüsünden (Menü -> Seçenekler -> Ayarlar) yeniden etkinleştirebilirsiniz</translation>
+        <translation type="obsolete">Bu pencereyi x2goclient ayarlar menüsünden (Menü -> Seçenekler -> Ayarlar) yeniden etkinleştirebilirsiniz</translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
+        <location filename="../../src/printprocess.cpp" line="170"/>
         <source>Save File</source>
         <translation>Dosyayı Kaydet</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
+        <location filename="../../src/printprocess.cpp" line="172"/>
         <source>PDF Document (*.pdf)</source>
         <translation>PDF Belgesi (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
         <source>Failed to execute command:
 </source>
         <translation>Komut çalıştırılamadı:
 </translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Printing error</source>
-        <translation>Yazdırma hatası</translation>
+        <translation type="obsolete">Yazdırma hatası</translation>
     </message>
 </context>
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Biçim</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Yazdır</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>PDF olarak görüntüle</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Yazdırma ayarları</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Yazıcı:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Varsayılan Windows PDF Görüntüleyicisini kullanarak yazdır
 (Görüntüleyici uygulaması kurulmalıdır)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Yazıcı komutu:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Görüntüleyici ayarları</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Görüntüleyici uygulamasında aç</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Komut:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Diske kaydet</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Yazdırmayı başlatmadan önce bu pencereyi göster</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
-        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</a>.</source>
-        <translation>Lütfen istemci tarafı yazdırma ayarlarını yapılandırın.<br><br>Oluşturulan dosyayı yazdırmak isterseniz harici bir uygulamaya ihtiyacınız olacak. Genellikle <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; ve <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>; kullanabilirsiniz. Ayrıntılı bilgiyi <a href="http://www.x2go.org/index.php?id=49">burada</a>; bulabilirsiniz.</tra [...]
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
+        <translation type="obsolete">Lütfen istemci tarafı yazdırma ayarlarını yapılandırın.<br><br>Oluşturulan dosyayı yazdırmak isterseniz harici bir uygulamaya ihtiyacınız olacak. Genellikle <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; ve <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>; kullanabilirsiniz. Ayrıntılı bilgiyi <a href="http://www.x2go.org/index.php?id=49& [...]
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Yazıcı komutu</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Komut</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2260,47 +2997,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Çıktı biçimi</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
-        <translation>Lütfen yazdırma dosya biçimini seçin (yazdırma ortamınızdan bağımsız olarak - eğer CUPS kullanıyorsanız PDF'yi seçebilirsiniz)</translation>
+        <translation>Lütfen yazdırma dosya biçimini seçin (yazdırma ortamınızdan bağımsız olarak - eğer CUPS kullanıyorsanız PDF'yi seçebilirsiniz)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Veri yapısı</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Lütfen dosya girdisini yazdırma yöntemini seçin (bazı komutlar dosyaları yazdırmak için program seçeneği olarak kabul ederken bazıları da standart girdiden veri bekler):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>standart girdi (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Yolu program değişkeni olarak belirtin</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2309,7 +3046,7 @@ Example:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><gsprint.exe dosyasının yolu> -query -color</translation>
     </message>
@@ -2317,135 +3054,186 @@ Example:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Uzak sunucudan yanıt alınamdı. Geçerli oturumu sonlandırmak ister misiniz?</translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>Oturum tercihleri...</translation>
+        <translation type="obsolete">Oturum tercihleri...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>Masaüstünde oturum simgesi oluştur...</translation>
+        <translation type="obsolete">Masaüstünde oturum simgesi oluştur...</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>Oturumu sil</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>Oturum eylemleri</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>Türü seçin</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>Çözünürlüğü seçin</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>Ses değiştirme desteği</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>Yeni Oturum</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>çalışıyor</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>bekletiliyor</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP bağlantısı</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>Yerel masaüstüne bağlantı</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation>Tanımlı uygulamalar</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>tam ekran</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>Göster </translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>pencere</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation>En Büyük</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>Etkin</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>Kapalı</translation>
     </message>
@@ -2453,41 +3241,51 @@ Example:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation>Geri</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation>Masa üstünde oturum simgesi oluştur</translation>
+        <translation type="obsolete">Masa üstünde oturum simgesi oluştur</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
-        <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
+        <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation>Masaüstü simgeleri x2goclient'ı göstermeyecek şekilde yapılandırılabilirler (gizli kip). Bu özelliği kullanmak isterseniz oturum açmayı gpg anahtarı veya gpg akıllı kartla yapılandırmanız gereklidir.
+        <translation type="obsolete">Masaüstü simgeleri x2goclient'ı göstermeyecek şekilde yapılandırılabilirler (gizli kip). Bu özelliği kullanmak isterseniz oturum açmayı gpg anahtarı veya gpg akıllı kartla yapılandırmanız gereklidir.
 
 x2goclient gizli kipte kullanılsın mı?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation>Çalışırken oturum tepsisinde simgeyi göster</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation>Yeni Oturum</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation>X2Go oturuma bağlı </translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Bu oturumu silmek istediğinizden emin misiniz?</translation>
     </message>
@@ -2495,38 +3293,42 @@ x2goclient gizli kipte kullanılsın mı?</translation>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>Ç&ık</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>&Yeni Oturum</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>&Oturum tercihleri</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>Oturumu &Sil</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>&Masaüstünde oturum simgesi oluştur...</translation>
+        <translation type="obsolete">&Masaüstünde oturum simgesi oluştur...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>Oturum yönetimi</translation>
     </message>
@@ -2534,237 +3336,257 @@ x2goclient gizli kipte kullanılsın mı?</translation>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>Oturum adı:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< simgeyi değiştir</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation>Yol:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>&Sunucu</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>Makine:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>Giriş:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH portu:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Ssh bağlantısı için RSA/DSA anahtarı kullan:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>Otomatik oturum açmayı dene (ssh-agent veya varsayılan ssh anahtarı)</translation>
+        <translation type="obsolete">Otomatik oturum açmayı dene (ssh-agent veya varsayılan ssh anahtarı)</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI) kimlik doğrulaması</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation>Sunucuya GSSAPI kimlik bilgileri gönderimi</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>SSH bağlantısı için vekil sunucu kullan</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation>Vekil sunucu</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation>X2Go Sunucusundaki giriş ile aynı</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation>X2Go sunucusundaki parola ile aynı</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation>RSA/DSA anahtarı:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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>
         <source>ssh-agent or default ssh key</source>
-        <translation>ssh-agent veya varsayılan ssh anahtarı</translation>
+        <translation type="obsolete">ssh-agent veya varsayılan ssh anahtarı</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation>Tür:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>&Oturum türü</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>Oturum türü:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>Windows terminal sunucusuna bağlan</translation>
+        <translation type="obsolete">Windows terminal sunucusuna bağlan</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>Yerel masaüstüne bağlan</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>kişisel masaüstü</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>Tek uygulama</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation>Tanımlı uygulamalar</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>Komut:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>Gelişmiş seçenekler...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>Çalıştırılabilir dosyanın yolu</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
         <source>Direct RDP Connection</source>
-        <translation>Doğrudan RDP Bağlantısı</translation>
+        <translation type="obsolete">Doğrudan RDP Bağlantısı</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>Anahtar dosyasını aç</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>Tüm dosyalar</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation>RDP portu:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>Resmi aç</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>Resimler</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>Sunucu:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP sunucusu:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop komut satırı seçenekleri:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>Yeni oturum</translation>
     </message>
@@ -2772,192 +3594,196 @@ x2goclient gizli kipte kullanılsın mı?</translation>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>&Göster</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="48"/>
-        <location filename="settingswidget.cpp" line="53"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>&Klavye</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="49"/>
-        <location filename="settingswidget.cpp" line="54"/>
         <source>Sound</source>
-        <translation>Ses</translation>
+        <translation type="obsolete">Ses</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="52"/>
         <source>&Clipboard Mode</source>
-        <translation>&Geçici Taşıma Panosu Kipi</translation>
+        <translation type="obsolete">&Geçici Taşıma Panosu Kipi</translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>Tam Ekran</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>Özel</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="70"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>Pencere</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="72"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>Tüm ekranı kullan</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="73"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation>Kullanılabilir en fazla alan</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="81"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>Görüntü DPI ayarla</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="86"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama eklentisi (iki veya daha fazla fiziksel ekran desteği)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="102"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>Genişlik:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="105"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>Yükseklik:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="113"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>&Ekran:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="115"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>&Tüm ekranları tanımla</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation>İki taraflı kopyalama ve yapıştırma</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation>İstemciden sunucuya kopyalayıp yapıştır</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="157"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation>Sunucudan istemciye kopyalayıp yapıştır</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="158"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation>Geçici taşıma panosunu tamamen kapat</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Auto detect keyboard settings</source>
-        <translation>Klavye ayarlarını otomatik algıla</translation>
+        <translation type="obsolete">Klavye ayarlarını otomatik algıla</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="171"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation>Klavyeyi yapılandırma</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="172"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation>Klavyeyi yapılandır</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="183"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation>Model: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="186"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation>Yerleşim düzeni: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="189"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation>Varyant: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="200"/>
         <source>Enable sound support</source>
-        <translation>Ses desteğini etkinleştir</translation>
+        <translation type="obsolete">Ses desteğini etkinleştir</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="209"/>
         <source>Start sound daemon</source>
-        <translation>Ses sürecini başlat</translation>
+        <translation type="obsolete">Ses sürecini başlat</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="211"/>
         <source>Use running sound daemon</source>
-        <translation>Çalışan ses sürecini kullan</translation>
+        <translation type="obsolete">Çalışan ses sürecini kullan</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="213"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
-        <translation>Güvenlik duvarları üzerinden ses sistemi bağlantılarını
+        <translation type="obsolete">Güvenlik duvarları üzerinden ses sistemi bağlantılarını
 tünellemek için ssh port yönlendirmesini kullanın</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="215"/>
         <source>Use default sound port</source>
-        <translation>Varsayılan ses portunu kullan</translation>
+        <translation type="obsolete">Varsayılan ses portunu kullan</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="222"/>
         <source>Sound port:</source>
-        <translation>Ses portu:</translation>
+        <translation type="obsolete">Ses portu:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="249"/>
         <source>Client side printing support</source>
-        <translation>İstemci tarafı yazdırma desteği</translation>
+        <translation type="obsolete">İstemci tarafı yazdırma desteği</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="264"/>
         <source>RDP Client</source>
-        <translation>RDP İstemcisi</translation>
+        <translation type="obsolete">RDP İstemcisi</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="276"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation>Ek parametreler:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="277"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation>Komut satırı:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="721"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>tr</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="890"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation>parola</translation>
     </message>
@@ -2965,80 +3791,88 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Klasörler</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Yol</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Otomatik bağla</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Ekle</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Sil</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Yol:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Dosya adı kodlaması</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>yerel:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>uzak:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>Güvenlik duvarları üzerinden dosya sistemi bağlantılarını tünellemek için ssh port yönlendirmesini kullanın</translation>
+        <translation type="obsolete">Güvenlik duvarları üzerinden dosya sistemi bağlantılarını tünellemek için ssh port yönlendirmesini kullanın</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Klasör seçin</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>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>
+        <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="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3046,122 +3880,194 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>bağlanamıyor </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <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="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>SSH proxy connection error</source>
-        <translation>SSH vekil sunucu bağlantı hatası</translation>
+        <translation type="obsolete">SSH vekil sunucu bağlantı hatası</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation>SSH vekil sunucu bağlantı hatası: </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
         <source>Failed to create SSH proxy tunnel</source>
-        <translation>SSH vekil tünel oluşturması başarısız oldu</translation>
+        <translation type="obsolete">SSH vekil tünel oluşturması başarısız oldu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
         <source>Can not initialize libssh</source>
-        <translation>Libssh başlatılamıyor</translation>
+        <translation type="obsolete">Libssh başlatılamıyor</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
         <source>Can not create ssh session</source>
-        <translation>Ssh oturumu başlatılamadı</translation>
+        <translation type="obsolete">Ssh oturumu başlatılamadı</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
         <source>Can not connect to proxy server</source>
-        <translation>Vekil sunucuya bağlanılamıyor</translation>
+        <translation type="obsolete">Vekil sunucuya bağlanılamıyor</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
         <source>Can not connect to </source>
-        <translation>Bağlanamıyor </translation>
+        <translation type="obsolete">Bağlanamıyor </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
         <source>Authentication failed</source>
-        <translation>Kimlik doğrulama başarısız</translation>
+        <translation type="obsolete">Kimlik doğrulama başarısız</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
         <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation>SSH İstemcisi başlatılamadı. Lütfen kurulumunuzu ve GSSApi yapılandırmasını kontrol edin</translation>
+        <translation type="obsolete">SSH İstemcisi başlatılamadı. Lütfen kurulumunuzu ve GSSApi yapılandırmasını kontrol edin</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation>GSSApi yapılandırmanızı veya kontrol edin veya başka bir kimlik doğrulaması yöntemi seçin</translation>
+        <translation type="obsolete">GSSApi yapılandırmanızı veya kontrol edin veya başka bir kimlik doğrulaması yöntemi seçin</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
         <source>Can not open file </source>
-        <translation>Dosya açılamıyor </translation>
+        <translation type="obsolete">Dosya açılamıyor </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>Uzak dosya oluşturulamıyor </translation>
+        <translation type="obsolete">Uzak dosya oluşturulamıyor </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>Uzak dosyaya yazılamıyor </translation>
+        <translation type="obsolete">Uzak dosyaya yazılamıyor </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward başarısız oldu</translation>
+        <translation type="obsolete">channel_open_forward başarısız oldu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session başarısız oldu</translation>
+        <translation type="obsolete">channel_open_session başarısız oldu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec başarısız oldu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
         <source>error writing to socket</source>
-        <translation>sokete yazarken hata</translation>
+        <translation type="obsolete">sokete yazarken hata</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
         <source>error reading channel</source>
-        <translation>kanalı okurken hata</translation>
+        <translation type="obsolete">kanalı okurken hata</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
         <source>channel_write failed</source>
-        <translation>channel_write başarısız oldu</translation>
+        <translation type="obsolete">channel_write başarısız oldu</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
         <source>error reading tcp socket</source>
-        <translation>tcp soketi okunurken hata</translation>
+        <translation type="obsolete">tcp soketi okunurken hata</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
         <source>Error creating socket</source>
-        <translation>Soket oluşturulurken hata</translation>
+        <translation type="obsolete">Soket oluşturulurken hata</translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation>Bağlama hatası </translation>
     </message>
@@ -3169,12 +4075,12 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>Dosya Aç</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>Çalıştırılabilir (*.exe)</translation>
     </message>
@@ -3182,69 +4088,74 @@ tünellemek için ssh port yönlendirmesini kullanın</translation>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Biçim</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Değişikliklerin etkin olması için X2Go İstemcisini tekrar başlatmalısınız</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>tümleşik X-Sunucusunu kullan</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation> birincil geçici taşıma panosunu kullanma</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>özel X-Sunucusunu kullan</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>özel X-Sunucusu</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>çalıştırılabilir:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>X2Go İstemcisi başladığında X-Sunucuyu başlat</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>komut satırı seçenekleri:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>X-Sunucusu komut satırı seçenekleri</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>pencere kipi:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>tam ekran kipi:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>tek uygulama:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/res/i18n/x2goclient_zh_tw.ts b/res/i18n/x2goclient_zh_tw.ts
index fbcfc1e..2adc684 100644
--- a/res/i18n/x2goclient_zh_tw.ts
+++ b/res/i18n/x2goclient_zh_tw.ts
@@ -4,77 +4,77 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
+        <location filename="../../src/ui/appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
+        <location filename="../../src/ui/appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
+        <location filename="../../src/ui/appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
+        <location filename="../../src/ui/appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
+        <location filename="../../src/appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
+        <location filename="../../src/appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
+        <location filename="../../src/appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
+        <location filename="../../src/appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
+        <location filename="../../src/appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
+        <location filename="../../src/appdialog.cpp" line="127"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
+        <location filename="../../src/appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
+        <location filename="../../src/appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
+        <location filename="../../src/appdialog.cpp" line="142"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
+        <location filename="../../src/appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
+        <location filename="../../src/appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
@@ -82,27 +82,27 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>對話框</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>舊密碼:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>新密碼:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>請再輸入一遍新密碼:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
+        <location filename="../../src/ui/brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -110,7 +110,7 @@
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
+        <location filename="../../src/brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
         <translation>密碼不相符</translation>
     </message>
@@ -118,67 +118,67 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>姓名:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>屬性</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>狀態:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>接收的工作:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>類別:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>位置:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>註解:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>閒置</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>正在列印</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>已停止</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
+        <location filename="../../src/cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>否</translation>
     </message>
@@ -186,68 +186,80 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="111"/>
         <source>No option selected</source>
         <translation type="unfinished">尚未選取任何選項</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="272"/>
+        <source>This value is in conflict with another option.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/cupsprintersettingsdialog.cpp" line="282"/>
+        <source>Options conflict.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>This value is in conflict with other option</source>
-        <translation>此設定值與其它選項衝突</translation>
+        <translation type="obsolete">此設定值與其它選項衝突</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
-        <translation>選項衝突</translation>
+        <translation type="obsolete">選項衝突</translation>
     </message>
 </context>
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
+        <location filename="../../src/ui/contest.ui" line="15"/>
         <source>Connectivity test</source>
         <translation>連線測式</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
+        <location filename="../../src/ui/contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>加密HTTP連線:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
+        <location filename="../../src/ui/contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH連線:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
+        <location filename="../../src/ui/contest.ui" line="39"/>
         <source>Connection speed:</source>
         <translation>連線速度:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="124"/>
-        <location filename="contest.ui" line="168"/>
+        <location filename="../../src/ui/contest.ui" line="124"/>
+        <location filename="../../src/ui/contest.ui" line="168"/>
         <source>Failed</source>
         <translation>失敗</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
+        <location filename="../../src/ui/contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
+        <location filename="../../src/contest.cpp" line="106"/>
+        <location filename="../../src/contest.cpp" line="113"/>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
+        <location filename="../../src/contest.cpp" line="148"/>
+        <source>Socket operation timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Socket operation timed out</source>
-        <translation>網路操作逾時</translation>
+        <translation type="obsolete">網路操作逾時</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="160"/>
-        <location filename="contest.cpp" line="166"/>
+        <location filename="../../src/contest.cpp" line="160"/>
+        <location filename="../../src/contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>失敗:</translation>
     </message>
@@ -255,162 +267,219 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="57"/>
+        <location filename="../../src/configdialog.cpp" line="59"/>
         <source>General</source>
         <translation>一般設定</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="66"/>
+        <location filename="../../src/configdialog.cpp" line="68"/>
         <source>Display icon in system tray</source>
         <translation>在系統狀態列中顯示圖示</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
+        <location filename="../../src/configdialog.cpp" line="75"/>
         <source>Hide to system tray when minimized</source>
         <translation>最小化時縮至系統狀態列</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
+        <location filename="../../src/configdialog.cpp" line="76"/>
         <source>Hide to system tray when closed</source>
         <translation>關閉時隱藏至系統狀態列</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
+        <location filename="../../src/configdialog.cpp" line="77"/>
         <source>Hide to system tray after connection is established</source>
         <translation>連線建立後隱藏至系統狀態列</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="76"/>
+        <location filename="../../src/configdialog.cpp" line="78"/>
         <source>Restore from system tray after session is disconnected</source>
         <translation>當工作階段斷線後從系統狀態列中還原</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="94"/>
+        <location filename="../../src/configdialog.cpp" line="96"/>
         <source>Use LDAP</source>
         <translation>使用LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
+        <location filename="../../src/configdialog.cpp" line="120"/>
         <source>Server URL:</source>
         <translation type="unfinished">伺服器網址:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="119"/>
+        <location filename="../../src/configdialog.cpp" line="121"/>
         <source>BaseDN:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="121"/>
+        <location filename="../../src/configdialog.cpp" line="123"/>
         <source>Failover server 1 URL:</source>
         <translation>備援伺服器網1 網址:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="123"/>
+        <location filename="../../src/configdialog.cpp" line="125"/>
         <source>Failover server 2 URL:</source>
         <translation>備援伺服器網2 網址:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="205"/>
-        <location filename="configdialog.cpp" line="350"/>
+        <location filename="../../src/configdialog.cpp" line="207"/>
+        <location filename="../../src/configdialog.cpp" line="352"/>
+        <source>X.Org Server settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="259"/>
+        <source>Clientside (local) SSH daemon port for file system export usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="357"/>
+        <source>Pulseaudio settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="359"/>
+        <source>Disable audio input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="360"/>
+        <source><font size="5">You must restart the X2Go Client for the changes to take effect</font><br><br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="569"/>
+        <source>Your XQuartz version is too old.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="570"/>
+        <source>Your are using XQuartz (X Window System Server for OS X) version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="572"/>
+        <source>.
+
+This version causes problems with X applications in 24bit color mode.
+You should update your X11 environment.
+
+MacPorts users please follow the steps outlined on:
+<center><a href="https://guide.macports.org/chunked/using.common-tasks.html">https://guide.macports.org/chunked/using.common-tasks.html</a></center>;
+
+Users who have installed XQuartz via the installer package
+can find updated versions on:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="599"/>
+        <source>No valid XQuartz application selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/configdialog.cpp" line="600"/>
+        <source>You did not select a valid XQuartz application.
+Please try again.
+
+Some standard installation locations may be:
+<center><b>/Applications/Utilities/X11.app</b></center>
+<center><b>/Applications/Utilities/XQuartz.app</b></center>
+<center><b>/Applications/MacPorts/X11.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>X-Server settings</source>
-        <translation>X伺服器設定</translation>
+        <translation type="obsolete">X伺服器設定</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="214"/>
+        <location filename="../../src/configdialog.cpp" line="216"/>
         <source>X11 application:</source>
         <translation>X11應用程式:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="225"/>
+        <location filename="../../src/configdialog.cpp" line="227"/>
         <source>X11 version:</source>
         <translation>X11版本:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="240"/>
+        <location filename="../../src/configdialog.cpp" line="242"/>
         <source>Find X11 application</source>
         <translation>尋找X11應用程式</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="257"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>檔案系統匯出時用戶端所使用的SSH連接埠:</translation>
+        <translation type="obsolete">檔案系統匯出時用戶端所使用的SSH連接埠:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="267"/>
+        <location filename="../../src/configdialog.cpp" line="269"/>
         <source>Start session embedded inside website</source>
         <translation>將工作階段嵌入至網站內</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="271"/>
-        <location filename="configdialog.cpp" line="578"/>
-        <location filename="configdialog.cpp" line="594"/>
+        <location filename="../../src/configdialog.cpp" line="273"/>
+        <location filename="../../src/configdialog.cpp" line="632"/>
+        <location filename="../../src/configdialog.cpp" line="648"/>
         <source>Advanced options</source>
         <translation>進階選項</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="301"/>
+        <location filename="../../src/configdialog.cpp" line="303"/>
         <source>Defaults</source>
         <translation>預設</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="302"/>
+        <location filename="../../src/configdialog.cpp" line="304"/>
         <source>&OK</source>
         <translation>確定(&O)</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="303"/>
+        <location filename="../../src/configdialog.cpp" line="305"/>
         <source>&Cancel</source>
         <translation>取消(&C)</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="326"/>
+        <location filename="../../src/configdialog.cpp" line="328"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="346"/>
+        <location filename="../../src/configdialog.cpp" line="348"/>
         <source>Printing</source>
         <translation>列印功能</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="514"/>
-        <location filename="configdialog.cpp" line="532"/>
-        <location filename="configdialog.cpp" line="551"/>
         <source>Warning</source>
-        <translation>警告</translation>
+        <translation type="obsolete">警告</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="515"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
-        <translation>X2Go用戶端無法找到合適的X11應用程式，請安裝Apple X11或是選擇應用程式的路徑</translation>
+        <translation type="obsolete">X2Go用戶端無法找到合適的X11應用程式，請安裝Apple X11或是選擇應用程式的路徑</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="533"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>您正在使用X11(Apple X-Window 伺服器) 版本 </translation>
+        <translation type="obsolete">您正在使用X11(Apple X-Window 伺服器) 版本 </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="535"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
-        <translation>. 此版本在24位元色彩模式時會有問題，請升級您的X11環境 (http://trac.macosforge.org/projects/xquartz).</translation>
+        <translation type="obsolete">. 此版本在24位元色彩模式時會有問題，請升級您的X11環境 (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="552"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>在您選擇的路徑中沒有合適的X11應用程式</translation>
+        <translation type="obsolete">在您選擇的路徑中沒有合適的X11應用程式</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="591"/>
+        <location filename="../../src/configdialog.cpp" line="645"/>
         <source>&Connection</source>
         <translation>連線(&C)</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="592"/>
+        <location filename="../../src/configdialog.cpp" line="646"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="593"/>
+        <location filename="../../src/configdialog.cpp" line="647"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
@@ -422,32 +491,32 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
+        <location filename="../../src/connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>連線速度(&C)</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
+        <location filename="../../src/connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>連線速度:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
+        <location filename="../../src/connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>壓縮(&o)</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
+        <location filename="../../src/connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>方式:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
+        <location filename="../../src/connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>壓縮方式:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
+        <location filename="../../src/connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>影像品質:</translation>
     </message>
@@ -455,72 +524,72 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>對話框</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>一般設定</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>頁面尺寸:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>紙張類型:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>紙張來源:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>雙面列印</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>長邊翻轉</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>短邊翻轉</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>驅動程式設定</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>選項</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>數值</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>目前沒有選取任何選項</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
+        <location filename="../../src/ui/cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>文字</translation>
     </message>
@@ -528,47 +597,47 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="59"/>
         <source>&Session</source>
         <translation>工作階段(&S)</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="60"/>
         <source>&Connection</source>
         <translation>連線(&C)</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="61"/>
         <source>&Input/Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="62"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="62"/>
         <source>&Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="64"/>
         <source>&Shared folders</source>
         <translation>共享資料夾(&S)</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="66"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="66"/>
         <source>&OK</source>
         <translation>確定(&O)</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="67"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="67"/>
         <source>&Cancel</source>
         <translation>取消(&C)</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="68"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="68"/>
         <source>Defaults</source>
         <translation>預設值</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="126"/>
+        <location filename="../../src/editconnectiondialog.cpp" line="126"/>
         <source>Session preferences - </source>
         <translation>工作階段偏好設定 - </translation>
     </message>
@@ -576,38 +645,42 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="45"/>
+        <location filename="../../src/exportdialog.cpp" line="45"/>
         <source>&Cancel</source>
         <translation>取消(&C)</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
+        <location filename="../../src/exportdialog.cpp" line="51"/>
         <source>&share</source>
         <translation>分享(&s)</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
+        <location filename="../../src/exportdialog.cpp" line="52"/>
         <source>&Preferences ...</source>
         <translation>偏好設定(&P) ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="53"/>
+        <location filename="../../src/exportdialog.cpp" line="53"/>
         <source>&Custom folder ...</source>
         <translation>自訂資料夾(&C) ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="63"/>
+        <location filename="../../src/exportdialog.cpp" line="68"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="80"/>
+        <location filename="../../src/exportdialog.cpp" line="85"/>
+        <source>Share Folders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>share folders</source>
-        <translation>共享資料夾</translation>
+        <translation type="obsolete">共享資料夾</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="146"/>
+        <location filename="../../src/exportdialog.cpp" line="151"/>
         <source>Select folder</source>
         <translation>選擇資料夾</translation>
     </message>
@@ -615,7 +688,7 @@
 <context>
     <name>FolderButton</name>
     <message>
-        <location filename="folderbutton.cpp" line="73"/>
+        <location filename="../../src/folderbutton.cpp" line="73"/>
         <source>Sessions folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -623,72 +696,72 @@
 <context>
     <name>FolderExplorer</name>
     <message>
-        <location filename="folderexplorer.ui" line="14"/>
+        <location filename="../../src/ui/folderexplorer.ui" line="14"/>
         <source>Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="77"/>
+        <location filename="../../src/folderexplorer.cpp" line="77"/>
         <source>Create New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="81"/>
-        <source>Rename Folder...</source>
+        <location filename="../../src/folderexplorer.cpp" line="81"/>
+        <source>Rename Folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="82"/>
-        <source>Change Icon...</source>
+        <location filename="../../src/folderexplorer.cpp" line="82"/>
+        <source>Change Icon ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="83"/>
-        <source>Delete Folder...</source>
+        <location filename="../../src/folderexplorer.cpp" line="83"/>
+        <source>Delete Folder ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="97"/>
+        <location filename="../../src/folderexplorer.cpp" line="97"/>
         <source>Open picture</source>
         <translation type="unfinished">開啟圖片</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="99"/>
+        <location filename="../../src/folderexplorer.cpp" line="99"/>
         <source>Pictures</source>
         <translation type="unfinished">圖片</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="112"/>
+        <location filename="../../src/folderexplorer.cpp" line="112"/>
         <source>X2Go Client</source>
         <translation type="unfinished">X2Go用戶端</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="113"/>
+        <location filename="../../src/folderexplorer.cpp" line="113"/>
         <source>Folder Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Error</source>
         <translation type="unfinished">錯誤</translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="130"/>
+        <location filename="../../src/folderexplorer.cpp" line="130"/>
         <source>Unable to remove "</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="131"/>
-        <source>". Folder is not empty. Please remove content of folder and try again.</source>
+        <location filename="../../src/folderexplorer.cpp" line="131"/>
+        <source>". Folder is not empty. Please remove the contents of this directory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="134"/>
+        <location filename="../../src/folderexplorer.cpp" line="134"/>
         <source>Delete folder "</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="folderexplorer.cpp" line="145"/>
+        <location filename="../../src/folderexplorer.cpp" line="145"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -696,7 +769,7 @@
 <context>
     <name>HelpDialog</name>
     <message>
-        <location filename="helpdialog.ui" line="14"/>
+        <location filename="../../src/ui/helpdialog.ui" line="14"/>
         <source>Options</source>
         <translation type="unfinished">選項</translation>
     </message>
@@ -712,173 +785,193 @@
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="397"/>
-        <location filename="httpbrokerclient.cpp" line="419"/>
-        <location filename="httpbrokerclient.cpp" line="439"/>
-        <location filename="httpbrokerclient.cpp" line="454"/>
-        <location filename="httpbrokerclient.cpp" line="468"/>
-        <location filename="httpbrokerclient.cpp" line="484"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="403"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="425"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="445"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="460"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="474"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="490"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="398"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>登入失敗! <br>請再試一次</translation>
+        <translation type="obsolete">登入失敗! <br>請再試一次</translation>
     </message>
     <message>
         <source>Your session was disconnected. To get access to your running session, please return to the login page or use the "reload" function of your browser.</source>
         <translation type="obsolete">您的工作階段已中斷連線。請返回登入畫面或是在瀏覽器中重新載入頁面以重新連回之前的工作階段。</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="128"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="130"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation type="unfinished">主機的SSH密鑰已經更換。
 現在的密鑰為: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="129"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation type="unfinished">由於安全性的考量，目前的連線已被中止</translation>
+        <translation type="obsolete">由於安全性的考量，目前的連線已被中止</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="142"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation type="unfinished">目前沒有找到伺服器上的主機密鑰，不過有其它類型的密鑰存在。惡意的攻擊者可能會利用改變預設的伺服器密鑰來讓您的用戶端認為原本的密鑰並不存在</translation>
+        <translation type="obsolete">目前沒有找到伺服器上的主機密鑰，不過有其它類型的密鑰存在。惡意的攻擊者可能會利用改變預設的伺服器密鑰來讓您的用戶端認為原本的密鑰並不存在</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="168"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation type="unfinished">目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation>
+        <translation type="obsolete">目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="173"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="175"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation type="unfinished">此為未知的伺服器，您要選擇信任此主機密鑰嗎?
 此公開密鑰的雜湊值為:</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
-        <location filename="httpbrokerclient.cpp" line="187"/>
         <source>Host key verification failed</source>
-        <translation type="unfinished">主機密鑰驗證任失敗</translation>
+        <translation type="obsolete">主機密鑰驗證任失敗</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>Yes</source>
         <translation type="unfinished">是</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="177"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="179"/>
         <source>No</source>
         <translation type="unfinished">否</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="203"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="205"/>
         <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="207"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="209"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="235"/>
-        <source>Authentication failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="httpbrokerclient.cpp" line="580"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="586"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>伺服使器使用了不合法的安全憑證</b><br><br></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="583"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="589"/>
         <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="httpbrokerclient.cpp" line="588"/>
-        <source>Secure connection failed</source>
+        <location filename="../../src/httpbrokerclient.cpp" line="131"/>
+        <source>For security reasons, the connection attempt will be aborted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="144"/>
+        <source>The host key for this server was not found but anothertype 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="170"/>
+        <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="179"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="189"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="237"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="404"/>
+        <source>Login failed!<br>Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="593"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="594"/>
+        <source>Secure connection failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/httpbrokerclient.cpp" line="599"/>
         <source>Issued to:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="594"/>
-        <location filename="httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="600"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="612"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
-        <location filename="httpbrokerclient.cpp" line="609"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="615"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
-        <location filename="httpbrokerclient.cpp" line="612"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="606"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="618"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="609"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="605"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="611"/>
         <source>Issued by:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="616"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="622"/>
         <source>Validity:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="617"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="623"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="618"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="624"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="619"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="625"/>
         <source>Fingerprints:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="620"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="626"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="622"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="628"/>
         <source>MD5	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="628"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="634"/>
         <source>Exit X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="630"/>
+        <location filename="../../src/httpbrokerclient.cpp" line="636"/>
         <source>Add exception</source>
         <translation type="unfinished"></translation>
     </message>
@@ -886,45 +979,45 @@ Public key hash: </source>
 <context>
     <name>MediaWidget</name>
     <message>
-        <location filename="mediawidget.cpp" line="44"/>
-        <location filename="mediawidget.cpp" line="46"/>
+        <location filename="../../src/mediawidget.cpp" line="44"/>
+        <location filename="../../src/mediawidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>聲音</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="56"/>
+        <location filename="../../src/mediawidget.cpp" line="56"/>
         <source>Enable sound support</source>
         <translation>啟用音效支援</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="65"/>
+        <location filename="../../src/mediawidget.cpp" line="65"/>
         <source>Start sound daemon</source>
         <translation>開啟聲音背景程式</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="67"/>
+        <location filename="../../src/mediawidget.cpp" line="67"/>
         <source>Use running sound daemon</source>
         <translation>使用目前的音效背景程式</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="69"/>
+        <location filename="../../src/mediawidget.cpp" line="69"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>使用SSH連接埠轉送來建立
 可通過防火牆的聲音通道</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="71"/>
+        <location filename="../../src/mediawidget.cpp" line="71"/>
         <source>Use default sound port</source>
         <translation>使用預設的聲音連接埠</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="78"/>
+        <location filename="../../src/mediawidget.cpp" line="78"/>
         <source>Sound port:</source>
         <translation>聲音連接埠:</translation>
     </message>
     <message>
-        <location filename="mediawidget.cpp" line="105"/>
+        <location filename="../../src/mediawidget.cpp" line="105"/>
         <source>Client side printing support</source>
         <translation>用戶端列印支援</translation>
     </message>
@@ -932,13 +1025,8 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="60"/>
-        <source>Starting x2goclient...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="103"/>
-        <location filename="onmainwindow.cpp" line="6699"/>
+        <location filename="../../src/onmainwindow.cpp" line="105"/>
+        <location filename="../../src/onmainwindow.cpp" line="7016"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -947,386 +1035,343 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="179"/>
+        <location filename="../../src/onmainwindow.cpp" line="188"/>
         <source>X2Go Client</source>
         <translation>X2Go用戶端</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="196"/>
-        <location filename="onmainwindow.cpp" line="3016"/>
-        <location filename="onmainwindow.cpp" line="5653"/>
+        <location filename="../../src/onmainwindow.cpp" line="209"/>
+        <location filename="../../src/onmainwindow.cpp" line="3120"/>
+        <location filename="../../src/onmainwindow.cpp" line="5957"/>
         <source>connecting</source>
         <translation>正在連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="203"/>
+        <location filename="../../src/onmainwindow.cpp" line="216"/>
         <source>Internet browser</source>
         <translation>網頁瀏覽器</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="204"/>
+        <location filename="../../src/onmainwindow.cpp" line="217"/>
         <source>Email client</source>
         <translation>電子郵件軟體</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="205"/>
+        <location filename="../../src/onmainwindow.cpp" line="218"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="206"/>
+        <location filename="../../src/onmainwindow.cpp" line="219"/>
         <source>Terminal</source>
         <translation>終端機</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="256"/>
-        <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="377"/>
+        <location filename="../../src/onmainwindow.cpp" line="400"/>
         <source>&Settings ...</source>
         <translation>設定(&S) ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="381"/>
+        <location filename="../../src/onmainwindow.cpp" line="404"/>
         <source>Support ...</source>
         <translation>支援 ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="388"/>
-        <location filename="onmainwindow.cpp" line="8099"/>
         <source>About X2GO client</source>
-        <translation>關於X2GO用戶端</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="489"/>
-        <source>Started  x2goclient.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">關於X2GO用戶端</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="551"/>
-        <location filename="onmainwindow.cpp" line="564"/>
+        <location filename="../../src/onmainwindow.cpp" line="596"/>
         <source>Can't load translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
         <source>Translator: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="556"/>
-        <location filename="onmainwindow.cpp" line="569"/>
-        <source> installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="590"/>
-        <location filename="onmainwindow.cpp" line="1105"/>
-        <location filename="onmainwindow.cpp" line="10900"/>
+        <location filename="../../src/onmainwindow.cpp" line="672"/>
         <source>Share folder...</source>
         <translation>共享資料夾...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="596"/>
-        <location filename="onmainwindow.cpp" line="1106"/>
-        <location filename="onmainwindow.cpp" line="5709"/>
-        <location filename="onmainwindow.cpp" line="11074"/>
+        <location filename="../../src/onmainwindow.cpp" line="678"/>
+        <location filename="../../src/onmainwindow.cpp" line="1189"/>
+        <location filename="../../src/onmainwindow.cpp" line="6013"/>
+        <location filename="../../src/onmainwindow.cpp" line="11558"/>
         <source>Suspend</source>
         <translation>暫停</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="599"/>
-        <location filename="onmainwindow.cpp" line="1107"/>
-        <location filename="onmainwindow.cpp" line="10913"/>
-        <location filename="onmainwindow.cpp" line="11076"/>
+        <location filename="../../src/onmainwindow.cpp" line="681"/>
+        <location filename="../../src/onmainwindow.cpp" line="1190"/>
+        <location filename="../../src/onmainwindow.cpp" line="11396"/>
+        <location filename="../../src/onmainwindow.cpp" line="11560"/>
         <source>Terminate</source>
         <translation>終止</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
+        <location filename="../../src/onmainwindow.cpp" line="683"/>
         <source>Reconnect</source>
         <translation>重新連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="605"/>
-        <location filename="onmainwindow.cpp" line="10317"/>
+        <location filename="../../src/onmainwindow.cpp" line="687"/>
+        <location filename="../../src/onmainwindow.cpp" line="10736"/>
         <source>Detach X2Go window</source>
         <translation>脫離X2Go視窗</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="608"/>
-        <location filename="onmainwindow.cpp" line="11429"/>
+        <location filename="../../src/onmainwindow.cpp" line="690"/>
+        <location filename="../../src/onmainwindow.cpp" line="12009"/>
         <source>Minimize toolbar</source>
         <translation>將工具列最小化</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="724"/>
-        <location filename="onmainwindow.cpp" line="2053"/>
-        <location filename="onmainwindow.cpp" line="8198"/>
+        <location filename="../../src/onmainwindow.cpp" line="806"/>
+        <location filename="../../src/onmainwindow.cpp" line="2151"/>
+        <location filename="../../src/onmainwindow.cpp" line="8462"/>
         <source>Session:</source>
         <translation>工作階段:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="785"/>
+        <location filename="../../src/onmainwindow.cpp" line="867"/>
         <source>&Quit</source>
         <translation>離開(&Q)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="786"/>
+        <location filename="../../src/onmainwindow.cpp" line="868"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="787"/>
-        <location filename="onmainwindow.cpp" line="1124"/>
+        <location filename="../../src/onmainwindow.cpp" line="869"/>
+        <location filename="../../src/onmainwindow.cpp" line="1207"/>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="790"/>
+        <location filename="../../src/onmainwindow.cpp" line="872"/>
         <source>&New session ...</source>
         <translation>新增工作階段(&N) ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="791"/>
+        <location filename="../../src/onmainwindow.cpp" line="873"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="796"/>
         <source>Session management...</source>
-        <translation>工作階段管理員...</translation>
+        <translation type="obsolete">工作階段管理員...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="797"/>
+        <location filename="../../src/onmainwindow.cpp" line="879"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>&Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示(&C)...</translation>
+        <translation type="obsolete">在桌面上建立工作階段圖示(&C)...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="816"/>
         <source>&Set broker password...</source>
-        <translation>設定代理伺服器密碼(&S)...</translation>
+        <translation type="obsolete">設定代理伺服器密碼(&S)...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="827"/>
         <source>&Connectivity test...</source>
-        <translation>連線能力測試(&C)...</translation>
+        <translation type="obsolete">連線能力測試(&C)...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="855"/>
+        <location filename="../../src/onmainwindow.cpp" line="916"/>
+        <location filename="../../src/onmainwindow.cpp" line="937"/>
         <source>Show toolbar</source>
         <translation>顯示工具列</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="840"/>
+        <location filename="../../src/onmainwindow.cpp" line="922"/>
         <source>About Qt</source>
         <translation>關於Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="857"/>
-        <source>Ctrl+Q</source>
-        <comment>exit</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="863"/>
+        <location filename="../../src/onmainwindow.cpp" line="941"/>
         <source>&Session</source>
         <translation>工作階段(&S)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="864"/>
+        <location filename="../../src/onmainwindow.cpp" line="944"/>
         <source>&Options</source>
         <translation>選項(&O)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="883"/>
+        <location filename="../../src/onmainwindow.cpp" line="966"/>
         <source>&Help</source>
         <translation>幫助(&H)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="922"/>
-        <location filename="onmainwindow.cpp" line="2046"/>
-        <location filename="onmainwindow.cpp" line="8191"/>
-        <location filename="onmainwindow.cpp" line="10701"/>
+        <location filename="../../src/onmainwindow.cpp" line="1005"/>
+        <location filename="../../src/onmainwindow.cpp" line="2144"/>
+        <location filename="../../src/onmainwindow.cpp" line="8455"/>
+        <location filename="../../src/onmainwindow.cpp" line="11184"/>
         <source>Login:</source>
         <translation>登入:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="972"/>
-        <location filename="onmainwindow.cpp" line="1727"/>
-        <location filename="onmainwindow.cpp" line="1756"/>
-        <location filename="onmainwindow.cpp" line="1764"/>
-        <location filename="onmainwindow.cpp" line="1912"/>
-        <location filename="onmainwindow.cpp" line="1939"/>
-        <location filename="onmainwindow.cpp" line="1942"/>
-        <location filename="onmainwindow.cpp" line="2110"/>
-        <location filename="onmainwindow.cpp" line="2290"/>
-        <location filename="onmainwindow.cpp" line="2306"/>
-        <location filename="onmainwindow.cpp" line="2320"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow.cpp" line="2399"/>
-        <location filename="onmainwindow.cpp" line="3396"/>
-        <location filename="onmainwindow.cpp" line="3596"/>
-        <location filename="onmainwindow.cpp" line="3605"/>
-        <location filename="onmainwindow.cpp" line="3954"/>
-        <location filename="onmainwindow.cpp" line="4508"/>
-        <location filename="onmainwindow.cpp" line="4589"/>
-        <location filename="onmainwindow.cpp" line="4653"/>
-        <location filename="onmainwindow.cpp" line="4683"/>
-        <location filename="onmainwindow.cpp" line="4727"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
-        <location filename="onmainwindow.cpp" line="5355"/>
-        <location filename="onmainwindow.cpp" line="6330"/>
-        <location filename="onmainwindow.cpp" line="6360"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7317"/>
-        <location filename="onmainwindow.cpp" line="7399"/>
-        <location filename="onmainwindow.cpp" line="7652"/>
-        <location filename="onmainwindow.cpp" line="7785"/>
-        <location filename="onmainwindow.cpp" line="7848"/>
-        <location filename="onmainwindow.cpp" line="8142"/>
-        <location filename="onmainwindow.cpp" line="8144"/>
-        <location filename="onmainwindow.cpp" line="8384"/>
-        <location filename="onmainwindow.cpp" line="8440"/>
-        <location filename="onmainwindow.cpp" line="8468"/>
-        <location filename="onmainwindow.cpp" line="8922"/>
-        <location filename="onmainwindow.cpp" line="8941"/>
-        <location filename="onmainwindow.cpp" line="8995"/>
-        <location filename="onmainwindow.cpp" line="9021"/>
-        <location filename="onmainwindow.cpp" line="9048"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
+        <location filename="../../src/onmainwindow.cpp" line="1825"/>
+        <location filename="../../src/onmainwindow.cpp" line="1854"/>
+        <location filename="../../src/onmainwindow.cpp" line="1862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2010"/>
+        <location filename="../../src/onmainwindow.cpp" line="2037"/>
+        <location filename="../../src/onmainwindow.cpp" line="2040"/>
+        <location filename="../../src/onmainwindow.cpp" line="2208"/>
+        <location filename="../../src/onmainwindow.cpp" line="2390"/>
+        <location filename="../../src/onmainwindow.cpp" line="2406"/>
+        <location filename="../../src/onmainwindow.cpp" line="2420"/>
+        <location filename="../../src/onmainwindow.cpp" line="2454"/>
+        <location filename="../../src/onmainwindow.cpp" line="2499"/>
+        <location filename="../../src/onmainwindow.cpp" line="3543"/>
+        <location filename="../../src/onmainwindow.cpp" line="3768"/>
+        <location filename="../../src/onmainwindow.cpp" line="3777"/>
+        <location filename="../../src/onmainwindow.cpp" line="4133"/>
+        <location filename="../../src/onmainwindow.cpp" line="4694"/>
+        <location filename="../../src/onmainwindow.cpp" line="4775"/>
+        <location filename="../../src/onmainwindow.cpp" line="4839"/>
+        <location filename="../../src/onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="4913"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
+        <location filename="../../src/onmainwindow.cpp" line="5547"/>
+        <location filename="../../src/onmainwindow.cpp" line="6639"/>
+        <location filename="../../src/onmainwindow.cpp" line="6669"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7569"/>
+        <location filename="../../src/onmainwindow.cpp" line="7651"/>
+        <location filename="../../src/onmainwindow.cpp" line="7912"/>
+        <location filename="../../src/onmainwindow.cpp" line="8048"/>
+        <location filename="../../src/onmainwindow.cpp" line="8111"/>
+        <location filename="../../src/onmainwindow.cpp" line="8406"/>
+        <location filename="../../src/onmainwindow.cpp" line="8408"/>
+        <location filename="../../src/onmainwindow.cpp" line="8740"/>
+        <location filename="../../src/onmainwindow.cpp" line="8796"/>
+        <location filename="../../src/onmainwindow.cpp" line="8824"/>
+        <location filename="../../src/onmainwindow.cpp" line="9275"/>
+        <location filename="../../src/onmainwindow.cpp" line="9294"/>
+        <location filename="../../src/onmainwindow.cpp" line="9353"/>
+        <location filename="../../src/onmainwindow.cpp" line="9381"/>
+        <location filename="../../src/onmainwindow.cpp" line="9408"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1026"/>
         <source>Operation failed</source>
         <translation>更改密碼失敗</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="947"/>
+        <location filename="../../src/onmainwindow.cpp" line="1030"/>
         <source>Password changed</source>
         <translation>密碼已更改成功</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="972"/>
+        <location filename="../../src/onmainwindow.cpp" line="1055"/>
         <source>Wrong password!</source>
         <translation>輸入了錯誤的密碼!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="976"/>
-        <location filename="onmainwindow.cpp" line="3022"/>
-        <location filename="onmainwindow.cpp" line="11601"/>
+        <location filename="../../src/onmainwindow.cpp" line="1059"/>
+        <location filename="../../src/onmainwindow.cpp" line="3144"/>
+        <location filename="../../src/onmainwindow.cpp" line="12181"/>
         <source>Connecting to broker</source>
         <translation>連線至連線代理伺服器</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1025"/>
+        <location filename="../../src/onmainwindow.cpp" line="1108"/>
         <source><b>Authentication</b></source>
         <translation><b>身份驗證</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1075"/>
+        <location filename="../../src/onmainwindow.cpp" line="1158"/>
         <source>Restore</source>
         <translation>還原</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1077"/>
-        <location filename="onmainwindow.cpp" line="5515"/>
+        <location filename="../../src/onmainwindow.cpp" line="1160"/>
+        <location filename="../../src/onmainwindow.cpp" line="5813"/>
         <source>Not connected</source>
         <translation>尚未連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1079"/>
+        <location filename="../../src/onmainwindow.cpp" line="1162"/>
         <source>Multimedia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1081"/>
+        <location filename="../../src/onmainwindow.cpp" line="1164"/>
         <source>Development</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1083"/>
+        <location filename="../../src/onmainwindow.cpp" line="1166"/>
         <source>Education</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1085"/>
+        <location filename="../../src/onmainwindow.cpp" line="1168"/>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1087"/>
+        <location filename="../../src/onmainwindow.cpp" line="1170"/>
         <source>Graphics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1089"/>
+        <location filename="../../src/onmainwindow.cpp" line="1172"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1091"/>
+        <location filename="../../src/onmainwindow.cpp" line="1174"/>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1093"/>
+        <location filename="../../src/onmainwindow.cpp" line="1176"/>
         <source>Settings</source>
         <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1095"/>
+        <location filename="../../src/onmainwindow.cpp" line="1178"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1097"/>
+        <location filename="../../src/onmainwindow.cpp" line="1180"/>
         <source>Utility</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1099"/>
+        <location filename="../../src/onmainwindow.cpp" line="1182"/>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1135"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="1308"/>
-        <source>Closing x2goclient...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="1456"/>
-        <source>Closed  x2goclient.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1913"/>
-        <location filename="onmainwindow.cpp" line="1943"/>
+        <location filename="../../src/onmainwindow.cpp" line="1826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2011"/>
+        <location filename="../../src/onmainwindow.cpp" line="2041"/>
         <source>Please check LDAP settings</source>
         <translation>請確認LDAP的設定</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1763"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>在LDAP環境中沒有找到X2Go伺服器</translation>
+        <translation type="obsolete">在LDAP環境中沒有找到X2Go伺服器</translation>
     </message>
     <message>
         <source>Create session icon on desktop</source>
@@ -1349,65 +1394,23 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">X2Go工作階段的連結</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2108"/>
+        <location filename="../../src/onmainwindow.cpp" line="2206"/>
         <source>No X2Go sessions found, closing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
-        <source>wrong value for argument"--clipboard"</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="11294"/>
-        <location filename="onmainwindow.cpp" line="11309"/>
-        <location filename="onmainwindow.cpp" line="11325"/>
-        <location filename="onmainwindow.cpp" line="11335"/>
-        <location filename="onmainwindow.cpp" line="11346"/>
+        <location filename="../../src/onmainwindow.cpp" line="11914"/>
+        <location filename="../../src/onmainwindow.cpp" line="11925"/>
         <source>SSH Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11295"/>
-        <source>SSH daemon could not be started.
-
-You'll need SSH daemon for printing and file sharing.
-
-Normally, this should not happen as X2Go Client for 
-Windows ships its internal sshd.exe.
-
-If you see this message, please report a bug against
-the X2Go bugtracker.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="11310"/>
-        <source>SSH daemon is not running.
-
-You'll need SSH daemon for printing and file sharing
-
-Please ask your system administrator to provide the SSH
-service on your computer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="11326"/>
-        <source>SSH daemon failed to open the application's public host key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="11336"/>
+        <location filename="../../src/onmainwindow.cpp" line="11915"/>
         <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="onmainwindow.cpp" line="11347"/>
-        <source>SSH daemon failed to open the application's
-authoized_keys file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>X2Go sessions not found</source>
         <translation type="obsolete">無法找到X2Go的工作</translation>
     </message>
@@ -1416,58 +1419,48 @@ authoized_keys file.</source>
         <translation type="obsolete">您確定要刪除此工作階段嗎?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2529"/>
-        <location filename="onmainwindow.cpp" line="6139"/>
+        <location filename="../../src/onmainwindow.cpp" line="2628"/>
+        <location filename="../../src/onmainwindow.cpp" line="6446"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2609"/>
+        <location filename="../../src/onmainwindow.cpp" line="2709"/>
         <source>RDP connection</source>
         <translation>RDP連線</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2613"/>
+        <location filename="../../src/onmainwindow.cpp" line="2713"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2617"/>
+        <location filename="../../src/onmainwindow.cpp" line="2717"/>
         <source>Connection to local desktop</source>
         <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2621"/>
+        <location filename="../../src/onmainwindow.cpp" line="2721"/>
         <source> on </source>
         <translation> 於 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2680"/>
+        <location filename="../../src/onmainwindow.cpp" line="2780"/>
         <source>Starting connection to server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2689"/>
+        <location filename="../../src/onmainwindow.cpp" line="2789"/>
         <source> to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2734"/>
-        <source>Connection Error(</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="2803"/>
-        <source>Couldn't find a SSH connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="2826"/>
+        <location filename="../../src/onmainwindow.cpp" line="2926"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2862"/>
+        <location filename="../../src/onmainwindow.cpp" line="2962"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>主機的SSH密鑰已經更換。
@@ -1482,466 +1475,380 @@ It is now: </source>
         <translation type="obsolete">目前沒有找到伺服器上的主機密鑰，不過有其它類型的密鑰存在。惡意的攻擊者可能會利用改變預設的伺服器密鑰來讓您的用戶端認為原本的密鑰並不存在</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2927"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation>
+        <translation type="obsolete">目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰，這個檔案將會自動被建立。</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2932"/>
+        <location filename="../../src/onmainwindow.cpp" line="3034"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>此為未知的伺服器，您要選擇信任此主機密鑰嗎?
 此公開密鑰的雜湊值為:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2867"/>
-        <location filename="onmainwindow.cpp" line="2877"/>
-        <location filename="onmainwindow.cpp" line="2894"/>
-        <location filename="onmainwindow.cpp" line="2904"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="2946"/>
         <source>Host key verification failed</source>
-        <translation>主機密鑰驗證任失敗</translation>
+        <translation type="obsolete">主機密鑰驗證任失敗</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2822"/>
+        <location filename="../../src/onmainwindow.cpp" line="2922"/>
         <source>Verification code:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2863"/>
-        <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.
-Do you want to terminate the connection?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4430"/>
-        <location filename="onmainwindow.cpp" line="4450"/>
+        <location filename="../../src/onmainwindow.cpp" line="4617"/>
+        <location filename="../../src/onmainwindow.cpp" line="4636"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
-        <location filename="onmainwindow.cpp" line="2895"/>
-        <location filename="onmainwindow.cpp" line="2936"/>
-        <location filename="onmainwindow.cpp" line="4431"/>
-        <location filename="onmainwindow.cpp" line="4451"/>
+        <location filename="../../src/onmainwindow.cpp" line="4618"/>
+        <location filename="../../src/onmainwindow.cpp" line="4637"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2883"/>
-        <location filename="onmainwindow.cpp" line="2910"/>
+        <location filename="../../src/onmainwindow.cpp" line="2984"/>
+        <location filename="../../src/onmainwindow.cpp" line="3012"/>
         <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="onmainwindow.cpp" line="2889"/>
-        <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
-For security reasons, it is recommended to stop the connection.
-Do you want to terminate the connection?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="2974"/>
+        <location filename="../../src/onmainwindow.cpp" line="3078"/>
         <source>Authentication failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2978"/>
         <source>Authentication failed</source>
-        <translation>認證失敗</translation>
+        <translation type="obsolete">認證失敗</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3366"/>
+        <location filename="../../src/onmainwindow.cpp" line="3513"/>
         <source>Enter password for SSH proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3387"/>
-        <location filename="onmainwindow.cpp" line="4582"/>
-        <location filename="onmainwindow.cpp" line="4676"/>
-        <location filename="onmainwindow.cpp" line="4709"/>
-        <location filename="onmainwindow.cpp" line="7310"/>
-        <location filename="onmainwindow.cpp" line="7392"/>
-        <location filename="onmainwindow.cpp" line="7776"/>
-        <location filename="onmainwindow.cpp" line="7841"/>
-        <location filename="onmainwindow.cpp" line="8915"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>連線失敗</b>
+        <translation type="obsolete"><b>連線失敗</b>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3390"/>
-        <location filename="onmainwindow.cpp" line="4585"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="6327"/>
-        <location filename="onmainwindow.cpp" line="6357"/>
-        <location filename="onmainwindow.cpp" line="7313"/>
-        <location filename="onmainwindow.cpp" line="7395"/>
-        <location filename="onmainwindow.cpp" line="7779"/>
-        <location filename="onmainwindow.cpp" line="7844"/>
-        <location filename="onmainwindow.cpp" line="8918"/>
+        <location filename="../../src/onmainwindow.cpp" line="3537"/>
+        <location filename="../../src/onmainwindow.cpp" line="4771"/>
+        <location filename="../../src/onmainwindow.cpp" line="4865"/>
+        <location filename="../../src/onmainwindow.cpp" line="6636"/>
+        <location filename="../../src/onmainwindow.cpp" line="6666"/>
+        <location filename="../../src/onmainwindow.cpp" line="7565"/>
+        <location filename="../../src/onmainwindow.cpp" line="7647"/>
+        <location filename="../../src/onmainwindow.cpp" line="8042"/>
+        <location filename="../../src/onmainwindow.cpp" line="8107"/>
+        <location filename="../../src/onmainwindow.cpp" line="9271"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3402"/>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="3407"/>
-        <location filename="onmainwindow.cpp" line="7791"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
-        <location filename="onmainwindow.cpp" line="7796"/>
+        <location filename="../../src/onmainwindow.cpp" line="3549"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="3554"/>
+        <location filename="../../src/onmainwindow.cpp" line="8054"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
+        <location filename="../../src/onmainwindow.cpp" line="8059"/>
         <source>Connection failed: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3405"/>
-        <location filename="onmainwindow.cpp" line="7794"/>
+        <location filename="../../src/onmainwindow.cpp" line="3552"/>
+        <location filename="../../src/onmainwindow.cpp" line="8057"/>
         <source> - Wrong password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3529"/>
+        <location filename="../../src/onmainwindow.cpp" line="3701"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3597"/>
         <source>No server availabel</source>
-        <translation>伺服器不存在l</translation>
+        <translation type="obsolete">伺服器不存在l</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3606"/>
-        <location filename="onmainwindow.cpp" line="3955"/>
-        <location filename="onmainwindow.cpp" line="4509"/>
-        <location filename="onmainwindow.cpp" line="4654"/>
         <source>Server not availabel</source>
-        <translation>伺服器不存在|</translation>
+        <translation type="obsolete">伺服器不存在|</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4227"/>
-        <location filename="onmainwindow.cpp" line="11065"/>
+        <location filename="../../src/onmainwindow.cpp" line="4410"/>
+        <location filename="../../src/onmainwindow.cpp" line="11549"/>
         <source>Select session:</source>
         <translation>請選擇工作階段:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4242"/>
-        <location filename="onmainwindow.cpp" line="4367"/>
-        <location filename="onmainwindow.cpp" line="5673"/>
+        <location filename="../../src/onmainwindow.cpp" line="4430"/>
+        <location filename="../../src/onmainwindow.cpp" line="4555"/>
+        <location filename="../../src/onmainwindow.cpp" line="5977"/>
         <source>running</source>
         <translation>正在執行中</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4244"/>
-        <location filename="onmainwindow.cpp" line="4601"/>
+        <location filename="../../src/onmainwindow.cpp" line="4432"/>
+        <location filename="../../src/onmainwindow.cpp" line="4787"/>
         <source>suspended</source>
         <translation>已暫停</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4250"/>
+        <location filename="../../src/onmainwindow.cpp" line="4438"/>
         <source>Desktop</source>
         <translation>桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4252"/>
+        <location filename="../../src/onmainwindow.cpp" line="4440"/>
         <source>single application</source>
         <translation>單一的應用程式</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4254"/>
+        <location filename="../../src/onmainwindow.cpp" line="4442"/>
         <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4287"/>
+        <location filename="../../src/onmainwindow.cpp" line="4475"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4288"/>
         <source>No accessible desktop found</source>
-        <translation>目前沒有找到可訪問的工作桌面</translation>
+        <translation type="obsolete">目前沒有找到可訪問的工作桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4301"/>
-        <location filename="onmainwindow.cpp" line="11533"/>
+        <location filename="../../src/onmainwindow.cpp" line="4489"/>
+        <location filename="../../src/onmainwindow.cpp" line="12113"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4308"/>
+        <location filename="../../src/onmainwindow.cpp" line="4496"/>
         <source>Select desktop:</source>
         <translation>請選擇工作桌面:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4417"/>
-        <location filename="onmainwindow.cpp" line="4437"/>
-        <location filename="onmainwindow.cpp" line="5385"/>
-        <location filename="onmainwindow.cpp" line="5934"/>
+        <location filename="../../src/onmainwindow.cpp" line="4605"/>
+        <location filename="../../src/onmainwindow.cpp" line="4624"/>
+        <location filename="../../src/onmainwindow.cpp" line="5577"/>
+        <location filename="../../src/onmainwindow.cpp" line="6241"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4418"/>
-        <location filename="onmainwindow.cpp" line="4438"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
-        <translation>您目前使用與x2go工作階段不同的色彩設定。可能會造成連線的不穩定，並且很可能會喪失目前的工作階段。強烈建議先將目前使用的色彩設定設為</translation>
+        <translation type="obsolete">您目前使用與x2go工作階段不同的色彩設定。可能會造成連線的不穩定，並且很可能會喪失目前的工作階段。強烈建議先將目前使用的色彩設定設為</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4426"/>
+        <location filename="../../src/onmainwindow.cpp" line="4613"/>
         <source>24 or 32</source>
         <translation>24或32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4427"/>
-        <location filename="onmainwindow.cpp" line="4447"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
-        <translation>位元並且重新啟動X-server，之後再重新連接這一個工作階段。<br>請問您無論如何都要恢復此工作階段的連線嗎?</translation>
+        <translation type="obsolete">位元並且重新啟動X-server，之後再重新連接這一個工作階段。<br>請問您無論如何都要恢復此工作階段的連線嗎?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4535"/>
+        <location filename="../../src/onmainwindow.cpp" line="4721"/>
         <source>suspending</source>
         <translation>正在暫停工作中</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4570"/>
+        <location filename="../../src/onmainwindow.cpp" line="4756"/>
         <source>terminating</source>
         <translation>正在中止工作中</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4712"/>
+        <location filename="../../src/onmainwindow.cpp" line="4898"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4867"/>
-        <location filename="onmainwindow.cpp" line="4869"/>
+        <location filename="../../src/onmainwindow.cpp" line="5053"/>
+        <location filename="../../src/onmainwindow.cpp" line="5055"/>
         <source>New session started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4906"/>
-        <location filename="onmainwindow.cpp" line="4908"/>
+        <location filename="../../src/onmainwindow.cpp" line="5092"/>
+        <location filename="../../src/onmainwindow.cpp" line="5094"/>
         <source>Session resumed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5166"/>
-        <location filename="onmainwindow.cpp" line="5170"/>
+        <location filename="../../src/onmainwindow.cpp" line="5352"/>
+        <location filename="../../src/onmainwindow.cpp" line="5356"/>
         <source>Unable to create folder: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5196"/>
-        <location filename="onmainwindow.cpp" line="5200"/>
+        <location filename="../../src/onmainwindow.cpp" line="5382"/>
+        <location filename="../../src/onmainwindow.cpp" line="5386"/>
         <source>Unable to write file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5527"/>
+        <location filename="../../src/onmainwindow.cpp" line="5825"/>
         <source>Emergency exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5536"/>
+        <location filename="../../src/onmainwindow.cpp" line="5834"/>
         <source>Waiting for proxy to exit.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5539"/>
-        <source>Failed, killing the proxy.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="7132"/>
-        <location filename="onmainwindow.cpp" line="7136"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
+        <location filename="../../src/onmainwindow.cpp" line="7449"/>
+        <location filename="../../src/onmainwindow.cpp" line="7453"/>
+        <location filename="../../src/onmainwindow.cpp" line="7458"/>
         <source>Wrong parameter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7215"/>
+        <location filename="../../src/onmainwindow.cpp" line="7467"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7245"/>
-        <source>Pack Methodes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="7275"/>
-        <location filename="onmainwindow.cpp" line="7285"/>
-        <source>Option is not availabel in this build</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="7278"/>
+        <location filename="../../src/onmainwindow.cpp" line="7530"/>
         <source>Changelog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7288"/>
+        <location filename="../../src/onmainwindow.cpp" line="7540"/>
         <source>Git Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7650"/>
         <source>Unable to create folder:</source>
-        <translation>無法創建資料夾:</translation>
+        <translation type="obsolete">無法創建資料夾:</translation>
     </message>
     <message>
         <source>Unable to write file:</source>
         <translation type="obsolete">檔案無法寫入:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5327"/>
-        <location filename="onmainwindow.cpp" line="10292"/>
+        <location filename="../../src/onmainwindow.cpp" line="5519"/>
+        <location filename="../../src/onmainwindow.cpp" line="10711"/>
         <source>Attach X2Go window</source>
         <translation>連接X2Go視窗</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5353"/>
-        <location filename="onmainwindow.cpp" line="8993"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>無法建立SSL通道:</translation>
+        <translation type="obsolete">無法建立SSL通道:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5383"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>無法建立SSL通道:
+        <translation type="obsolete">無法建立SSL通道:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5622"/>
+        <location filename="../../src/onmainwindow.cpp" line="5926"/>
         <source>Finished</source>
         <translation>已完成</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5662"/>
+        <location filename="../../src/onmainwindow.cpp" line="5966"/>
         <source>starting</source>
         <translation>正在開始</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5666"/>
+        <location filename="../../src/onmainwindow.cpp" line="5970"/>
         <source>resuming</source>
         <translation>正在還原</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5735"/>
-        <location filename="onmainwindow.cpp" line="6061"/>
-        <location filename="onmainwindow.cpp" line="6080"/>
+        <location filename="../../src/onmainwindow.cpp" line="6042"/>
+        <location filename="../../src/onmainwindow.cpp" line="6368"/>
+        <location filename="../../src/onmainwindow.cpp" line="6387"/>
         <source>Connection timeout, aborting</source>
         <translation>連線超時，中止中</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5736"/>
+        <location filename="../../src/onmainwindow.cpp" line="6043"/>
         <source>aborting</source>
         <translation>中止中</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5935"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation>
+        <translation type="obsolete">您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6029"/>
+        <location filename="../../src/onmainwindow.cpp" line="6336"/>
         <source>Session</source>
         <translation>工作階段</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6031"/>
-        <location filename="onmainwindow.cpp" line="11146"/>
-        <location filename="onmainwindow.cpp" line="11168"/>
+        <location filename="../../src/onmainwindow.cpp" line="6338"/>
+        <location filename="../../src/onmainwindow.cpp" line="11630"/>
+        <location filename="../../src/onmainwindow.cpp" line="11652"/>
         <source>Display</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6033"/>
-        <location filename="onmainwindow.cpp" line="11157"/>
+        <location filename="../../src/onmainwindow.cpp" line="6340"/>
+        <location filename="../../src/onmainwindow.cpp" line="11641"/>
         <source>Creation time</source>
         <translation>創建時間</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6324"/>
-        <location filename="onmainwindow.cpp" line="6354"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>連線失敗</b>
+        <translation type="obsolete"><b>連線失敗</b>
 :
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6849"/>
+        <location filename="../../src/onmainwindow.cpp" line="7166"/>
         <source> (can't open file)</source>
         <translation> (無法開啟檔案)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6861"/>
-        <location filename="onmainwindow.cpp" line="6872"/>
-        <location filename="onmainwindow.cpp" line="6883"/>
         <source> (file not exists)</source>
-        <translation> (檔案不存在)</translation>
+        <translation type="obsolete"> (檔案不存在)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6910"/>
         <source> (directory not exists)</source>
-        <translation> (目錄不存在)</translation>
+        <translation type="obsolete"> (目錄不存在)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6937"/>
         <source>wrong value for argument"--link"</source>
-        <translation>"--link"參數的值錯誤</translation>
+        <translation type="obsolete">"--link"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6970"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>"--sound"參數的值錯誤</translation>
+        <translation type="obsolete">"--sound"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6986"/>
-        <location filename="onmainwindow.cpp" line="6996"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>"--geometry"參數的值錯誤</translation>
+        <translation type="obsolete">"--geometry"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7013"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>"--set-kbd"參數的值錯誤</translation>
+        <translation type="obsolete">"--set-kbd"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7029"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>"--ldap"參數的值錯誤</translation>
+        <translation type="obsolete">"--ldap"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7050"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>"--ldap1"參數的值錯誤</translation>
+        <translation type="obsolete">"--ldap1"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7069"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>"--ldap2"參數的值錯誤</translation>
+        <translation type="obsolete">"--ldap2"參數的值錯誤</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7123"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>"--pack"參數的值錯誤</translation>
+        <translation type="obsolete">"--pack"參數的值錯誤</translation>
     </message>
     <message>
         <source>wrong parameter: </source>
@@ -1952,87 +1859,59 @@ Unsaved documents will be lost</source>
         <translation type="obsolete">選項</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7223"/>
         <source>Available pack methodes:</source>
-        <translation>可用的包裝方法:</translation>
+        <translation type="obsolete">可用的包裝方法:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7747"/>
+        <location filename="../../src/onmainwindow.cpp" line="8010"/>
         <source>RSA file empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7756"/>
-        <source>Can not open key: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="8074"/>
+        <location filename="../../src/onmainwindow.cpp" line="8338"/>
         <source>Support</source>
         <translation>支援</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8079"/>
-        <source></b><br> (C. 2005-2016 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="8083"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
-        <translation><br>x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助<br></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="8087"/>
-        <source><br>Client for use with 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 fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"><br>x2goplugin mode是由 <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a>提供贊助<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8100"/>
         <source><b>X2Go Client V. </source>
-        <translation><b>X2Go 客戶端 V. </translation>
+        <translation type="obsolete"><b>X2Go 客戶端 V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8145"/>
         <source>Please check LDAP Settings</source>
-        <translation>請檢查LDAP的設定</translation>
+        <translation type="obsolete">請檢查LDAP的設定</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8385"/>
         <source>No valid card found</source>
-        <translation>沒有發現合法的卡片</translation>
+        <translation type="obsolete">沒有發現合法的卡片</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8437"/>
+        <location filename="../../src/onmainwindow.cpp" line="8793"/>
         <source>Card not configured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8441"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>X2Go系統無法辨識此張卡片</translation>
+        <translation type="obsolete">X2Go系統無法辨識此張卡片</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8469"/>
+        <location filename="../../src/onmainwindow.cpp" line="8825"/>
         <source>Unable to create file: </source>
         <translation>檔案無法創建:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8757"/>
-        <source>Can't start X server
-Please check your settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Can't connect to X-Server</source>
         <translation type="obsolete">無法連接至X伺服器</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8756"/>
         <source>Can't connect to X server
 Please check your settings</source>
         <oldsource>Can't connect to X-Server
 Please check your settings</oldsource>
-        <translation type="unfinished">無法連接至X伺服器
+        <translation type="obsolete">無法連接至X伺服器
 請檢查您的設定值</translation>
     </message>
     <message>
@@ -2042,328 +1921,947 @@ Please check your settings</source>
 請檢查您的設定值</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="9428"/>
-        <location filename="onmainwindow.cpp" line="9458"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>無法啟動X伺服器
+        <translation type="obsolete">無法啟動X伺服器
 請檢查X伺服器安是否有安裝正確</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8937"/>
-        <location filename="onmainwindow.cpp" line="8942"/>
+        <location filename="../../src/onmainwindow.cpp" line="9290"/>
+        <location filename="../../src/onmainwindow.cpp" line="9295"/>
         <source>Unable to execute: </source>
         <translation>無法執行:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8967"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
-        <translation>遠端伺服器無法支援SSH通道型式的共用檔案系統，請升級至較新的X2Go伺服器板本</translation>
+        <translation type="obsolete">遠端伺服器無法支援SSH通道型式的共用檔案系統，請升級至較新的X2Go伺服器板本</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9020"/>
         <source>Unable to read :
 </source>
-        <translation>無法讀取:
+        <translation type="obsolete">無法讀取:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9047"/>
         <source>Unable to write :
 </source>
-        <translation>無法寫入:
+        <translation type="obsolete">無法寫入:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9134"/>
+        <location filename="../../src/onmainwindow.cpp" line="9497"/>
         <source>WINDOWS-1252</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9146"/>
+        <location filename="../../src/onmainwindow.cpp" line="9509"/>
         <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10106"/>
-        <source>Error getting window geometry (window closed)?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="10385"/>
+        <location filename="../../src/onmainwindow.cpp" line="10804"/>
         <source>X2Go Session</source>
         <translation>X2Go工作階段</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10586"/>
         <source>wrong value for argument"speed"</source>
-        <translation>錯誤的"speed"參數值</translation>
+        <translation type="obsolete">錯誤的"speed"參數值</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10702"/>
+        <location filename="../../src/onmainwindow.cpp" line="11185"/>
         <source>Password:</source>
         <translation>密碼:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10703"/>
+        <location filename="../../src/onmainwindow.cpp" line="11186"/>
         <source>Keyboard layout:</source>
         <translation>鑑盤佈局:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10744"/>
+        <location filename="../../src/onmainwindow.cpp" line="11227"/>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10746"/>
-        <location filename="onmainwindow.cpp" line="11069"/>
-        <location filename="onmainwindow.cpp" line="11071"/>
+        <location filename="../../src/onmainwindow.cpp" line="11229"/>
+        <location filename="../../src/onmainwindow.cpp" line="11553"/>
+        <location filename="../../src/onmainwindow.cpp" line="11555"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10883"/>
+        <location filename="../../src/onmainwindow.cpp" line="11366"/>
         <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="onmainwindow.cpp" line="593"/>
-        <location filename="onmainwindow.cpp" line="10893"/>
+        <location filename="../../src/onmainwindow.cpp" line="675"/>
         <source>Applications...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10906"/>
-        <source>Abort</source>
-        <translation>退出</translation>
+        <location filename="../../src/onmainwindow.cpp" line="61"/>
+        <source>Starting X2Go Client...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10918"/>
-        <source>Show details</source>
-        <translation>顯示細節</translation>
+        <location filename="../../src/onmainwindow.cpp" line="279"/>
+        <source>Starting X2Go Client in portable mode. Data directory is: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11067"/>
-        <source>Resume</source>
-        <translation>恢復</translation>
+        <location filename="../../src/onmainwindow.cpp" line="411"/>
+        <location filename="../../src/onmainwindow.cpp" line="8363"/>
+        <source>About X2Go Client</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11079"/>
-        <source>New</source>
-        <translation>新增</translation>
+        <location filename="../../src/onmainwindow.cpp" line="512"/>
+        <source>Started X2Go Client.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11082"/>
-        <source>Full access</source>
-        <translation>完全存取</translation>
+        <location filename="../../src/onmainwindow.cpp" line="592"/>
+        <location filename="../../src/onmainwindow.cpp" line="620"/>
+        <source> found.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11085"/>
-        <source>View only</source>
-        <translation>僅查看</translation>
+        <location filename="../../src/onmainwindow.cpp" line="605"/>
+        <source>English language requested, not loading translator.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11148"/>
-        <source>Status</source>
-        <translation>狀態</translation>
+        <location filename="../../src/onmainwindow.cpp" line="626"/>
+        <source>Non-fatal: can't load translator: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11150"/>
-        <source>Command</source>
-        <translation>指令</translation>
+        <location filename="../../src/onmainwindow.cpp" line="627"/>
+        <source>Trying to load language with lower preference, if existent.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11152"/>
-        <source>Type</source>
-        <translation>型態</translation>
+        <location filename="../../src/onmainwindow.cpp" line="878"/>
+        <source>Session management ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
-        <source>Server</source>
-        <translation>伺服器</translation>
+        <location filename="../../src/onmainwindow.cpp" line="889"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11159"/>
-        <source>Client IP</source>
-        <translation>客戶端IP</translation>
+        <location filename="../../src/onmainwindow.cpp" line="898"/>
+        <source>&Set broker password ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11161"/>
-        <source>Session ID</source>
-        <translation>工作階段識別碼</translation>
+        <location filename="../../src/onmainwindow.cpp" line="909"/>
+        <source>&Connectivity test ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11165"/>
-        <source>User</source>
-        <translation>使用者</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1188"/>
+        <location filename="../../src/onmainwindow.cpp" line="11383"/>
+        <source>Share folder ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11196"/>
-        <source>Only my desktops</source>
-        <translation>只選擇我的桌面</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1218"/>
+        <source>A left click hides or restores the window. A right click displays the context menu.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>sshd not started, you'll need sshd for printing and file sharing
-you can install sshd with
-<b>sudo apt-get install openssh-server</b></source>
-        <translation type="obsolete">SSH伺服器沒有執行起來，遠端列印與檔案共享功能需要先安裝SSH伺服器
-您可以使用下列指令來安裝SSH伺服器:
-<b>sudo apt-get install openssh-server</b></translation>
+        <location filename="../../src/onmainwindow.cpp" line="1404"/>
+        <source>Closing X2Go Client ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11417"/>
-        <source>Restore toolbar</source>
-        <translation>還原工具列</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1552"/>
+        <source>Finished X2Go Client closing hooks.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11463"/>
-        <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>
+        <location filename="../../src/onmainwindow.cpp" line="1777"/>
+        <source>Broker authentication failed!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Invalid reply from broker</source>
-        <translation type="obsolete">代理伺服器的回應不合法</translation>
+        <location filename="../../src/onmainwindow.cpp" line="1861"/>
+        <source>no X2Go Server found in LDAP </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
-        <source>Print - X2Go Client</source>
-        <translation>列印 - X2Go用戶端</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2834"/>
+        <source>Connection error: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
-        <source>Print</source>
-        <translation>列印</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2903"/>
+        <source>Couldn't find an SSH connection.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
-        <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>您已經停用X2Go用戶端的列印對話框</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2963"/>
+        <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.
+Do you want to terminate the connection?
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
-        <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>您可能需要於X2Go用戶端的設定對話框中(選單 -> 選項 -> 設定)重新啟用這個對話框</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2967"/>
+        <location filename="../../src/onmainwindow.cpp" line="2978"/>
+        <location filename="../../src/onmainwindow.cpp" line="2995"/>
+        <location filename="../../src/onmainwindow.cpp" line="3006"/>
+        <location filename="../../src/onmainwindow.cpp" line="3038"/>
+        <location filename="../../src/onmainwindow.cpp" line="3050"/>
+        <source>Host key verification failed.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
-        <source>Save File</source>
-        <translation>儲存檔案</translation>
+        <location filename="../../src/onmainwindow.cpp" line="2990"/>
+        <source>The host key for this server was not found but anothertype 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?
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
-        <source>PDF Document (*.pdf)</source>
-        <translation>PDF文件 (*.pdf)</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3029"/>
+        <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="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
-        <source>Failed to execute command:
-</source>
-        <translation>執行命令失敗:</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3082"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
-        <source>Printing error</source>
-        <translation>列印錯誤</translation>
+        <location filename="../../src/onmainwindow.cpp" line="3534"/>
+        <location filename="../../src/onmainwindow.cpp" line="4768"/>
+        <location filename="../../src/onmainwindow.cpp" line="4862"/>
+        <location filename="../../src/onmainwindow.cpp" line="4895"/>
+        <location filename="../../src/onmainwindow.cpp" line="7562"/>
+        <location filename="../../src/onmainwindow.cpp" line="7644"/>
+        <location filename="../../src/onmainwindow.cpp" line="8039"/>
+        <location filename="../../src/onmainwindow.cpp" line="8103"/>
+        <location filename="../../src/onmainwindow.cpp" line="9268"/>
+        <source><b>Connection failed.</b>
+</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
+        <location filename="../../src/onmainwindow.cpp" line="3769"/>
+        <source>No server available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="3778"/>
+        <location filename="../../src/onmainwindow.cpp" line="4134"/>
+        <location filename="../../src/onmainwindow.cpp" line="4695"/>
+        <location filename="../../src/onmainwindow.cpp" line="4840"/>
+        <source>Server not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4476"/>
+        <source>No accessible desktop found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4606"/>
+        <location filename="../../src/onmainwindow.cpp" line="4625"/>
+        <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 loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your display to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="4614"/>
+        <location filename="../../src/onmainwindow.cpp" line="4633"/>
+        <source> bits and restart your X.Org Server before you reconnect to this X2Go session.<br />Do you want to resume this session anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5545"/>
+        <source>Unable to create SSH tunnel for X2Go session (NX) startup:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5575"/>
+        <source>Unable to create SSH tunnel for audio data:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5683"/>
+        <location filename="../../src/onmainwindow.cpp" line="8668"/>
+        <source>failed to start.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5684"/>
+        <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="5698"/>
+        <source>returned a non-zero exit code or crashed otherwise.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5699"/>
+        <source>Execution failed, exit code was: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5704"/>
+        <source>didn't start up in time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5705"/>
+        <location filename="../../src/onmainwindow.cpp" line="8696"/>
+        <source>This error shouldn't come up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5709"/>
+        <location filename="../../src/onmainwindow.cpp" line="8700"/>
+        <source>didn't accept a write operation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5710"/>
+        <location filename="../../src/onmainwindow.cpp" line="5715"/>
+        <location filename="../../src/onmainwindow.cpp" line="8701"/>
+        <location filename="../../src/onmainwindow.cpp" line="8706"/>
+        <source>It is probably not running correctly or crashed in-between.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5714"/>
+        <source>Unable to read from xmodmap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5719"/>
+        <location filename="../../src/onmainwindow.cpp" line="8710"/>
+        <source>encountered an unknown error during start up or execution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5723"/>
+        <location filename="../../src/onmainwindow.cpp" line="8714"/>
+        <source>experienced an undefined error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5732"/>
+        <location filename="../../src/onmainwindow.cpp" line="8723"/>
+        <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="5837"/>
+        <source>Proxy didn't terminate after 3 seconds. Killing the proxy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5879"/>
+        <location filename="../../src/onmainwindow.cpp" line="9305"/>
+        <source>Closing X2Go Client because it was started in hidden mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="5884"/>
+        <location filename="../../src/onmainwindow.cpp" line="9310"/>
+        <source>Closing X2Go Client because the --close-disconnect parameter was passed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="6242"/>
+        <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="6633"/>
+        <location filename="../../src/onmainwindow.cpp" line="6663"/>
+        <source><b>Connection failed.</b>
+:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7178"/>
+        <location filename="../../src/onmainwindow.cpp" line="7189"/>
+        <location filename="../../src/onmainwindow.cpp" line="7200"/>
+        <source> (file does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7227"/>
+        <source> (directory does not exist)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7254"/>
+        <source>Invalid value for parameter "--link".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7271"/>
+        <source>Invalid value for parameter "--clipboard".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7287"/>
+        <source>Invalid value for parameter "--sound".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7303"/>
+        <location filename="../../src/onmainwindow.cpp" line="7313"/>
+        <source>Invalid value for parameter "--geometry".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7330"/>
+        <source>Invalid value for parameter "--set-kbd".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7346"/>
+        <source>Invalid value for parameter "--ldap".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7367"/>
+        <source>Invalid value for parameter "--ldap1".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7386"/>
+        <source>Invalid value for parameter "--ldap2".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7440"/>
+        <source>Invalid value for parameter "--pack".</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7475"/>
+        <source>Available pack methods:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7497"/>
+        <source>Pack Methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7527"/>
+        <location filename="../../src/onmainwindow.cpp" line="7537"/>
+        <source>Option is not available in this build.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="7910"/>
+        <source>Unable to create directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8019"/>
+        <source>Cannot open key: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8343"/>
+        <source><br>(C) 2005-2016 by <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing<br></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8346"/>
+        <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="8350"/>
+        <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="8364"/>
+        <source><b>X2Go Client v. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8409"/>
+        <source>Please check LDAP Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8669"/>
+        <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="8695"/>
+        <source>didn't start yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8705"/>
+        <source>Unable to read from scdaemon.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8741"/>
+        <source>No valid card found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="8797"/>
+        <source>This card is unknown to the X2Go system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9124"/>
+        <location filename="../../src/onmainwindow.cpp" line="9795"/>
+        <location filename="../../src/onmainwindow.cpp" line="9825"/>
+        <source>Can't start X.Org Server.
+Please check your installation.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9326"/>
+        <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="9351"/>
+        <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="9380"/>
+        <source>Unable to read:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="9407"/>
+        <source>Unable to write:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="10523"/>
+        <source>Error getting window geometry. (Did you close the window?)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11005"/>
+        <source>Invalid value for argument "speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11376"/>
+        <source>Applications ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11389"/>
+        <source>Abort</source>
+        <translation>退出</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11401"/>
+        <source>Show details</source>
+        <translation>顯示細節</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11551"/>
+        <source>Resume</source>
+        <translation>恢復</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11563"/>
+        <source>New</source>
+        <translation>新增</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11566"/>
+        <source>Full access</source>
+        <translation>完全存取</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11569"/>
+        <source>View only</source>
+        <translation>僅查看</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11632"/>
+        <source>Status</source>
+        <translation>狀態</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11634"/>
+        <source>Command</source>
+        <translation>指令</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11636"/>
+        <source>Type</source>
+        <translation>型態</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11638"/>
+        <source>Server</source>
+        <translation>伺服器</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11643"/>
+        <source>Client IP</source>
+        <translation>客戶端IP</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11645"/>
+        <source>Session ID</source>
+        <translation>工作階段識別碼</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11649"/>
+        <source>User</source>
+        <translation>使用者</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11680"/>
+        <source>Only my desktops</source>
+        <translation>只選擇我的桌面</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11780"/>
+        <location filename="../../src/onmainwindow.cpp" line="11783"/>
+        <source>SSH daemon could not be started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11786"/>
+        <source>SSH daemon is not running.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11790"/>
+        <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>
+
+Please also check the <b>Clientside SSH port</b> in the general settings.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11796"/>
+        <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:
+<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="11805"/>
+        <source>The SSH server failed to start.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11806"/>
+        <source>X2Go Client did not detect a globally running SSH server on your machine and was unable to start its own.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11815"/>
+        <source>The SSH server is currently not started.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11817"/>
+        <source>On OS X, please follow the following steps to enable SSH service:<ul><li>Open <b>System Preferences</b> (Applications -> System Preferences)</li><li>Go to <b>Sharing</b></li><li>Tick the checkbox besides <b>Remote Login</b></li><li>Check that <b>Allow access for:</b> is set to either:<ul><li>All users: <b>no further steps necessary</b></li><l [...]
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11835"/>
+        <source>Please ask your system administrator to provide the SSH service on your computer.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11840"/>
+        <location filename="../../src/onmainwindow.cpp" line="11902"/>
+        <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="11853"/>
+        <source>SSH daemon failed to open its public host key.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11855"/>
+        <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>
+
+The SSH server is currently not configured correctly.
+
+Please ensure that the server's public exists.
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11863"/>
+        <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:
+<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="11873"/>
+        <source>X2Go Client was unable to create SSH host keys.
+
+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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11882"/>
+        <source>On OS X, please follow these steps to generate the required keys:<ul><li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li><li>Run this command: <b>ssh -p </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11893"/>
+        <source>Please ask your system administrator to generate the required host keys.
+
+If you are administrating this system yourself, please run:
+<center><b>sudo ssh-keygen -A</b></center>
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11926"/>
+        <source>SSH daemon failed to open the application's
+authorized_keys file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sshd not started, you'll need sshd for printing and file sharing
+you can install sshd with
+<b>sudo apt-get install openssh-server</b></source>
+        <translation type="obsolete">SSH伺服器沒有執行起來，遠端列印與檔案共享功能需要先安裝SSH伺服器
+您可以使用下列指令來安裝SSH伺服器:
+<b>sudo apt-get install openssh-server</b></translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="11997"/>
+        <source>Restore toolbar</source>
+        <translation>還原工具列</translation>
+    </message>
+    <message>
+        <location filename="../../src/onmainwindow.cpp" line="12043"/>
+        <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>
+    <message>
+        <source>Invalid reply from broker</source>
+        <translation type="obsolete">代理伺服器的回應不合法</translation>
+    </message>
+</context>
+<context>
+    <name>PrintDialog</name>
+    <message>
+        <location filename="../../src/ui/printdialog.ui" line="18"/>
+        <source>Print - X2Go Client</source>
+        <translation>列印 - X2Go用戶端</translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="31"/>
+        <source>Print</source>
+        <translation>列印</translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="61"/>
+        <source>You've deactivated the X2Go Client printing dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/printdialog.cpp" line="63"/>
+        <source>You may reactivate this dialog using the X2Go Client settings dialog. To do so, follow this path in the menu bar: Options -> Settings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You've deactivated the x2go client printing dialog.</source>
+        <translation type="obsolete">您已經停用X2Go用戶端的列印對話框</translation>
+    </message>
+    <message>
+        <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
+        <translation type="obsolete">您可能需要於X2Go用戶端的設定對話框中(選單 -> 選項 -> 設定)重新啟用這個對話框</translation>
+    </message>
+</context>
+<context>
+    <name>PrintProcess</name>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="170"/>
+        <source>Save File</source>
+        <translation>儲存檔案</translation>
+    </message>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="172"/>
+        <source>PDF Document (*.pdf)</source>
+        <translation>PDF文件 (*.pdf)</translation>
+    </message>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="266"/>
+        <location filename="../../src/printprocess.cpp" line="289"/>
+        <source>Failed to execute command:
+</source>
+        <translation>執行命令失敗:</translation>
+    </message>
+    <message>
+        <location filename="../../src/printprocess.cpp" line="281"/>
+        <location filename="../../src/printprocess.cpp" line="288"/>
+        <source>Printing error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Printing error</source>
+        <translation type="obsolete">列印錯誤</translation>
+    </message>
+</context>
+<context>
+    <name>PrintWidget</name>
+    <message>
+        <location filename="../../src/ui/printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
+        <location filename="../../src/ui/printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>列印</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
+        <location filename="../../src/ui/printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>以PDF格式查看</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
+        <location filename="../../src/ui/printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>列印設定</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
+        <location filename="../../src/ui/printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>印表機:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
+        <location filename="../../src/ui/printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>以預設的Windows PDF閱讀器列印(必需要安裝閱讀器)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
+        <location filename="../../src/ui/printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>印表機指令:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
+        <location filename="../../src/ui/printwidget.ui" line="118"/>
         <source>...</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
+        <location filename="../../src/ui/printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>閱讀器設定</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
+        <location filename="../../src/ui/printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>在閱讀器程式裡開啟</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
+        <location filename="../../src/ui/printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>指令:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
+        <location filename="../../src/ui/printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>儲存到磁碟裡</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
+        <location filename="../../src/ui/printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>開始列印前先顯示此對話框</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
-        <translation>請設定您的客戶端列印設定<br><br>您會需要一個外部的程式來進行列印工作，您可以使用 <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; 以及 <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>如需進一步的資訊，請參考 <a href="http://www.x2go.org/index.php?id=49">這個網址</a>.</translation>
+        <translation type="obsolete">請設定您的客戶端列印設定<br><br>您會需要一個外部的程式來進行列印工作，您可以使用 <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; 以及 <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>如需進一步的資訊，請參考 <a href="http://www.x2go.org/index.php?id=49">這個網址</a>.</translation>
+    </message>
+    <message>
+        <location filename="../../src/printwidget.cpp" line="59"/>
+        <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a>; and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find further information <a href="http://www.x2go.org/index.php?id=49">here</a [...]
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>印表機指令</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>指令</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2374,47 +2872,47 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>輸出格式</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>請選擇您要輸出的檔案格式 (如果您是使用CUPS列印服務，您可能是使用PDF)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>數據結構</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>請選擇列印資料的輸入方式:</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>標準輸入 (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
+        <location filename="../../src/ui/printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>指定一個路徑做為程式的參數</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
+        <location filename="../../src/printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2423,7 +2921,7 @@ Example:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
+        <location filename="../../src/printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
         <translation><Path to gsprint.exe> -query -color</translation>
     </message>
@@ -2431,135 +2929,186 @@ Example:
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="78"/>
+        <location filename="../../src/ongetpass.cpp" line="78"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="161"/>
+        <source>X2Go Client could not find any suitable X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="166"/>
+        <source>X2Go Client could not start X11 server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="167"/>
+        <source>X2Go Client requires XQuartz to be installed.
+
+If XQuartz is already installed on your system,
+please select the correct path in the now upcoming dialog.
+Refer to the end of this message for path examples,
+in case you do not know the exact location yourself.
+
+Should you have <b>not</b> installed XQuartz yet, please
+follow the outlined steps:
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/x2goutils.cpp" line="179"/>
+        <source>MacPorts users, please install either the port <b>xorg-server</b>
+or the port <b>xorg-server-devel</b>.
+Upon successful installation, please follow the instructions printed
+by the port utility to autostart/load the server.
+
+All other users, please obtain and install XQuartz from:
+<center><a href="https://xquartz.macosforge.org/">https://xquartz.macosforge.org/</a></center>;
+
+Afterwards, restart X2Go Client and select the correct path
+to the X11 application in the general X2Go Client settings.
+This will most likely be
+<center><b>/Applications/MacPorts/X11.app</b></center>
+or
+<center><b>/Applications/Utilities/XQuartz.app</b></center></source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
         <source>Session preferences...</source>
-        <translation>工作階段偏好設定...</translation>
+        <translation type="obsolete">工作階段偏好設定...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="141"/>
         <source>Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示</translation>
+        <translation type="obsolete">在桌面上建立工作階段圖示</translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="137"/>
+        <source>Session preferences ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="146"/>
+        <location filename="../../src/sessionbutton.cpp" line="141"/>
+        <source>Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionbutton.cpp" line="146"/>
         <source>Delete session</source>
         <translation>刪除工作階段</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
+        <location filename="../../src/sessionbutton.cpp" line="159"/>
         <source>Session actions</source>
         <translation>工作階段動作</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="160"/>
+        <location filename="../../src/sessionbutton.cpp" line="160"/>
         <source>Select type</source>
         <translation>選擇類型</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
+        <location filename="../../src/sessionbutton.cpp" line="162"/>
         <source>Select resolution</source>
         <translation>選擇解析度</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="163"/>
+        <location filename="../../src/sessionbutton.cpp" line="163"/>
         <source>Toggle sound support</source>
         <translation>切換聲音支援</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="290"/>
+        <location filename="../../src/sessionbutton.cpp" line="290"/>
         <source>New Session</source>
         <translation>新工作階段</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="306"/>
+        <location filename="../../src/sessionbutton.cpp" line="312"/>
         <source>running</source>
         <translation>執行中</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="310"/>
+        <location filename="../../src/sessionbutton.cpp" line="316"/>
         <source>suspended</source>
         <translation>已暫停</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="344"/>
+        <location filename="../../src/sessionbutton.cpp" line="349"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="364"/>
-        <location filename="sessionbutton.cpp" line="436"/>
-        <location filename="sessionbutton.cpp" line="758"/>
+        <location filename="../../src/sessionbutton.cpp" line="369"/>
+        <location filename="../../src/sessionbutton.cpp" line="441"/>
+        <location filename="../../src/sessionbutton.cpp" line="763"/>
         <source>RDP connection</source>
         <translation>RDP連線</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="365"/>
-        <location filename="sessionbutton.cpp" line="442"/>
-        <location filename="sessionbutton.cpp" line="764"/>
+        <location filename="../../src/sessionbutton.cpp" line="370"/>
+        <location filename="../../src/sessionbutton.cpp" line="447"/>
+        <location filename="../../src/sessionbutton.cpp" line="769"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="366"/>
-        <location filename="sessionbutton.cpp" line="427"/>
-        <location filename="sessionbutton.cpp" line="752"/>
+        <location filename="../../src/sessionbutton.cpp" line="371"/>
+        <location filename="../../src/sessionbutton.cpp" line="432"/>
+        <location filename="../../src/sessionbutton.cpp" line="757"/>
         <source>Connection to local desktop</source>
         <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="367"/>
-        <location filename="sessionbutton.cpp" line="447"/>
-        <location filename="sessionbutton.cpp" line="810"/>
+        <location filename="../../src/sessionbutton.cpp" line="372"/>
+        <location filename="../../src/sessionbutton.cpp" line="452"/>
+        <location filename="../../src/sessionbutton.cpp" line="815"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="471"/>
-        <location filename="sessionbutton.cpp" line="496"/>
-        <location filename="sessionbutton.cpp" line="831"/>
+        <location filename="../../src/sessionbutton.cpp" line="476"/>
+        <location filename="../../src/sessionbutton.cpp" line="501"/>
+        <location filename="../../src/sessionbutton.cpp" line="836"/>
         <source>fullscreen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="476"/>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="843"/>
-        <location filename="sessionbutton.cpp" line="846"/>
+        <location filename="../../src/sessionbutton.cpp" line="481"/>
+        <location filename="../../src/sessionbutton.cpp" line="510"/>
+        <location filename="../../src/sessionbutton.cpp" line="514"/>
+        <location filename="../../src/sessionbutton.cpp" line="848"/>
+        <location filename="../../src/sessionbutton.cpp" line="851"/>
         <source>Display </source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="491"/>
-        <location filename="sessionbutton.cpp" line="530"/>
+        <location filename="../../src/sessionbutton.cpp" line="496"/>
+        <location filename="../../src/sessionbutton.cpp" line="535"/>
         <source>window</source>
         <translation>視窗</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="537"/>
-        <location filename="sessionbutton.cpp" line="541"/>
-        <location filename="sessionbutton.cpp" line="542"/>
-        <location filename="sessionbutton.cpp" line="837"/>
+        <location filename="../../src/sessionbutton.cpp" line="542"/>
+        <location filename="../../src/sessionbutton.cpp" line="546"/>
+        <location filename="../../src/sessionbutton.cpp" line="547"/>
+        <location filename="../../src/sessionbutton.cpp" line="842"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="549"/>
-        <location filename="sessionbutton.cpp" line="679"/>
+        <location filename="../../src/sessionbutton.cpp" line="554"/>
+        <location filename="../../src/sessionbutton.cpp" line="684"/>
         <source>Enabled</source>
         <translation>啟用</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="551"/>
-        <location filename="sessionbutton.cpp" line="681"/>
+        <location filename="../../src/sessionbutton.cpp" line="556"/>
+        <location filename="../../src/sessionbutton.cpp" line="686"/>
         <source>Disabled</source>
         <translation>停用</translation>
     </message>
@@ -2567,41 +3116,51 @@ Example:
 <context>
     <name>SessionExplorer</name>
     <message>
-        <location filename="sessionexplorer.cpp" line="49"/>
+        <location filename="../../src/sessionexplorer.cpp" line="49"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="139"/>
         <source>Create session icon on desktop</source>
-        <translation type="unfinished">在桌面上建立工作階段圖示</translation>
+        <translation type="obsolete">在桌面上建立工作階段圖示</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="140"/>
         <source>Desktop icons can be configured not to show x2goclient (hidden mode). If you like to use this feature you'll need to configure login by a gpg key or gpg smart card.
 
 Use x2goclient hidden mode?</source>
-        <translation type="unfinished">桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式，您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。
+        <translation type="obsolete">桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式，您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。
 
 是否要使用X2Go用戶端的隱藏模式?</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="150"/>
+        <location filename="../../src/sessionexplorer.cpp" line="139"/>
+        <source>Create session icon on desktop.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="140"/>
+        <source>Desktop icons can be configured not to show X2Go Client (hidden mode.) If you like to use this feature you'll need to configure login via a GPG key or GPG Smart Card.
+
+Use X2Go Client's hidden mode?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionexplorer.cpp" line="150"/>
         <source>Show session tray icon when running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="164"/>
+        <location filename="../../src/sessionexplorer.cpp" line="164"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="225"/>
+        <location filename="../../src/sessionexplorer.cpp" line="227"/>
         <source>X2Go Link to session </source>
         <translation type="unfinished">X2Go工作階段的連結</translation>
     </message>
     <message>
-        <location filename="sessionexplorer.cpp" line="361"/>
+        <location filename="../../src/sessionexplorer.cpp" line="363"/>
         <source>Are you sure you want to delete this session?</source>
         <translation type="unfinished">您確定要刪除此工作階段嗎?</translation>
     </message>
@@ -2609,38 +3168,42 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="46"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="47"/>
         <source>E&xit</source>
         <translation>離開(&x)</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="52"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="53"/>
         <source>&New session</source>
         <translation>建立新的工作階段(&N)</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="54"/>
         <source>&Session preferences</source>
         <translation>工作階段偏好設定(&S)</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="54"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="55"/>
         <source>&Delete session</source>
         <translation>刪除工作階段(&D)</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="58"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="59"/>
+        <source>&Create session icon on desktop ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示(&C)...</translation>
+        <translation type="obsolete">在桌面上建立工作階段圖示(&C)...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="92"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="93"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="120"/>
+        <location filename="../../src/sessionmanagedialog.cpp" line="121"/>
         <source>Session management</source>
         <translation>管理工作階段</translation>
     </message>
@@ -2648,237 +3211,249 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
+        <location filename="../../src/sessionwidget.cpp" line="67"/>
         <source>Session name:</source>
         <translation>工作階段名稱:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="72"/>
+        <location filename="../../src/sessionwidget.cpp" line="72"/>
         <source><< change icon</source>
         <translation><< 更換圖示</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="78"/>
+        <location filename="../../src/sessionwidget.cpp" line="78"/>
         <source>Path:</source>
         <translation type="unfinished">路徑:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="83"/>
+        <location filename="../../src/sessionwidget.cpp" line="83"/>
         <source>&Server</source>
         <translation>伺服器(&S)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
-        <location filename="sessionwidget.cpp" line="178"/>
+        <location filename="../../src/sessionwidget.cpp" line="116"/>
+        <location filename="../../src/sessionwidget.cpp" line="178"/>
         <source>Host:</source>
         <translation>主機:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="117"/>
-        <location filename="sessionwidget.cpp" line="184"/>
+        <location filename="../../src/sessionwidget.cpp" line="117"/>
+        <location filename="../../src/sessionwidget.cpp" line="184"/>
         <source>Login:</source>
         <translation>登入帳號:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="118"/>
-        <location filename="sessionwidget.cpp" line="395"/>
+        <location filename="../../src/sessionwidget.cpp" line="118"/>
+        <location filename="../../src/sessionwidget.cpp" line="395"/>
         <source>SSH port:</source>
         <translation>SSH連接埠:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="../../src/sessionwidget.cpp" line="133"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>使用RSA/DSA密鑰於SSH連線:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>嘗試自動登入 (ssh代理或預設SSH密鑰)</translation>
+        <translation type="obsolete">嘗試自動登入 (ssh代理或預設SSH密鑰)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
-        <location filename="sessionwidget.cpp" line="172"/>
+        <location filename="../../src/sessionwidget.cpp" line="141"/>
+        <location filename="../../src/sessionwidget.cpp" line="172"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI) 認證</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="142"/>
+        <location filename="../../src/sessionwidget.cpp" line="142"/>
         <source>Delegation of GSSAPI credentials to the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="146"/>
+        <location filename="../../src/sessionwidget.cpp" line="146"/>
         <source>Use Proxy server for SSH connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="147"/>
+        <location filename="../../src/sessionwidget.cpp" line="147"/>
         <source>Proxy server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
+        <location filename="../../src/sessionwidget.cpp" line="153"/>
         <source>SSH</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="154"/>
+        <location filename="../../src/sessionwidget.cpp" line="154"/>
         <source>HTTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
+        <location filename="../../src/sessionwidget.cpp" line="162"/>
         <source>Same login as on X2Go Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="164"/>
+        <location filename="../../src/sessionwidget.cpp" line="164"/>
         <source>Same password as on X2Go Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
+        <location filename="../../src/sessionwidget.cpp" line="166"/>
         <source>RSA/DSA key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="171"/>
-        <source>ssh-agent or default ssh key</source>
+        <location filename="../../src/sessionwidget.cpp" line="328"/>
+        <location filename="../../src/sessionwidget.cpp" line="443"/>
+        <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="sessionwidget.cpp" line="175"/>
+        <location filename="../../src/sessionwidget.cpp" line="175"/>
         <source>Type:</source>
         <translation type="unfinished">類別:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="179"/>
+        <location filename="../../src/sessionwidget.cpp" line="179"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="195"/>
+        <location filename="../../src/sessionwidget.cpp" line="195"/>
         <source>&Session type</source>
         <translation>工作階段類型(&S)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
+        <location filename="../../src/sessionwidget.cpp" line="200"/>
         <source>Session type:</source>
         <translation>工作階段類型:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="216"/>
-        <location filename="sessionwidget.cpp" line="519"/>
         <source>Connect to Windows terminal server</source>
-        <translation>連線至微軟終端伺服器</translation>
+        <translation type="obsolete">連線至微軟終端伺服器</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="../../src/sessionwidget.cpp" line="217"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="218"/>
+        <location filename="../../src/sessionwidget.cpp" line="218"/>
         <source>Connect to local desktop</source>
         <translation>連線至本地桌面</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
+        <location filename="../../src/sessionwidget.cpp" line="219"/>
         <source>Custom desktop</source>
         <translation>自訂桌面類型</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="220"/>
+        <location filename="../../src/sessionwidget.cpp" line="220"/>
         <source>Single application</source>
         <translation>單一應用程式</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="221"/>
+        <location filename="../../src/sessionwidget.cpp" line="221"/>
         <source>Published applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="223"/>
-        <location filename="sessionwidget.cpp" line="463"/>
+        <location filename="../../src/sessionwidget.cpp" line="223"/>
+        <location filename="../../src/sessionwidget.cpp" line="463"/>
         <source>Command:</source>
         <translation>指令:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="224"/>
+        <location filename="../../src/sessionwidget.cpp" line="224"/>
         <source>Advanced options...</source>
         <translation>進階設定...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="236"/>
-        <location filename="sessionwidget.cpp" line="776"/>
-        <location filename="sessionwidget.cpp" line="876"/>
+        <location filename="../../src/sessionwidget.cpp" line="236"/>
+        <location filename="../../src/sessionwidget.cpp" line="776"/>
+        <location filename="../../src/sessionwidget.cpp" line="876"/>
         <source>Path to executable</source>
         <translation>執行路徑</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="247"/>
-        <source>Direct RDP Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sessionwidget.cpp" line="391"/>
+        <location filename="../../src/sessionwidget.cpp" line="391"/>
         <source>RDP port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="407"/>
+        <location filename="../../src/sessionwidget.cpp" line="407"/>
         <source>Open picture</source>
         <translation>開啟圖片</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="409"/>
+        <location filename="../../src/sessionwidget.cpp" line="409"/>
         <source>Pictures</source>
         <translation>圖片</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="315"/>
-        <location filename="sessionwidget.cpp" line="430"/>
+        <location filename="../../src/sessionwidget.cpp" line="315"/>
+        <location filename="../../src/sessionwidget.cpp" line="430"/>
         <source>Open key file</source>
         <translation>開啟密鑰檔案</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="317"/>
-        <location filename="sessionwidget.cpp" line="432"/>
+        <location filename="../../src/sessionwidget.cpp" line="140"/>
+        <source>Try auto login (via SSH Agent or default SSH key)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="171"/>
+        <source>SSH Agent or default SSH key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="216"/>
+        <location filename="../../src/sessionwidget.cpp" line="519"/>
+        <source>Connect to Windows Terminal Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="247"/>
+        <source>Direct RDP connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sessionwidget.cpp" line="317"/>
+        <location filename="../../src/sessionwidget.cpp" line="432"/>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="327"/>
-        <location filename="sessionwidget.cpp" line="442"/>
+        <location filename="../../src/sessionwidget.cpp" line="327"/>
+        <location filename="../../src/sessionwidget.cpp" line="442"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="328"/>
-        <location filename="sessionwidget.cpp" line="443"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation>
+        <translation type="obsolete">X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="490"/>
-        <location filename="sessionwidget.cpp" line="730"/>
+        <location filename="../../src/sessionwidget.cpp" line="490"/>
+        <location filename="../../src/sessionwidget.cpp" line="730"/>
         <source>Server:</source>
         <translation>伺服器:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
-        <location filename="sessionwidget.cpp" line="742"/>
+        <location filename="../../src/sessionwidget.cpp" line="499"/>
+        <location filename="../../src/sessionwidget.cpp" line="742"/>
         <source>XDMCP server:</source>
         <translation>XDMCP 伺服器:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="520"/>
+        <location filename="../../src/sessionwidget.cpp" line="520"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop 指令選項:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="532"/>
-        <location filename="sessionwidget.cpp" line="754"/>
+        <location filename="../../src/sessionwidget.cpp" line="532"/>
+        <location filename="../../src/sessionwidget.cpp" line="754"/>
         <source>New session</source>
         <translation>新的工作階段</translation>
     </message>
@@ -2886,14 +3461,14 @@ Use x2goclient hidden mode?</source>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="46"/>
-        <location filename="settingswidget.cpp" line="49"/>
+        <location filename="../../src/settingswidget.cpp" line="46"/>
+        <location filename="../../src/settingswidget.cpp" line="49"/>
         <source>&Display</source>
         <translation>顯示(&D)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
+        <location filename="../../src/settingswidget.cpp" line="47"/>
+        <location filename="../../src/settingswidget.cpp" line="51"/>
         <source>&Keyboard</source>
         <translation>鍵盤(&K)</translation>
     </message>
@@ -2902,121 +3477,121 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">聲音</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
-        <source>&Clipboard Mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingswidget.cpp" line="153"/>
+        <location filename="../../src/settingswidget.cpp" line="153"/>
         <source>Bidirectional copy and paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
+        <location filename="../../src/settingswidget.cpp" line="154"/>
         <source>Copy and paste from client to server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
+        <location filename="../../src/settingswidget.cpp" line="155"/>
         <source>Copy and paste from server to client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
+        <location filename="../../src/settingswidget.cpp" line="156"/>
         <source>Disable clipboard completely</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="168"/>
-        <source>Auto detect keyboard settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingswidget.cpp" line="169"/>
+        <location filename="../../src/settingswidget.cpp" line="169"/>
         <source>Do not configure keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
+        <location filename="../../src/settingswidget.cpp" line="170"/>
         <source>Configure keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="181"/>
+        <location filename="../../src/settingswidget.cpp" line="181"/>
         <source>Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
+        <location filename="../../src/settingswidget.cpp" line="184"/>
         <source>Layout: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="187"/>
+        <location filename="../../src/settingswidget.cpp" line="187"/>
         <source>Variant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="204"/>
-        <source>RDP Client</source>
+        <location filename="../../src/settingswidget.cpp" line="50"/>
+        <source>&Clipboard mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="62"/>
+        <location filename="../../src/settingswidget.cpp" line="62"/>
         <source>Fullscreen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
+        <location filename="../../src/settingswidget.cpp" line="64"/>
         <source>Custom</source>
         <translation>自定</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
+        <location filename="../../src/settingswidget.cpp" line="66"/>
         <source>Window</source>
         <translation>視窗</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
+        <location filename="../../src/settingswidget.cpp" line="68"/>
         <source>Use whole display</source>
         <translation>使用整個顯示器</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="69"/>
+        <location filename="../../src/settingswidget.cpp" line="69"/>
         <source>Maximum available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="77"/>
+        <location filename="../../src/settingswidget.cpp" line="77"/>
         <source>Set display DPI</source>
         <translation>設定顯示DPI</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="../../src/settingswidget.cpp" line="82"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama延伸功能(支援兩個以上的螢幕)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="98"/>
+        <location filename="../../src/settingswidget.cpp" line="98"/>
         <source>Width:</source>
         <translation>寬度:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="../../src/settingswidget.cpp" line="101"/>
         <source>Height:</source>
         <translation>高度:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="109"/>
+        <location filename="../../src/settingswidget.cpp" line="109"/>
         <source>&Display:</source>
         <translation>顯示器(&D):</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="../../src/settingswidget.cpp" line="111"/>
         <source>&Identify all displays</source>
         <translation>辨認所有顯示器(&I)</translation>
     </message>
     <message>
+        <location filename="../../src/settingswidget.cpp" line="168"/>
+        <source>Auto-detect keyboard settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/settingswidget.cpp" line="204"/>
+        <source>RDP client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Keep current keyboard Settings</source>
         <translation type="obsolete">保持目前的鍵盤設定</translation>
     </message>
@@ -3059,17 +3634,17 @@ sound system connections through firewalls</source>
         <translation type="obsolete">用戶端列印支援</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="216"/>
+        <location filename="../../src/settingswidget.cpp" line="219"/>
         <source>Additional parameters:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="217"/>
+        <location filename="../../src/settingswidget.cpp" line="220"/>
         <source>Command line:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="492"/>
+        <location filename="../../src/settingswidget.cpp" line="497"/>
         <source>us</source>
         <translation>us</translation>
     </message>
@@ -3078,7 +3653,8 @@ sound system connections through firewalls</source>
         <translation type="obsolete">pc105/us</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="632"/>
+        <location filename="../../src/settingswidget.cpp" line="648"/>
+        <location filename="../../src/settingswidget.cpp" line="669"/>
         <source>password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3086,80 +3662,88 @@ sound system connections through firewalls</source>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
+        <location filename="../../src/sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>資料夾(&F)</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
+        <location filename="../../src/sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
+        <location filename="../../src/sharewidget.cpp" line="55"/>
+        <location filename="../../src/sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>自動掛載</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
+        <location filename="../../src/sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
+        <location filename="../../src/sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
+        <location filename="../../src/sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>路徑:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
+        <location filename="../../src/sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>檔案編碼方式</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
+        <location filename="../../src/sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>本地端:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
+        <location filename="../../src/sharewidget.cpp" line="89"/>
         <source>remote:</source>
         <translation>遠端:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
+        <location filename="../../src/sharewidget.cpp" line="101"/>
+        <source>Use SSH port forwarding to tunnel file system connections through firewalls</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sharewidget.cpp" line="176"/>
+        <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>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>使用SSH連接埠轉送來建立可通過防火牆的檔案系統通道</translation>
+        <translation type="obsolete">使用SSH連接埠轉送來建立可通過防火牆的檔案系統通道</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
+        <location filename="../../src/sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>選擇資料夾</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
+        <location filename="../../src/sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
-        <translation>X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation>
+        <translation type="obsolete">X2Go用戶端目前為可攜式模式，您應該要使用您的USB裝置的路徑來存取您的資料</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
+        <location filename="../../src/sharewidget.cpp" line="235"/>
+        <location filename="../../src/sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
+        <location filename="../../src/sharewidget.cpp" line="245"/>
+        <location filename="../../src/sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3167,126 +3751,158 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="403"/>
-        <source>SSH proxy connection error</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="405"/>
+        <source>SSH proxy connection error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="408"/>
-        <location filename="sshmasterconnection.cpp" line="414"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="410"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="416"/>
         <source>SSH proxy connection error: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="430"/>
-        <source>Failed to create SSH proxy tunnel</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="432"/>
+        <source>Failed to create SSH proxy tunnel.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="483"/>
-        <source>Can not initialize libssh</source>
-        <translation>libssh無法初始化</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="485"/>
+        <source>Cannot initialize libssh.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="511"/>
-        <source>Can not create ssh session</source>
-        <translation>無法建立SSH工作階段</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="513"/>
+        <source>Cannot create SSH session.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="547"/>
-        <source>Can not connect to proxy server</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="549"/>
+        <source>Cannot connect to proxy server.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="577"/>
-        <source>Can not connect to </source>
-        <translation>無法連線至 </translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="679"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="902"/>
+        <source>Authentication failed.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="677"/>
-        <location filename="sshmasterconnection.cpp" line="900"/>
-        <source>Authentication failed</source>
-        <translation>驗證失敗</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1209"/>
+        <source>Failed to start SSH client. Please check your installation and GSSApi configuration.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>channel_forward_listen failed</source>
-        <translation type="obsolete">channel_forward_listen失敗</translation>
+        <location filename="../../src/sshmasterconnection.cpp" line="1235"/>
+        <source>Check your GSSApi configuration or choose another authentication method.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1337"/>
+        <source>Cannot open file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1349"/>
+        <source>Cannot create remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1364"/>
+        <source>Cannot write to remote file </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1495"/>
+        <source>channel_open_forward failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1516"/>
+        <source>channel_open_session failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1604"/>
+        <source>Error writing to socket.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/sshmasterconnection.cpp" line="1626"/>
+        <source>Error reading channel.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1171"/>
-        <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1660"/>
+        <source>channel_write failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1197"/>
-        <source>Check your GSSApi configuration or choose another authentication method</source>
+        <location filename="../../src/sshmasterconnection.cpp" line="1676"/>
+        <source>Error reading from TCP socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1296"/>
+        <source>Can not initialize libssh</source>
+        <translation type="obsolete">libssh無法初始化</translation>
+    </message>
+    <message>
+        <source>Can not create ssh session</source>
+        <translation type="obsolete">無法建立SSH工作階段</translation>
+    </message>
+    <message>
+        <source>Can not connect to </source>
+        <translation type="obsolete">無法連線至 </translation>
+    </message>
+    <message>
+        <source>Authentication failed</source>
+        <translation type="obsolete">驗證失敗</translation>
+    </message>
+    <message>
+        <source>channel_forward_listen failed</source>
+        <translation type="obsolete">channel_forward_listen失敗</translation>
+    </message>
+    <message>
         <source>Can not open file </source>
-        <translation>無法開啟檔案</translation>
+        <translation type="obsolete">無法開啟檔案</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1308"/>
         <source>Can not create remote file </source>
-        <translation>無法創建遠端檔案</translation>
+        <translation type="obsolete">無法創建遠端檔案</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1323"/>
         <source>Can not write to remote file </source>
-        <translation>無法寫入資料至遠端檔案</translation>
+        <translation type="obsolete">無法寫入資料至遠端檔案</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="336"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="338"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="579"/>
         <source>Cannot connect to </source>
         <translation>無法連線至 </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1454"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward失敗</translation>
+        <translation type="obsolete">channel_open_forward失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1475"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session失敗</translation>
+        <translation type="obsolete">channel_open_session失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1484"/>
+        <location filename="../../src/sshmasterconnection.cpp" line="1525"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec失敗</translation>
     </message>
-    <message>
-        <location filename="sshmasterconnection.cpp" line="1563"/>
-        <source>error writing to socket</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sshmasterconnection.cpp" line="1585"/>
-        <source>error reading channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sshmasterconnection.cpp" line="1619"/>
-        <source>channel_write failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sshmasterconnection.cpp" line="1635"/>
-        <source>error reading tcp socket</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="127"/>
-        <source>Error creating socket</source>
+        <location filename="../../src/sshprocess.cpp" line="127"/>
+        <source>Error creating socket.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="145"/>
+        <location filename="../../src/sshprocess.cpp" line="145"/>
         <source>Error binding </source>
         <translation type="unfinished"></translation>
     </message>
@@ -3294,12 +3910,12 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
+        <location filename="../../src/xsettingswidget.cpp" line="53"/>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
+        <location filename="../../src/xsettingswidget.cpp" line="55"/>
         <source>Executable (*.exe)</source>
         <translation>執行檔 (*.exe)</translation>
     </message>
@@ -3307,70 +3923,75 @@ sound system connections through firewalls</source>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>表單</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <oldsource>You must restart the X2go Client for the changes to take effect</oldsource>
         <translation type="unfinished">您必需重新啟動X2go用戶端以讓設定變更生效</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>使用內建的X伺服器</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>使用自定的X伺服器</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>自定X伺服器</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>執行路徑:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>當X2Go用戶端啟動時啟動X伺服器</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="121"/>
         <source>command line options:</source>
         <translation>指令列選項:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="133"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="133"/>
         <source>X-Server command line options</source>
         <translation>X伺服器指令列選項</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="139"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="139"/>
         <source>window mode:</source>
         <translation>視窗模式:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>全螢幕模式:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
+        <location filename="../../src/ui/xsettingsui.ui" line="159"/>
         <source>single application:</source>
         <translation>單一應用程式:</translation>
     </message>
+    <message>
+        <location filename="../../src/ui/xsettingsui.ui" line="169"/>
+        <source>whole display:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[X2Go-Commits] [x2goclient] 02/02: res/i18n: update translation files.