[X2go-Commits] x2goclient.git - build-main (branch) updated: 3.99.1.0

X2go dev team git-admin at x2go.org
Wed Feb 22 14:47:39 CET 2012


The branch, build-main has been updated
       via  d090188694f638a539eddb06e7eb63731cb0e48e (commit)
       via  2220856b8ecf31845ad87ada52a6b15a814d80d6 (commit)
       via  b1010d564d2f52681513cb10006f9f217e2aa022 (commit)
       via  1026290ddc0e678bb392fefdbb4932d355a8f103 (commit)
       via  a818c32442a5016f077149c6969653a425520e74 (commit)
       via  0d08da9c4dc1633fb8e08f988a9795d5bf2de7e0 (commit)
       via  d8722816cd9866fa50d57e5d4ec6c84925782e64 (commit)
       via  28aa94929bc25f943f051a6f4f605350a5776201 (commit)
       via  f015339ec2a2dc81dc5b0f5149fb2b747b7116cb (commit)
       via  523d81c193cb7b7b666f65237caa58f6260785b7 (commit)
       via  9787ec7a53668f6763afedd956df9ab757b92a9e (commit)
       via  601d0e0da661e28907454c674a7ff2d8aba4768d (commit)
       via  970cb34e3ee63d23c3778a273f2a1fbf7e6b9c92 (commit)
       via  4f4f03c0ffd292cfeba07ae27595b4a986daf47d (commit)
       via  e1b8777e8fa05e3b9c876a53447be5e9a8c46bcf (commit)
       via  d0919e8ce551d1e168612a02ad89c3cc3064d448 (commit)
       via  c3ee597db7570594cdd39b03b74489aa73cfece1 (commit)
       via  fd6b29d2a605f0ad6942b13b6f400067b681a846 (commit)
       via  f6bd9af222fe65924c721de688c5efbb6f728db9 (commit)
       via  2e5ee710ffbcb0b03d95c9838d0ffa60d06ecaa1 (commit)
       via  373da1c16fb5cad8b9f4e77db2085b96f43270ad (commit)
       via  805d43099179261f2cdfce7b6554e4f254fd21a9 (commit)
       via  f452167a04ac8ac5a9e24b19c6ddc6ddf58382fc (commit)
       via  559ea316782420e2ffa9e7bd1585b06c5867fe50 (commit)
       via  679e516f303c22bf431170e60ee2951ef66e9c6b (commit)
       via  8e2e6e98aa3fb772a4a2543b033ea40c98bea2f6 (commit)
       via  215a52f446e11be2014f004e0e2eba64bb05e458 (commit)
       via  dc8f38983f616d615d5112af43c871f5d17122bf (commit)
       via  e7a713613d6e1dd851ea0f5bb0858db11a39d55f (commit)
       via  fd729ebae42d707e7ee10f0456cf88360009d87a (commit)
       via  3f4eab56698f439deda4cce7629aef9558a5e9ac (commit)
       via  817c331b9f53936c2e09c81d30ac07e68a74d208 (commit)
      from  0f17d81f3502f98ea5d3bd61ff19a6dd8d0e7a66 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile                                   |    4 +-
 Makefile.man2html                          |    2 +-
 VERSION                                    |    2 +-
 debian/changelog                           |   47 +
 desktop/x2goclient.desktop                 |    2 +-
 httpbrokerclient.cpp                       |    2 +-
 man/man1/x2goclient.1                      |    2 +-
 onmainwindow.cpp                           |    1 +
 onmainwindow_part2.cpp                     |   23 +-
 qt_de.qm                                   |  Bin 157137 -> 324383 bytes
 qt_fr.qm                                   |  Bin 148544 -> 250220 bytes
 qt_ru.qm                                   |  Bin 60815 -> 273707 bytes
 qt_sv.qm                                   |  Bin 0 -> 65848 bytes
 qt_zh_tw.qm                                |  Bin 0 -> 117253 bytes
 resources.rcc                              |    7 +-
 sshmasterconnection.cpp                    |   11 +-
 sshprocess.h                               |    1 +
 version.h                                  |    2 +-
 x2goclient.pro                             |    3 +
 x2goclient_de.qm                           |  Bin 44873 -> 0 bytes
 x2goclient_de.ts                           | 1072 ++++++++-------
 x2goclient_fr.ts => x2goclient_en.ts       | 1143 +++++++++--------
 x2goclient_fr.qm                           |    1 -
 x2goclient_fr.ts                           |  880 +++++++------
 x2goclient_zh_tw.ts => x2goclient_nb_no.ts | 2020 +++++++++++++++-------------
 x2goclient_ru.qm                           |  Bin 43127 -> 0 bytes
 x2goclient_ru.ts                           |  878 +++++++------
 x2goclient_zh_tw.ts => x2goclient_sv.ts    | 1122 ++++++++--------
 x2goclient_zh_tw.qm                        |  Bin 35103 -> 0 bytes
 x2goclient_zh_tw.ts                        |  209 ++--
 x2goplugin.rc                              |   10 +-
 31 files changed, 4047 insertions(+), 3397 deletions(-)
 create mode 100644 qt_sv.qm
 create mode 100644 qt_zh_tw.qm
 delete mode 100644 x2goclient_de.qm
 copy x2goclient_fr.ts => x2goclient_en.ts (73%)
 delete mode 100644 x2goclient_fr.qm
 copy x2goclient_zh_tw.ts => x2goclient_nb_no.ts (56%)
 delete mode 100644 x2goclient_ru.qm
 copy x2goclient_zh_tw.ts => x2goclient_sv.ts (67%)
 delete mode 100644 x2goclient_zh_tw.qm

The diff of changes is:
diff --git a/Makefile b/Makefile
index 57ca900..5831516 100755
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,17 @@ all: build
 build: build_client build_plugin build_man
 
 build_client:
+	lrelease-qt4 x2goclient.pro
 	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro
 	cd $(CLIENT_DIR) && $(MAKE)
 
 build_plugin:
+	lrelease-qt4 x2goclient.pro
 	mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro
 	cd $(PLUGIN_DIR) && $(MAKE)
 
 build_man:
-	make -f Makefile.man2html build
+	${MAKE} -f Makefile.man2html build
 
 clean: clean_client clean_plugin clean_man
 	find . -type f -name '*.o' -exec rm -vf {} +
diff --git a/Makefile.man2html b/Makefile.man2html
index 97af6fe..abe7a32 100644
--- a/Makefile.man2html
+++ b/Makefile.man2html
@@ -14,7 +14,7 @@ build: build_man2html
 build_man2html:
 	mkdir -p $(MAN2HTML_DEST)
 	for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
-	for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+	for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
 
 clean: clean_man2html
 
diff --git a/VERSION b/VERSION
index 3504bc8..57055b8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.0.6
+3.99.1.0
diff --git a/debian/changelog b/debian/changelog
index 15c6e43..d81863d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+x2goclient (3.99.1.0-0~x2go1) UNRELEASED; urgency=low
+
+  [ Mike Gabriel ]
+  * New upstream version (3.99.1.0):
+    - Update German translation file (thanks to Stefan Baur).
+    - Build .qm translation files on the fly during build.
+    - Fix for zh_TW translation: add qt_zh_TW.qm file from Qt4.8.
+    - Add language property to the French translation file.
+    - Update qt_<LANG>.qm files from Qt4.8 (as in current Debian sid).
+    - Rename x2goclient_nb.ts to x2goclient_nb_no.ts.
+    - Update all translation files (lupdate), translate unfinished translation
+      tags in x2goclient_de.ts.
+    - Provide empty translation file x2goclient_en.ts.
+    - Fix misspelled word ,,Authentification'' -> ,,Authentication''.
+    - Fix misspelled word ,,recieved'' -> ,,received''.
+    - Update date and release version in man page.
+
+  [ Mihai Moldovan ]
+  * New upstream version (3.99.1.0):
+    - Mac OS patch: Raise the stack space to 2MB for secondary threads. It
+      previously used the 512KB system default.
+
+  [ Daniel Lindgren ]
+  * New upstream version (3.99.1.0):
+    - Add Swedish translation file.
+    - Fine-tune Swedish translation file.
+
+  [ Terje Andersen ]
+  * New upstream version (3.99.1.0):
+    - Add Norwegian (Bokmal) translation. Qt4 lacks Norwegian/Bokmal
+      support, so some of the widgets may stay in English.
+    - Fine-tune/fix Norwegian (Bokmal) translation.
+
+  [ Jan Engelhardt ]
+  * New upstream version (3.99.1.0):
+    - Use /cgi-bin/man/ path in web'ified man pages.
+    - Use ,,${MAKE}'' instead of ,,make'' in Makefile.
+    - Include <netinet/in.h> in sshprocess.h to fix missing
+      struct sockaddr_in.
+
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.99.1.0):
+    - Get new ports from x2goresume-session if reserved ports are busy
+    - Fix segmentation fault by failed SSH connection to X2Go server
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 14:07:55 +0100
+
 x2goclient (3.99.0.6-0~x2go1) unstable; urgency=low
 
   [ Oleksandr Shneyder ]
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index 477577b..ba3e4ac 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=3.99.0.6
+Version=3.99.1.0
 Type=Application
 Name=X2Go Client
 Exec=/usr/bin/x2goclient
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index ed05fd8..8402e0c 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -314,7 +314,7 @@ void HttpBrokerClient::slotRequestFinished ( int id, bool error )
     {
         
         //x2goDebug<<"cmd request answer: "<<answer;
-	x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"recieved:"<<httpSessionAnswer.size()<<endl;
+	x2goDebug<<"elapsed: "<<requestTime.elapsed()<<"received:"<<httpSessionAnswer.size()<<endl;
 	emit connectionTime(requestTime.elapsed(),httpSessionAnswer.size());
         return;
     }
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index f4c98c8..bedddfb 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goclient 1 "July 2011" "Version 3.99.0.x" "X2Go Client (Qt4)"
+.TH x2goclient 1 "Feb 2012" "Version 3.99.1.x" "X2Go Client (Qt4)"
 .SH NAME
 x2goclient \- Client application to launch server-side X2Go sessions.
 .SH SYNOPSIS
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index f583283..a543ce1 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -2601,6 +2601,7 @@ void ONMainWindow::slotSshConnectionError ( QString message, QString lastSession
 {
     if ( sshConnection )
     {
+        sshConnection->wait();
         delete sshConnection;
         sshConnection=0l;
     }
diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp
index 6201f5b..7d1a206 100644
--- a/onmainwindow_part2.cpp
+++ b/onmainwindow_part2.cpp
@@ -143,7 +143,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error )
         sshConnection=0l;
     }
 
-    QMessageBox::critical ( 0l,tr ( "Authentification failed" ),error,
+    QMessageBox::critical ( 0l,tr ( "Authentication failed" ),error,
                             QMessageBox::Ok,
                             QMessageBox::NoButton );
 // 	currentKey=QString::null;
@@ -1553,7 +1553,28 @@ void ONMainWindow::slotRetResumeSess ( bool result,
         }
     }
     else
+    {
         host=resumingSession.server;
+        QStringList outputLines=output.split("\n",QString::SkipEmptyParts);
+        foreach(QString line,outputLines)
+        {
+            if (line.indexOf("gr_port=")!=-1)
+            {
+                resumingSession.grPort=line.replace("gr_port=","");
+                x2goDebug<<"new gr_port: "<<resumingSession.grPort<<endl;
+            }
+            if (line.indexOf("sound_port=")!=-1)
+            {
+                resumingSession.sndPort=line.replace("sound_port=","");
+                x2goDebug<<"new sound_port: "<<resumingSession.sndPort<<endl;
+            }
+            if (line.indexOf("fs_port=")!=-1)
+            {
+                resumingSession.fsPort=line.replace("fs_port=","");
+                x2goDebug<<"new fs_port: "<<resumingSession.fsPort<<endl;
+            }
+        }
+    }
     if ( !useLdap )
     {
         if ( !embedMode )
diff --git a/qt_de.qm b/qt_de.qm
index 6b76d7b..f1cb034 100644
Binary files a/qt_de.qm and b/qt_de.qm differ
diff --git a/qt_fr.qm b/qt_fr.qm
index 5553086..a81ddc7 100644
Binary files a/qt_fr.qm and b/qt_fr.qm differ
diff --git a/qt_ru.qm b/qt_ru.qm
index 63b7b8b..1ee686f 100644
Binary files a/qt_ru.qm and b/qt_ru.qm differ
diff --git a/qt_sv.qm b/qt_sv.qm
new file mode 100644
index 0000000..f3556bc
Binary files /dev/null and b/qt_sv.qm differ
diff --git a/qt_zh_tw.qm b/qt_zh_tw.qm
new file mode 100644
index 0000000..a9a25b2
Binary files /dev/null and b/qt_zh_tw.qm differ
diff --git a/resources.rcc b/resources.rcc
index 795cc0f..e3b6a5e 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -62,12 +62,17 @@
        <file>icons/16x16/rdp.png</file>
        <file>txt/packs</file>
        <file>txt/encodings</file>
+       <file>x2goclient_en.qm</file>
        <file>x2goclient_de.qm</file>
-       <file>x2goclient_ru.qm</file>
        <file>x2goclient_fr.qm</file>
+       <file>x2goclient_nb_no.qm</file>
+       <file>x2goclient_sv.qm</file>
+       <file>x2goclient_ru.qm</file>
        <file>x2goclient_zh_tw.qm</file>
        <file>qt_de.qm</file>
        <file>qt_ru.qm</file>
        <file>qt_fr.qm</file>
+       <file>qt_sv.qm</file>
+       <file>qt_zh_tw.qm</file>
    </qresource>
 </RCC>
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index c922af2..2626346 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -46,6 +46,11 @@ static bool isLibSshInited=false;
 SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user,
         QString pass, QString key,bool autologin, bool krblogin, QObject* parent ) : QThread ( parent )
 {
+#if defined ( Q_OS_DARWIN )
+    // Mac OS X provides only 512KB stack space for secondary threads.
+    // As we put a 512KB buffer on the stack later on, we need a bigger stack space.
+    setStackSize (sizeof (char) * 1024 * 1024 * 2);
+#endif
     this->host=host;
     this->port=port;
     this->user=user;
@@ -62,7 +67,7 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn
     else
         x2goDebug<<"starting ssh connection without kerberos authentication"<<endl;
 #endif
-kerberos=false;
+    kerberos=false;
 }
 
 SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUnknownServers, QString user,
@@ -70,7 +75,9 @@ SshMasterConnection::SshMasterConnection ( QString host, int port, bool acceptUn
         int remotePort, QString localHost, int localPort, SshProcess* creator,
         QObject* parent, ONMainWindow* mwd ) : QThread ( parent )
 {
-
+#if defined ( Q_OS_DARWIN )
+    setStackSize (sizeof (char) * 1024 * 1024 * 2);
+#endif
     this->host=host;
     this->port=port;
     this->user=user;
diff --git a/sshprocess.h b/sshprocess.h
index 567bff9..9d7a2b1 100644
--- a/sshprocess.h
+++ b/sshprocess.h
@@ -22,6 +22,7 @@
 #ifndef SSHPROCESS_H
 #define SSHPROCESS_H
 
+#include <netinet/in.h>
 #include <libssh/libssh.h>
 #include <QObject>
 
diff --git a/version.h b/version.h
index 77743ab..00471b6 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "3.99.0.6"
+#define VERSION "3.99.1.0"
diff --git a/x2goclient.pro b/x2goclient.pro
index 8c71ee3..5c96688 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -12,8 +12,11 @@ CONFIG += $$(X2GO_LINUX_STATIC)
 
 FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmddialog.ui printwidget.ui xsettingsui.ui brokerpassdialog.ui contest.ui
 
+TRANSLATIONS += x2goclient_en.ts 
 TRANSLATIONS += x2goclient_de.ts 
 TRANSLATIONS += x2goclient_ru.ts 
+TRANSLATIONS += x2goclient_nb_no.ts 
+TRANSLATIONS += x2goclient_sv.ts 
 TRANSLATIONS += x2goclient_fr.ts 
 TRANSLATIONS += x2goclient_zh_tw.ts
 HEADERS += configdialog.h \
diff --git a/x2goclient_de.qm b/x2goclient_de.qm
deleted file mode 100644
index 03d7acc..0000000
Binary files a/x2goclient_de.qm and /dev/null differ
diff --git a/x2goclient_de.ts b/x2goclient_de.ts
index 37176b3..09baf25 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_de.ts
@@ -6,27 +6,27 @@
     <message>
         <location filename="brokerpassdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation type="unfinished">Dialog</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="22"/>
         <source>Old password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Altes Kennwort:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="36"/>
         <source>New password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Kennwort:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="50"/>
         <source>Confirm password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kennwort wiederholen:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="79"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>TextLabel</translation>
     </message>
 </context>
 <context>
@@ -34,7 +34,7 @@
     <message>
         <location filename="brokerpassdlg.cpp" line="41"/>
         <source>Passwords do not match</source>
-        <translation type="unfinished"></translation>
+        <translation>Kennwörter stimmen nicht überein</translation>
     </message>
 </context>
 <context>
@@ -124,6 +124,57 @@
     </message>
 </context>
 <context>
+    <name>ConTest</name>
+    <message>
+        <location filename="contest.ui" line="14"/>
+        <source>Connectivity test</source>
+        <translation>Verbindungstest</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="24"/>
+        <source>HTTPS connection:</source>
+        <translation>HTTPS-Verbindung:</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="31"/>
+        <source>SSH connection:</source>
+        <translation>SSH-Verbindung:</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="38"/>
+        <source>Connection speed:</source>
+        <translation>Verbindungsgeschwindigkeit:</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="123"/>
+        <location filename="contest.ui" line="167"/>
+        <source>Failed</source>
+        <translation>Fehlgeschlagen</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="211"/>
+        <source>0 Kb/s</source>
+        <translation>0 Kb/s</translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="108"/>
+        <location filename="contest.cpp" line="115"/>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="150"/>
+        <source>Socket operation timed out</source>
+        <translation>Zeitüberschreibung bei Socket-Operation</translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="162"/>
+        <location filename="contest.cpp" line="168"/>
+        <source>Failed: </source>
+        <translation>Fehlgeschlagen: </translation>
+    </message>
+</context>
+<context>
     <name>ConfigDialog</name>
     <message>
         <location filename="configdialog.cpp" line="87"/>
@@ -240,7 +291,7 @@
     </message>
     <message>
         <source>Clientside SSH Port For File System Export Usage:</source>
-        <translation type="obsolete">SSH Port für die Dateisystemfreigabe auf Clientseite:</translation>
+        <translation type="obsolete">SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation>
     </message>
     <message>
         <source>LDAP settings</source>
@@ -280,7 +331,7 @@
     <message>
         <location filename="configdialog.cpp" line="250"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>SSH Port für die Dateisystemfreigabe auf Clientseite:</translation>
+        <translation>SSH-Port für die Dateisystemfreigabe auf Clientseite:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="50"/>
@@ -501,7 +552,7 @@
     </message>
     <message>
         <source>Use RSA/DSA key for ssh connection:</source>
-        <translation type="obsolete">RSA/DSA Schlüssel verwenden (ssh):</translation>
+        <translation type="obsolete">RSA-/DSA-Schlüssel verwenden (ssh):</translation>
     </message>
     <message>
         <source>&Desktop Session</source>
@@ -641,7 +692,7 @@
     </message>
     <message>
         <source>SSH Port:</source>
-        <translation type="obsolete">SSH Port:</translation>
+        <translation type="obsolete">SSH-Port:</translation>
     </message>
     <message>
         <source>Path to executable</source>
@@ -666,7 +717,7 @@
     </message>
     <message>
         <source>SSH port:</source>
-        <translation type="obsolete">SSH Port:</translation>
+        <translation type="obsolete">SSH-Port:</translation>
     </message>
     <message>
         <source>&Session type</source>
@@ -727,7 +778,7 @@
     <message>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
-        <translation type="obsolete">Benutze Port Weiterleitung über Tunnel
+        <translation type="obsolete">Benutze Port-Weiterleitung über Tunnel
  um Audiosignale über Firewalls zu verbinden</translation>
     </message>
     <message>
@@ -740,7 +791,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation type="obsolete">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>
         <source>New session</source>
@@ -842,125 +893,125 @@ sound system connections through firewalls</source>
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="164"/>
+        <location filename="httpbrokerclient.cpp" line="178"/>
         <source>us</source>
         <translation>de</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="167"/>
+        <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
         <translation>pc105/de</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="294"/>
         <location filename="httpbrokerclient.cpp" line="308"/>
-        <location filename="httpbrokerclient.cpp" line="345"/>
+        <location filename="httpbrokerclient.cpp" line="328"/>
+        <location filename="httpbrokerclient.cpp" line="365"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="309"/>
+        <location filename="httpbrokerclient.cpp" line="329"/>
         <source>Login failed!<br>Please try again</source>
-        <translation type="unfinished"></translation>
+        <translation>Anmeldung fehlgeschlagen!<br>Bitte noch einmal versuchen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="433"/>
+        <location filename="httpbrokerclient.cpp" line="454"/>
         <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="436"/>
+        <location filename="httpbrokerclient.cpp" line="457"/>
         <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="441"/>
+        <location filename="httpbrokerclient.cpp" line="462"/>
         <source>Secure connection failed</source>
         <translation>Sichere Verbindung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="446"/>
+        <location filename="httpbrokerclient.cpp" line="467"/>
         <source>Issued to:
 </source>
         <translation>Issued to:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="447"/>
-        <location filename="httpbrokerclient.cpp" line="459"/>
+        <location filename="httpbrokerclient.cpp" line="468"/>
+        <location filename="httpbrokerclient.cpp" line="480"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="450"/>
-        <location filename="httpbrokerclient.cpp" line="462"/>
+        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="483"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="453"/>
-        <location filename="httpbrokerclient.cpp" line="465"/>
+        <location filename="httpbrokerclient.cpp" line="474"/>
+        <location filename="httpbrokerclient.cpp" line="486"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="456"/>
+        <location filename="httpbrokerclient.cpp" line="477"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="458"/>
+        <location filename="httpbrokerclient.cpp" line="479"/>
         <source>Issued by:
 </source>
         <translation>Issued by:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="469"/>
+        <location filename="httpbrokerclient.cpp" line="490"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="470"/>
+        <location filename="httpbrokerclient.cpp" line="491"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="492"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="472"/>
+        <location filename="httpbrokerclient.cpp" line="493"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerprints:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="473"/>
+        <location filename="httpbrokerclient.cpp" line="494"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="475"/>
+        <location filename="httpbrokerclient.cpp" line="496"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="481"/>
+        <location filename="httpbrokerclient.cpp" line="502"/>
         <source>Exit X2Go Client</source>
         <translation>X2Go Client beenden</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="483"/>
+        <location filename="httpbrokerclient.cpp" line="504"/>
         <source>Add exception</source>
         <translation>Ausnahme hinzufügen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="346"/>
+        <location filename="httpbrokerclient.cpp" line="366"/>
         <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>Die aktuelle Sitzung wurde unterbrochen. Um erneut Zugriff auf ihre Sitzung zu erhalten, kehren Sie zur Startseite zurück oder aktualisieren Sie die aktuelle Seite über den Browserbefehl "Aktuelle Seite neu laden".</translation>
     </message>
@@ -968,41 +1019,41 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="80"/>
-        <location filename="onmainwindow_part3.cpp" line="307"/>
+        <location filename="onmainwindow.cpp" line="84"/>
+        <location filename="onmainwindow_part3.cpp" line="312"/>
         <source>us</source>
         <translation>de</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="81"/>
+        <location filename="onmainwindow.cpp" line="85"/>
         <source>pc105/us</source>
         <translation>pc105/de</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="329"/>
+        <location filename="onmainwindow.cpp" line="333"/>
         <source>Support ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Support ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
-        <location filename="onmainwindow.cpp" line="1782"/>
-        <location filename="onmainwindow_part3.cpp" line="1636"/>
+        <location filename="onmainwindow.cpp" line="610"/>
+        <location filename="onmainwindow.cpp" line="1820"/>
+        <location filename="onmainwindow_part3.cpp" line="1642"/>
         <source>Session:</source>
         <translation>Sitzung:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="653"/>
+        <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
         <translation>&Beenden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="654"/>
+        <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
         <translation>Strg+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="655"/>
-        <location filename="onmainwindow.cpp" line="940"/>
+        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="958"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
@@ -1011,7 +1062,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">&Neue Sitzung ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="659"/>
+        <location filename="onmainwindow.cpp" line="668"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
@@ -1020,7 +1071,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Sitzungsverwaltung...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="665"/>
+        <location filename="onmainwindow.cpp" line="674"/>
         <source>Ctrl+E</source>
         <translation>Strg+E</translation>
     </message>
@@ -1029,185 +1080,185 @@ sound system connections through firewalls</source>
         <translation type="obsolete">LDAP &Konfiguration ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2052"/>
+        <location filename="onmainwindow_part4.cpp" line="2286"/>
         <source>Restore toolbar</source>
         <translation>Wergzeugleiste wieder anzeigen</translation>
     </message>
     <message>
         <source>About X2GO Client</source>
-        <translation type="obsolete">Ãœber X2GO Client</translation>
+        <translation type="obsolete">Ãœber X2GoClient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="698"/>
+        <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
         <translation>Ãœber QT</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2456"/>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
         <source>Session</source>
         <translation>Sitzung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="715"/>
+        <location filename="onmainwindow.cpp" line="734"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
         <translation>Strg +Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="721"/>
+        <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
         <translation>&Sitzung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="722"/>
+        <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
         <translation>&Einstellungen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="739"/>
+        <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
         <translation>&Hilfe</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1423"/>
+        <location filename="onmainwindow_part4.cpp" line="1657"/>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1424"/>
+        <location filename="onmainwindow_part4.cpp" line="1658"/>
         <source>Keyboard layout:</source>
-        <translation type="unfinished">Tastaturlayout:</translation>
+        <translation>Tastaturlayout:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1465"/>
+        <location filename="onmainwindow_part4.cpp" line="1699"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1467"/>
-        <location filename="onmainwindow_part4.cpp" line="1756"/>
-        <location filename="onmainwindow_part4.cpp" line="1758"/>
+        <location filename="onmainwindow_part4.cpp" line="1701"/>
+        <location filename="onmainwindow_part4.cpp" line="1990"/>
+        <location filename="onmainwindow_part4.cpp" line="1992"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2252"/>
+        <location filename="onmainwindow_part4.cpp" line="2486"/>
         <source>Invalid reply from broker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="807"/>
-        <location filename="onmainwindow.cpp" line="830"/>
-        <location filename="onmainwindow.cpp" line="1471"/>
-        <location filename="onmainwindow.cpp" line="1499"/>
-        <location filename="onmainwindow.cpp" line="1507"/>
-        <location filename="onmainwindow.cpp" line="1640"/>
-        <location filename="onmainwindow.cpp" line="1667"/>
-        <location filename="onmainwindow.cpp" line="1670"/>
-        <location filename="onmainwindow.cpp" line="1917"/>
-        <location filename="onmainwindow.cpp" line="2140"/>
-        <location filename="onmainwindow.cpp" line="2154"/>
-        <location filename="onmainwindow.cpp" line="2167"/>
-        <location filename="onmainwindow.cpp" line="2201"/>
-        <location filename="onmainwindow.cpp" line="2246"/>
-        <location filename="onmainwindow_part2.cpp" line="297"/>
-        <location filename="onmainwindow_part2.cpp" line="473"/>
-        <location filename="onmainwindow_part2.cpp" line="482"/>
-        <location filename="onmainwindow_part2.cpp" line="781"/>
-        <location filename="onmainwindow_part2.cpp" line="1232"/>
-        <location filename="onmainwindow_part2.cpp" line="1293"/>
-        <location filename="onmainwindow_part2.cpp" line="1344"/>
-        <location filename="onmainwindow_part2.cpp" line="1377"/>
-        <location filename="onmainwindow_part2.cpp" line="1421"/>
-        <location filename="onmainwindow_part2.cpp" line="1801"/>
-        <location filename="onmainwindow_part2.cpp" line="1827"/>
-        <location filename="onmainwindow_part2.cpp" line="1958"/>
+        <translation>Ungültige Antwort vom Session-Broker</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="820"/>
+        <location filename="onmainwindow.cpp" line="848"/>
+        <location filename="onmainwindow.cpp" line="1495"/>
+        <location filename="onmainwindow.cpp" line="1524"/>
+        <location filename="onmainwindow.cpp" line="1532"/>
+        <location filename="onmainwindow.cpp" line="1678"/>
+        <location filename="onmainwindow.cpp" line="1705"/>
+        <location filename="onmainwindow.cpp" line="1708"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
+        <location filename="onmainwindow.cpp" line="2178"/>
+        <location filename="onmainwindow.cpp" line="2192"/>
+        <location filename="onmainwindow.cpp" line="2205"/>
+        <location filename="onmainwindow.cpp" line="2239"/>
+        <location filename="onmainwindow.cpp" line="2284"/>
+        <location filename="onmainwindow_part2.cpp" line="305"/>
+        <location filename="onmainwindow_part2.cpp" line="481"/>
+        <location filename="onmainwindow_part2.cpp" line="490"/>
+        <location filename="onmainwindow_part2.cpp" line="789"/>
+        <location filename="onmainwindow_part2.cpp" line="1240"/>
+        <location filename="onmainwindow_part2.cpp" line="1301"/>
+        <location filename="onmainwindow_part2.cpp" line="1352"/>
+        <location filename="onmainwindow_part2.cpp" line="1385"/>
+        <location filename="onmainwindow_part2.cpp" line="1429"/>
+        <location filename="onmainwindow_part2.cpp" line="1830"/>
+        <location filename="onmainwindow_part2.cpp" line="1856"/>
+        <location filename="onmainwindow_part2.cpp" line="1988"/>
         <location filename="onmainwindow_part3.cpp" line="202"/>
-        <location filename="onmainwindow_part3.cpp" line="768"/>
-        <location filename="onmainwindow_part3.cpp" line="848"/>
-        <location filename="onmainwindow_part3.cpp" line="1092"/>
-        <location filename="onmainwindow_part3.cpp" line="1220"/>
-        <location filename="onmainwindow_part3.cpp" line="1273"/>
-        <location filename="onmainwindow_part3.cpp" line="1579"/>
-        <location filename="onmainwindow_part3.cpp" line="1581"/>
-        <location filename="onmainwindow_part3.cpp" line="1811"/>
-        <location filename="onmainwindow_part3.cpp" line="1859"/>
-        <location filename="onmainwindow_part3.cpp" line="1887"/>
-        <location filename="onmainwindow_part3.cpp" line="2257"/>
-        <location filename="onmainwindow_part3.cpp" line="2272"/>
-        <location filename="onmainwindow_part3.cpp" line="2326"/>
+        <location filename="onmainwindow_part3.cpp" line="773"/>
+        <location filename="onmainwindow_part3.cpp" line="854"/>
+        <location filename="onmainwindow_part3.cpp" line="1098"/>
+        <location filename="onmainwindow_part3.cpp" line="1226"/>
+        <location filename="onmainwindow_part3.cpp" line="1279"/>
+        <location filename="onmainwindow_part3.cpp" line="1585"/>
+        <location filename="onmainwindow_part3.cpp" line="1587"/>
+        <location filename="onmainwindow_part3.cpp" line="1817"/>
+        <location filename="onmainwindow_part3.cpp" line="1865"/>
+        <location filename="onmainwindow_part3.cpp" line="1893"/>
+        <location filename="onmainwindow_part3.cpp" line="2263"/>
+        <location filename="onmainwindow_part3.cpp" line="2278"/>
+        <location filename="onmainwindow_part3.cpp" line="2332"/>
         <location filename="onmainwindow_part4.cpp" line="29"/>
         <location filename="onmainwindow_part4.cpp" line="54"/>
-        <location filename="onmainwindow_part4.cpp" line="1980"/>
-        <location filename="onmainwindow_part4.cpp" line="2251"/>
+        <location filename="onmainwindow_part4.cpp" line="2214"/>
+        <location filename="onmainwindow_part4.cpp" line="2485"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2372"/>
+        <location filename="onmainwindow.cpp" line="2411"/>
         <location filename="onmainwindow_part3.cpp" line="68"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2443"/>
+        <location filename="onmainwindow.cpp" line="2485"/>
         <source> on </source>
         <translation> on </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="776"/>
-        <location filename="onmainwindow.cpp" line="1775"/>
-        <location filename="onmainwindow_part3.cpp" line="1629"/>
-        <location filename="onmainwindow_part4.cpp" line="1422"/>
+        <location filename="onmainwindow.cpp" line="799"/>
+        <location filename="onmainwindow.cpp" line="1813"/>
+        <location filename="onmainwindow_part3.cpp" line="1635"/>
+        <location filename="onmainwindow_part4.cpp" line="1656"/>
         <source>Login:</source>
         <translation>Benutzername:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1002"/>
-        <location filename="onmainwindow_part4.cpp" line="1752"/>
+        <location filename="onmainwindow_part2.cpp" line="1010"/>
+        <location filename="onmainwindow_part4.cpp" line="1986"/>
         <source>Select session:</source>
         <translation>Wähle Sitzung:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1754"/>
+        <location filename="onmainwindow_part4.cpp" line="1988"/>
         <source>Resume</source>
         <translation>Fortfahren</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="479"/>
-        <location filename="onmainwindow.cpp" line="927"/>
-        <location filename="onmainwindow_part2.cpp" line="2200"/>
-        <location filename="onmainwindow_part4.cpp" line="1761"/>
+        <location filename="onmainwindow.cpp" line="488"/>
+        <location filename="onmainwindow.cpp" line="945"/>
+        <location filename="onmainwindow_part2.cpp" line="2230"/>
+        <location filename="onmainwindow_part4.cpp" line="1995"/>
         <source>Suspend</source>
         <translation>Anhalten</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="482"/>
-        <location filename="onmainwindow.cpp" line="928"/>
-        <location filename="onmainwindow_part4.cpp" line="1609"/>
-        <location filename="onmainwindow_part4.cpp" line="1763"/>
+        <location filename="onmainwindow.cpp" line="491"/>
+        <location filename="onmainwindow.cpp" line="946"/>
+        <location filename="onmainwindow_part4.cpp" line="1843"/>
+        <location filename="onmainwindow_part4.cpp" line="1997"/>
         <source>Terminate</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1766"/>
+        <location filename="onmainwindow_part4.cpp" line="2000"/>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2458"/>
-        <location filename="onmainwindow_part4.cpp" line="1833"/>
-        <location filename="onmainwindow_part4.cpp" line="1855"/>
+        <location filename="onmainwindow_part2.cpp" line="2488"/>
+        <location filename="onmainwindow_part4.cpp" line="2067"/>
+        <location filename="onmainwindow_part4.cpp" line="2089"/>
         <source>Display</source>
         <translation>Display</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1835"/>
+        <location filename="onmainwindow_part4.cpp" line="2069"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1841"/>
+        <location filename="onmainwindow_part4.cpp" line="2075"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
@@ -1216,20 +1267,20 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Startzeit</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1846"/>
+        <location filename="onmainwindow_part4.cpp" line="2080"/>
         <source>Client IP</source>
         <translation>Client IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1018"/>
-        <location filename="onmainwindow_part2.cpp" line="1112"/>
-        <location filename="onmainwindow_part2.cpp" line="2164"/>
+        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1120"/>
+        <location filename="onmainwindow_part2.cpp" line="2194"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1020"/>
-        <location filename="onmainwindow_part2.cpp" line="1305"/>
+        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1313"/>
         <source>suspended</source>
         <translation>angehalten</translation>
     </message>
@@ -1242,46 +1293,46 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1985"/>
+        <location filename="onmainwindow_part2.cpp" line="2015"/>
         <source>Unable to create SSL Tunnel:
 </source>
         <translation>SSL Tunnel kann nicht erzeugt werden:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1153"/>
-        <location filename="onmainwindow_part2.cpp" line="1173"/>
-        <location filename="onmainwindow_part2.cpp" line="1987"/>
-        <location filename="onmainwindow_part2.cpp" line="2376"/>
+        <location filename="onmainwindow_part2.cpp" line="1161"/>
+        <location filename="onmainwindow_part2.cpp" line="1181"/>
+        <location filename="onmainwindow_part2.cpp" line="2017"/>
+        <location filename="onmainwindow_part2.cpp" line="2406"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="143"/>
-        <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2148"/>
+        <location filename="onmainwindow.cpp" line="147"/>
+        <location filename="onmainwindow_part2.cpp" line="189"/>
+        <location filename="onmainwindow_part2.cpp" line="2178"/>
         <source>connecting</source>
         <translation>verbinde</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2156"/>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
         <source>starting</source>
         <translation>starte</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2158"/>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
         <source>resuming</source>
         <translation>aktiviere</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2220"/>
-        <location filename="onmainwindow_part2.cpp" line="2488"/>
-        <location filename="onmainwindow_part2.cpp" line="2506"/>
+        <location filename="onmainwindow_part2.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="2518"/>
+        <location filename="onmainwindow_part2.cpp" line="2536"/>
         <source>Connection timeout, aborting</source>
         <translation>Zeitüberschreitung</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2221"/>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
         <source>aborting</source>
         <translation>Abbruch</translation>
     </message>
@@ -1290,7 +1341,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete"><b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1608"/>
+        <location filename="onmainwindow_part4.cpp" line="1842"/>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
@@ -1299,97 +1350,97 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Zeige Details</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="404"/>
+        <location filename="onmainwindow_part3.cpp" line="409"/>
         <source> (can't open file)</source>
-        <translation type="unfinished"></translation>
+        <translation> (kann Datei nicht öffnen)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="415"/>
-        <location filename="onmainwindow_part3.cpp" line="425"/>
-        <location filename="onmainwindow_part3.cpp" line="435"/>
+        <location filename="onmainwindow_part3.cpp" line="420"/>
+        <location filename="onmainwindow_part3.cpp" line="430"/>
+        <location filename="onmainwindow_part3.cpp" line="440"/>
         <source> (file not exists)</source>
-        <translation type="unfinished"></translation>
+        <translation> (Datei existiert nicht)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="459"/>
+        <location filename="onmainwindow_part3.cpp" line="464"/>
         <source> (directory not exists)</source>
-        <translation type="unfinished"></translation>
+        <translation> (Verzeichnis existiert nicht)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="487"/>
+        <location filename="onmainwindow_part3.cpp" line="492"/>
         <source>wrong value for argument"--link"</source>
         <translation>unerwarteter Wert "--link"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="505"/>
+        <location filename="onmainwindow_part3.cpp" line="510"/>
         <source>wrong value for argument"--sound"</source>
         <translation>unerwarteter Wert "--sound"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="522"/>
-        <location filename="onmainwindow_part3.cpp" line="533"/>
+        <location filename="onmainwindow_part3.cpp" line="527"/>
+        <location filename="onmainwindow_part3.cpp" line="538"/>
         <source>wrong value for argument"--geometry"</source>
         <translation>unerwarteter Wert "--geometry"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="551"/>
+        <location filename="onmainwindow_part3.cpp" line="556"/>
         <source>wrong value for argument"--set-kbd"</source>
         <translation>unerwarteter Wert "--set-kbd"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="568"/>
+        <location filename="onmainwindow_part3.cpp" line="573"/>
         <source>wrong value for argument"--ldap"</source>
         <translation>unerwarteter Wert "--ldap"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="663"/>
+        <location filename="onmainwindow_part3.cpp" line="668"/>
         <source>wrong value for argument"--pack"</source>
         <translation>unerwarteter Wert "--pack"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="671"/>
-        <location filename="onmainwindow_part3.cpp" line="674"/>
+        <location filename="onmainwindow_part3.cpp" line="676"/>
+        <location filename="onmainwindow_part3.cpp" line="679"/>
         <source>wrong parameter: </source>
         <translation>unerwarteter Wert: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="729"/>
         <source>Available pack methodes:</source>
         <translation>Liste aller Packmethoden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1511"/>
+        <location filename="onmainwindow_part3.cpp" line="1517"/>
         <source>Support</source>
-        <translation type="unfinished"></translation>
+        <translation>Support</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1516"/>
+        <location filename="onmainwindow_part3.cpp" line="1522"/>
         <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
         <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1582"/>
+        <location filename="onmainwindow_part3.cpp" line="1588"/>
         <source>Please check LDAP Settings</source>
         <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
     </message>
     <message>
         <source>no X2Go Server found in LDAP </source>
-        <translation type="obsolete">LDAP enthält keinen X2Go Server </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_part2.cpp" line="290"/>
-        <location filename="onmainwindow_part2.cpp" line="1286"/>
-        <location filename="onmainwindow_part2.cpp" line="1370"/>
-        <location filename="onmainwindow_part2.cpp" line="1403"/>
-        <location filename="onmainwindow_part3.cpp" line="761"/>
-        <location filename="onmainwindow_part3.cpp" line="841"/>
-        <location filename="onmainwindow_part3.cpp" line="1213"/>
-        <location filename="onmainwindow_part3.cpp" line="1266"/>
-        <location filename="onmainwindow_part3.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="298"/>
+        <location filename="onmainwindow_part2.cpp" line="1294"/>
+        <location filename="onmainwindow_part2.cpp" line="1378"/>
+        <location filename="onmainwindow_part2.cpp" line="1411"/>
+        <location filename="onmainwindow_part3.cpp" line="766"/>
+        <location filename="onmainwindow_part3.cpp" line="847"/>
+        <location filename="onmainwindow_part3.cpp" line="1219"/>
+        <location filename="onmainwindow_part3.cpp" line="1272"/>
+        <location filename="onmainwindow_part3.cpp" line="2256"/>
         <source><b>Connection failed</b>
 </source>
         <translation><b>Verbindung fehlgeschlagen</b>
@@ -1400,17 +1451,17 @@ sound system connections through firewalls</source>
         <translation type="obsolete">es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1848"/>
+        <location filename="onmainwindow_part4.cpp" line="2082"/>
         <source>Session ID</source>
         <translation>Sitzungs ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1250"/>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
         <source>suspending</source>
         <translation>anhalten</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1272"/>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
         <source>terminating</source>
         <translation>beende</translation>
     </message>
@@ -1465,20 +1516,20 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source><b>X2Go Client V. 2.0.1</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 authentification 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="obsolete"><b>X2Go Client 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 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"><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 Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten Sie auf x2go.org.</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Falsches Passwort!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="590"/>
+        <location filename="onmainwindow_part3.cpp" line="595"/>
         <source>wrong value for argument"--ldap1"</source>
         <translation>unerwarteter Wert "--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="609"/>
+        <location filename="onmainwindow_part3.cpp" line="614"/>
         <source>wrong value for argument"--ldap2"</source>
         <translation>unerwarteter Wert "--ldap2"</translation>
     </message>
@@ -1507,27 +1558,27 @@ sound system connections through firewalls</source>
         <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. Example:			--ldap=ldapserver:389:o=organization,c=de			--ldap1=<host:port>              LDAP Failover Server #1 			--ldap2=<host:port>              LDAP Failover Server #2 			--command=<cmd>                  Set default command, default value 'KDE'			--sound=<0|1>                    Enable sound, default value '1'			--geomerty=<W>x<H>|fullscreen    Set default geometry, default value '800x600'			--link=<modem|isdn|adsl|wan
 |lan> Set default link type, default 'lan'			--pack=<packmethod>              Set default pack method, default '16m-jpeg-9'			--kbd-layout=<layout>            Set default keyboard layout, default 'us'			--kbd-type=<typed>               Set default keyboard type, default 'pc105/us'			--set-kbd=<0|1>                  Overwrite current keyboard settings, default '0'</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1888"/>
+        <location filename="onmainwindow_part3.cpp" line="1894"/>
         <source>Unable to create file: </source>
         <translation>Datei konnte nicht erzeugt werden: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1812"/>
+        <location filename="onmainwindow_part3.cpp" line="1818"/>
         <source>No valid card found</source>
         <translation>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>
+        <translation type="obsolete">Diese Karte ist dem X2Go-System unbekannt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="325"/>
+        <location filename="onmainwindow.cpp" line="329"/>
         <source>&Settings ...</source>
         <translation>&Konfiguration ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="719"/>
-        <location filename="onmainwindow_part3.cpp" line="745"/>
+        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="750"/>
         <source>Options</source>
         <translation>Einstellungen</translation>
     </message>
@@ -1536,14 +1587,14 @@ sound system connections through firewalls</source>
         <translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2053"/>
-        <location filename="onmainwindow_part3.cpp" line="2078"/>
+        <location filename="onmainwindow_part3.cpp" line="2059"/>
+        <location filename="onmainwindow_part3.cpp" line="2084"/>
         <source>Can't connect to X-Server</source>
         <translation>Verbindung zu X-Server konnte nicht hergestellt werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2054"/>
-        <location filename="onmainwindow_part3.cpp" line="2079"/>
+        <location filename="onmainwindow_part3.cpp" line="2060"/>
+        <location filename="onmainwindow_part3.cpp" line="2085"/>
         <source>Can't connect to X-Server
 Please check your settings</source>
         <translation>Verbindung zu X-Server konnte nicht hergestellt werden
@@ -1554,92 +1605,92 @@ Please check your settings</source>
         <translation type="obsolete">X-Server konnte nicht gestartet werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2087"/>
+        <location filename="onmainwindow_part3.cpp" line="2093"/>
         <source>Can't start X Server
 Please check your settings</source>
         <translation>X-Server konnte nicht gestartet werden
 Überprüfen Sie Ihre Einstellungen</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1154"/>
-        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1182"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
         <source>24 or 32</source>
         <translation>24 oder 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1163"/>
-        <location filename="onmainwindow_part2.cpp" line="1183"/>
+        <location filename="onmainwindow_part2.cpp" line="1171"/>
+        <location filename="onmainwindow_part2.cpp" line="1191"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1166"/>
-        <location filename="onmainwindow_part2.cpp" line="1186"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1194"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1167"/>
-        <location filename="onmainwindow_part2.cpp" line="1187"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1175"/>
+        <location filename="onmainwindow_part2.cpp" line="1195"/>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source><b>X2Go Client V. </source>
-        <translation type="obsolete"><b>X2Go Client 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 authentification 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="obsolete"></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 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"></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 Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
     </message>
     <message>
         <source></b><br> (C. 2006-2008 <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 authentification 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="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 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"></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 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="152"/>
+        <location filename="onmainwindow.cpp" line="156"/>
         <source>OpenOffice.org</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="153"/>
+        <location filename="onmainwindow.cpp" line="157"/>
         <source>Terminal</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="409"/>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1837"/>
+        <location filename="onmainwindow_part4.cpp" line="2071"/>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1839"/>
+        <location filename="onmainwindow_part4.cpp" line="2073"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
         <source>Desktop</source>
         <translation>Desktopumgebung</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
         <source>single application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1030"/>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
         <source>shadow session</source>
         <translation></translation>
     </message>
@@ -1648,98 +1699,98 @@ Please check your settings</source>
         <translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2273"/>
+        <location filename="onmainwindow_part3.cpp" line="2279"/>
         <source>Unable to execute: </source>
         <translation>Befehl konnte nicht ausgeführt werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="126"/>
+        <location filename="onmainwindow.cpp" line="130"/>
         <source>X2Go client</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="150"/>
+        <location filename="onmainwindow.cpp" line="154"/>
         <source>Internet browser</source>
         <translation>Webbrowser</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="151"/>
+        <location filename="onmainwindow.cpp" line="155"/>
         <source>Email client</source>
         <translation>E-Mail-Programm</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="658"/>
+        <location filename="onmainwindow.cpp" line="667"/>
         <source>&New session ...</source>
         <translation>&Neue Sitzung ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="673"/>
         <source>Session management...</source>
         <translation>Sitzungsverwaltung...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="692"/>
-        <location filename="onmainwindow.cpp" line="713"/>
+        <location filename="onmainwindow.cpp" line="711"/>
+        <location filename="onmainwindow.cpp" line="732"/>
         <source>Show toolbar</source>
         <translation>Zeige Wergzeugleiste</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="336"/>
-        <location filename="onmainwindow_part3.cpp" line="1536"/>
+        <location filename="onmainwindow.cpp" line="340"/>
+        <location filename="onmainwindow_part3.cpp" line="1542"/>
         <source>About X2GO client</source>
-        <translation>Ãœber X2GO Client</translation>
+        <translation>Ãœber X2GoClient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1472"/>
-        <location filename="onmainwindow.cpp" line="1641"/>
-        <location filename="onmainwindow.cpp" line="1671"/>
+        <location filename="onmainwindow.cpp" line="1496"/>
+        <location filename="onmainwindow.cpp" line="1679"/>
+        <location filename="onmainwindow.cpp" line="1709"/>
         <source>Please check LDAP settings</source>
         <translation>Bitte überprüfen Sie die LDAP Einstellungen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1506"/>
+        <location filename="onmainwindow.cpp" line="1531"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>LDAP enthält keinen X2Go Server </translation>
+        <translation>LDAP enthält keinen X2GoServer </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2065"/>
+        <location filename="onmainwindow.cpp" line="2103"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="293"/>
-        <location filename="onmainwindow_part2.cpp" line="1289"/>
-        <location filename="onmainwindow_part2.cpp" line="1373"/>
+        <location filename="onmainwindow_part2.cpp" line="301"/>
+        <location filename="onmainwindow_part2.cpp" line="1297"/>
+        <location filename="onmainwindow_part2.cpp" line="1381"/>
         <location filename="onmainwindow_part3.cpp" line="199"/>
-        <location filename="onmainwindow_part3.cpp" line="764"/>
-        <location filename="onmainwindow_part3.cpp" line="844"/>
-        <location filename="onmainwindow_part3.cpp" line="1216"/>
-        <location filename="onmainwindow_part3.cpp" line="1269"/>
-        <location filename="onmainwindow_part3.cpp" line="2253"/>
+        <location filename="onmainwindow_part3.cpp" line="769"/>
+        <location filename="onmainwindow_part3.cpp" line="850"/>
+        <location filename="onmainwindow_part3.cpp" line="1222"/>
+        <location filename="onmainwindow_part3.cpp" line="1275"/>
+        <location filename="onmainwindow_part3.cpp" line="2259"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Falsches Passwort!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="474"/>
+        <location filename="onmainwindow_part2.cpp" line="482"/>
         <source>No server availabel</source>
         <translation>es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="923"/>
-        <location filename="onmainwindow_part2.cpp" line="2061"/>
+        <location filename="onmainwindow.cpp" line="941"/>
+        <location filename="onmainwindow_part2.cpp" line="2091"/>
         <source>Not connected</source>
         <oldsource>Active connection</oldsource>
         <translation>Nicht verbunden</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
-        <location filename="onmainwindow_part4.cpp" line="1844"/>
+        <location filename="onmainwindow_part2.cpp" line="2490"/>
+        <location filename="onmainwindow_part4.cpp" line="2078"/>
         <source>Creation time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1799"/>
-        <location filename="onmainwindow_part3.cpp" line="1090"/>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
+        <location filename="onmainwindow_part3.cpp" line="1096"/>
         <source>Unable to create folder:</source>
         <translation>Ordner kann nicht erzeugt werden:</translation>
     </message>
@@ -1747,199 +1798,204 @@ Please check your settings</source>
         <location filename="onmainwindow_part2.cpp" line="79"/>
         <source>Host key for server changed.
 It is now: </source>
-        <translation type="unfinished"></translation>
+        <translation>Host-Key des Servers hat sich geändert. Er lautet jetzt: </translation>
     </message>
     <message>
         <location filename="onmainwindow_part2.cpp" line="80"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Aus Sicherheitsgründen wird der Verbindungsaufbau abgebrochen</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
+        <location filename="onmainwindow_part2.cpp" line="91"/>
         <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>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_part2.cpp" line="110"/>
+        <location filename="onmainwindow_part2.cpp" line="113"/>
         <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>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_part2.cpp" line="115"/>
+        <location filename="onmainwindow_part2.cpp" line="118"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
-        <translation type="unfinished"></translation>
+        <translation>Der Server ist unbekannt. Vertrauen Sie diesem Host-Key? Öffentlicher Schlüssel: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="130"/>
         <source>Host key verification failed</source>
-        <translation type="unfinished">Host key verification failed</translation>
+        <translation>Die Überprüfung des Host-Keys schlug fehl</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
-        <translation type="unfinished"></translation>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
+        <source>Authentication failed</source>
+        <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="483"/>
-        <location filename="onmainwindow_part2.cpp" line="782"/>
-        <location filename="onmainwindow_part2.cpp" line="1233"/>
-        <location filename="onmainwindow_part2.cpp" line="1345"/>
+        <location filename="onmainwindow_part2.cpp" line="491"/>
+        <location filename="onmainwindow_part2.cpp" line="790"/>
+        <location filename="onmainwindow_part2.cpp" line="1241"/>
+        <location filename="onmainwindow_part2.cpp" line="1353"/>
         <source>Server not availabel</source>
-        <translation type="unfinished"></translation>
+        <translation>Server nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1825"/>
+        <location filename="onmainwindow_part2.cpp" line="1854"/>
         <source>Unable to write file:</source>
         <translation>Datei kann nicht geschrieben werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1956"/>
-        <location filename="onmainwindow_part3.cpp" line="2324"/>
+        <location filename="onmainwindow_part2.cpp" line="1986"/>
+        <location filename="onmainwindow_part3.cpp" line="2330"/>
         <source>Unable to create SSL tunnel:
 </source>
         <translation>SSL Tunnel kann nicht erzeugt werden:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1600"/>
+        <location filename="onmainwindow_part4.cpp" line="1834"/>
         <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="476"/>
-        <location filename="onmainwindow.cpp" line="926"/>
-        <location filename="onmainwindow_part4.cpp" line="1610"/>
+        <location filename="onmainwindow.cpp" line="485"/>
+        <location filename="onmainwindow.cpp" line="944"/>
+        <location filename="onmainwindow_part4.cpp" line="1844"/>
         <source>Share folder...</source>
         <translation>Ordner freigeben...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1612"/>
+        <location filename="onmainwindow_part4.cpp" line="1846"/>
         <source>Show details</source>
         <translation>Zeige Details</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1537"/>
+        <location filename="onmainwindow_part3.cpp" line="1543"/>
         <source><b>X2Go client V. </source>
-        <translation><b>X2Go Client V. </translation>
+        <translation><b>X2GoClient V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1860"/>
+        <location filename="onmainwindow_part3.cpp" line="1866"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>Diese Karte ist dem X2Go System unbekannt</translation>
+        <translation>Diese Karte ist dem X2Go-System unbekannt</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2289"/>
+        <location filename="onmainwindow_part3.cpp" line="2295"/>
         <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
 Bitte installieren sie eine neuere Version von x2goserver</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="675"/>
+        <location filename="onmainwindow.cpp" line="684"/>
         <source>&Create session icon on desktop...</source>
         <translation>&Desktopsymbol erzeugen...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="684"/>
+        <location filename="onmainwindow.cpp" line="693"/>
         <source>&Set broker password...</source>
-        <translation type="unfinished"></translation>
+        <translation>&Kennwort für Session-Broker setzen...</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="704"/>
+        <source>&Connectivity test...</source>
+        <translation>&Verbindungstest...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
+        <location filename="onmainwindow.cpp" line="820"/>
         <source>Operation failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Operation fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="811"/>
+        <location filename="onmainwindow.cpp" line="824"/>
         <source>Password changed</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Kennwort wurde geändert</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="830"/>
+        <location filename="onmainwindow.cpp" line="848"/>
         <source>Wrong password!</source>
-        <translation type="unfinished"></translation>
+        <translation>Falsches Kennwort!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="879"/>
+        <location filename="onmainwindow.cpp" line="897"/>
         <source><b>Authentication</b></source>
-        <translation type="unfinished"></translation>
+        <translation><b>Authentifizierung</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="920"/>
+        <location filename="onmainwindow.cpp" line="938"/>
         <source>Restore</source>
-        <translation>Wiederhestellen</translation>
+        <translation>Wiederherstellen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="951"/>
+        <location filename="onmainwindow.cpp" line="969"/>
         <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 Mousetaste: verstecken/wiederherstellen  -  rechte Mousetaste: Kontextmenü</translation>
+        <translation>Linke Maustaste: verstecken/wiederherstellen  -  rechte Maustaste: Kontextmenü</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1805"/>
+        <location filename="onmainwindow.cpp" line="1843"/>
         <source>Create session icon on desktop</source>
         <translation>Desktopsymbol erzeugen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1806"/>
+        <location filename="onmainwindow.cpp" line="1844"/>
         <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 das x2goclient sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Loginvorgang über einen GPG Schlüssel oder eine GPG Smartcard konfiguriert haben.
+        <translation>Der Aufruf über Desktopsymbole kann erfolgen, ohne dass der X2GoClient sichtbar wird (versteckter Modus). Diesen Modus können Sie nutzen, wenn Sie den Loginvorgang über einen GPG-Schlüssel oder eine GPG-Smartcard konfiguriert haben.
 
-Wollen SIe den versteckten Modus nutzen?</translation>
+Wollen Sie den versteckten Modus nutzen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1817"/>
+        <location filename="onmainwindow.cpp" line="1855"/>
         <source>New Session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1917"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
         <source>X2Go sessions not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine X2Go-Sitzungen gefunden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2431"/>
+        <location filename="onmainwindow.cpp" line="2473"/>
         <source>RDP connection</source>
         <translation>RDP Verbindung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1867"/>
+        <location filename="onmainwindow.cpp" line="1905"/>
         <source>X2Go Link to session </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="488"/>
-        <location filename="onmainwindow_part4.cpp" line="1054"/>
+        <location filename="onmainwindow.cpp" line="497"/>
+        <location filename="onmainwindow_part4.cpp" line="1288"/>
         <source>Detach X2Go window</source>
         <translation>Fenster abkoppeln</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1930"/>
-        <location filename="onmainwindow_part4.cpp" line="1029"/>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part4.cpp" line="1263"/>
         <source>Attach X2Go window</source>
         <translation>Fenster einbetten</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2133"/>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
         <source>Finished</source>
         <translation>Beendet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2377"/>
+        <location filename="onmainwindow_part2.cpp" line="2407"/>
         <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>
     </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 authentification 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="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 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"></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 kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2101"/>
+        <location filename="onmainwindow_part3.cpp" line="2107"/>
         <location filename="onmainwindow_part4.cpp" line="422"/>
         <location filename="onmainwindow_part4.cpp" line="450"/>
         <source>Can't start X Server
@@ -1948,18 +2004,18 @@ Please check your installation</source>
 Bitte überprüfen Sie Ihre Installation</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1118"/>
+        <location filename="onmainwindow_part4.cpp" line="1352"/>
         <source>X2Go Session</source>
-        <translation>X2Go Sitzung</translation>
+        <translation>X2Go-Sitzung</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="491"/>
-        <location filename="onmainwindow_part4.cpp" line="2064"/>
+        <location filename="onmainwindow.cpp" line="500"/>
+        <location filename="onmainwindow_part4.cpp" line="2298"/>
         <source>Minimize toolbar</source>
         <translation>Symbole verstecken</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2097"/>
+        <location filename="onmainwindow_part4.cpp" line="2331"/>
         <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>
@@ -1968,7 +2024,7 @@ Bitte überprüfen Sie Ihre Installation</translation>
         <translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1981"/>
+        <location filename="onmainwindow_part4.cpp" line="2215"/>
         <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>
@@ -1977,65 +2033,65 @@ Sie können SSHD über folgenden Befehl installieren:
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2439"/>
+        <location filename="onmainwindow.cpp" line="2481"/>
         <source>Connection to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1063"/>
+        <location filename="onmainwindow_part2.cpp" line="1071"/>
         <source>Information</source>
         <translation>Hinweis</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1077"/>
-        <location filename="onmainwindow_part4.cpp" line="2165"/>
+        <location filename="onmainwindow_part2.cpp" line="1085"/>
+        <location filename="onmainwindow_part4.cpp" line="2399"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1084"/>
+        <location filename="onmainwindow_part2.cpp" line="1092"/>
         <source>Select desktop:</source>
         <translation>Desktopauswahl:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1772"/>
+        <location filename="onmainwindow_part4.cpp" line="2006"/>
         <source>View only</source>
         <translation>Nur betrachten</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1852"/>
+        <location filename="onmainwindow_part4.cpp" line="2086"/>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2435"/>
+        <location filename="onmainwindow.cpp" line="2477"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1064"/>
+        <location filename="onmainwindow_part2.cpp" line="1072"/>
         <source>No accessible desktop found</source>
         <translation>Kein freigegebener Desktop gefunden</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1769"/>
+        <location filename="onmainwindow_part4.cpp" line="2003"/>
         <source>Full access</source>
         <translation>Vollzugriff</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1883"/>
+        <location filename="onmainwindow_part4.cpp" line="2117"/>
         <source>Only my desktops</source>
         <translation>Nur eigene Desktops</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="484"/>
+        <location filename="onmainwindow.cpp" line="493"/>
         <source>Reconnect</source>
         <translation>Neu verbinden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow_part4.cpp" line="2234"/>
+        <location filename="onmainwindow.cpp" line="852"/>
+        <location filename="onmainwindow.cpp" line="2393"/>
+        <location filename="onmainwindow_part4.cpp" line="2468"/>
         <source>Connecting to broker</source>
         <translation>Verbinden mit Broker</translation>
     </message>
@@ -2044,14 +2100,14 @@ 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_part3.cpp" line="1520"/>
+        <location filename="onmainwindow_part3.cpp" line="1526"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1524"/>
+        <location filename="onmainwindow_part3.cpp" line="1530"/>
         <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 authentification 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><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_part4.cpp" line="141"/>
@@ -2064,13 +2120,13 @@ Sie können SSHD über folgenden Befehl installieren:
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1300"/>
+        <location filename="onmainwindow_part4.cpp" line="1534"/>
         <source>wrong value for argument"speed"</source>
         <translation>wrong value for argument"speed"</translation>
     </message>
     <message>
         <source>application/x2go:x2go:Configuration File for X2Go Session</source>
-        <translation type="obsolete">application/x2go:x2go:Konfiguration Datei für eine X2Go Sitzung</translation>
+        <translation type="obsolete">application/x2go:x2go:Konfigurationsdatei für eine X2Go-Sitzung</translation>
     </message>
 </context>
 <context>
@@ -2093,7 +2149,7 @@ Sie können SSHD über folgenden Befehl installieren:
     <message>
         <location filename="printdialog.ui" line="16"/>
         <source>Print - X2Go client</source>
-        <translation>Drucken - X2Go Client</translation>
+        <translation>Drucken - X2GoClient</translation>
     </message>
 </context>
 <context>
@@ -2298,31 +2354,40 @@ Beispiel:
         <translation type="obsolete">Aktiviere Audiounterstützung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="270"/>
+        <location filename="sessionbutton.cpp" line="272"/>
         <source>New Session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="312"/>
+        <location filename="sessionbutton.cpp" line="314"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="383"/>
-        <location filename="sessionbutton.cpp" line="395"/>
-        <location filename="sessionbutton.cpp" line="635"/>
+        <location filename="sessionbutton.cpp" line="385"/>
+        <location filename="sessionbutton.cpp" line="402"/>
+        <location filename="sessionbutton.cpp" line="663"/>
         <source>fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="417"/>
-        <location filename="sessionbutton.cpp" line="547"/>
+        <location filename="sessionbutton.cpp" line="389"/>
+        <location filename="sessionbutton.cpp" line="412"/>
+        <location filename="sessionbutton.cpp" line="416"/>
+        <location filename="sessionbutton.cpp" line="669"/>
+        <location filename="sessionbutton.cpp" line="672"/>
+        <source>Display </source>
+        <translation>Anzeige </translation>
+    </message>
+    <message>
+        <location filename="sessionbutton.cpp" line="445"/>
+        <location filename="sessionbutton.cpp" line="575"/>
         <source>Enabled</source>
         <translation>aktiviert</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="419"/>
-        <location filename="sessionbutton.cpp" line="549"/>
+        <location filename="sessionbutton.cpp" line="447"/>
+        <location filename="sessionbutton.cpp" line="577"/>
         <source>Disabled</source>
         <translation>deaktiviert</translation>
     </message>
@@ -2331,74 +2396,74 @@ Beispiel:
         <translation type="obsolete">/usr/bin/startkde</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="390"/>
-        <location filename="sessionbutton.cpp" line="409"/>
+        <location filename="sessionbutton.cpp" line="397"/>
+        <location filename="sessionbutton.cpp" line="437"/>
         <source>window</source>
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="114"/>
+        <location filename="sessionbutton.cpp" line="116"/>
         <source>Session preferences...</source>
         <translation>Sitzungseinstellungen...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="118"/>
+        <location filename="sessionbutton.cpp" line="120"/>
         <source>Create session icon on desktop...</source>
         <translation>Desktopsymbol erzeugen...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="123"/>
+        <location filename="sessionbutton.cpp" line="125"/>
         <source>Delete session</source>
         <translation>Sitzung entfernen</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="136"/>
+        <location filename="sessionbutton.cpp" line="138"/>
         <source>Session actions</source>
         <translation>Optionen</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
+        <location filename="sessionbutton.cpp" line="139"/>
         <source>Select type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="139"/>
+        <location filename="sessionbutton.cpp" line="141"/>
         <source>Select resolution</source>
         <translation>Auflösung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="140"/>
+        <location filename="sessionbutton.cpp" line="142"/>
         <source>Toggle sound support</source>
         <translation>Sound</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="275"/>
+        <location filename="sessionbutton.cpp" line="277"/>
         <source>running</source>
-        <translation type="unfinished">aktiv</translation>
+        <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="279"/>
+        <location filename="sessionbutton.cpp" line="281"/>
         <source>suspended</source>
-        <translation type="unfinished">angehalten</translation>
+        <translation>angehalten</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="323"/>
-        <location filename="sessionbutton.cpp" line="355"/>
-        <location filename="sessionbutton.cpp" line="588"/>
+        <location filename="sessionbutton.cpp" line="325"/>
+        <location filename="sessionbutton.cpp" line="357"/>
+        <location filename="sessionbutton.cpp" line="616"/>
         <source>RDP connection</source>
         <translation>RDP Verbindung</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="325"/>
-        <location filename="sessionbutton.cpp" line="349"/>
-        <location filename="sessionbutton.cpp" line="582"/>
+        <location filename="sessionbutton.cpp" line="327"/>
+        <location filename="sessionbutton.cpp" line="351"/>
+        <location filename="sessionbutton.cpp" line="610"/>
         <source>Connection to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="324"/>
-        <location filename="sessionbutton.cpp" line="361"/>
-        <location filename="sessionbutton.cpp" line="594"/>
+        <location filename="sessionbutton.cpp" line="326"/>
+        <location filename="sessionbutton.cpp" line="363"/>
+        <location filename="sessionbutton.cpp" line="622"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -2488,12 +2553,12 @@ Beispiel:
     <message>
         <location filename="sessionwidget.cpp" line="89"/>
         <source>SSH port:</source>
-        <translation>SSH Port:</translation>
+        <translation>SSH-Port:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="101"/>
         <source>Use RSA/DSA key for ssh connection:</source>
-        <translation>RSA/DSA Schlüssel verwenden (ssh):</translation>
+        <translation>RSA-/DSA-Schlüssel verwenden (ssh):</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="107"/>
@@ -2501,109 +2566,114 @@ Beispiel:
         <translation>Anmeldung über voreingestellten SSH-Schlüssel oder ssh-agent</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="111"/>
+        <location filename="sessionwidget.cpp" line="108"/>
+        <source>Kerberos 5 (GSSAPI) authentication</source>
+        <translation>Kerberos5 (GSSAPI) Authentifizierung</translation>
+    </message>
+    <message>
+        <location filename="sessionwidget.cpp" line="113"/>
         <source>&Session type</source>
         <translation>&Sitzungsart</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
+        <location filename="sessionwidget.cpp" line="118"/>
         <source>Session type:</source>
         <translation>Sitzungsart:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="125"/>
-        <location filename="sessionwidget.cpp" line="292"/>
+        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="296"/>
         <source>Connect to Windows terminal server</source>
         <translation>Verbindung mit Windows Terminalserver herstellen</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="128"/>
+        <location filename="sessionwidget.cpp" line="130"/>
         <source>Custom desktop</source>
         <translation>Andere Desktopumgebung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="129"/>
+        <location filename="sessionwidget.cpp" line="131"/>
         <source>Single application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="131"/>
-        <location filename="sessionwidget.cpp" line="248"/>
+        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="sessionwidget.cpp" line="252"/>
         <source>Command:</source>
         <translation>Befehl:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="132"/>
+        <location filename="sessionwidget.cpp" line="134"/>
         <source>Advanced options...</source>
         <translation>Erweiterte Einstellungen...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="143"/>
-        <location filename="sessionwidget.cpp" line="420"/>
-        <location filename="sessionwidget.cpp" line="482"/>
+        <location filename="sessionwidget.cpp" line="145"/>
+        <location filename="sessionwidget.cpp" line="429"/>
+        <location filename="sessionwidget.cpp" line="492"/>
         <source>Path to executable</source>
         <translation>Pfad zum Programm</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="192"/>
+        <location filename="sessionwidget.cpp" line="196"/>
         <source>Open picture</source>
         <translation>Öffne Bild</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="194"/>
+        <location filename="sessionwidget.cpp" line="198"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="215"/>
+        <location filename="sessionwidget.cpp" line="219"/>
         <source>Open key file</source>
         <translation>Öffne Schlüssel</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="sessionwidget.cpp" line="221"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="269"/>
-        <location filename="sessionwidget.cpp" line="384"/>
+        <location filename="sessionwidget.cpp" line="273"/>
+        <location filename="sessionwidget.cpp" line="391"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="293"/>
+        <location filename="sessionwidget.cpp" line="297"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop Kommandozeilenoptionen:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="306"/>
-        <location filename="sessionwidget.cpp" line="404"/>
+        <location filename="sessionwidget.cpp" line="310"/>
+        <location filename="sessionwidget.cpp" line="411"/>
         <source>New session</source>
         <translation>Neue Sitzung</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="129"/>
         <source>Connect to local desktop</source>
         <translation>Zugriff auf lokalen Desktop</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="275"/>
-        <location filename="sessionwidget.cpp" line="392"/>
+        <location filename="sessionwidget.cpp" line="279"/>
+        <location filename="sessionwidget.cpp" line="399"/>
         <source>XDMCP server:</source>
         <translation>XDMCP Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="126"/>
+        <location filename="sessionwidget.cpp" line="128"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="227"/>
+        <location filename="sessionwidget.cpp" line="231"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="228"/>
+        <location filename="sessionwidget.cpp" line="232"/>
         <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>
     </message>
@@ -2611,112 +2681,132 @@ Beispiel:
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="33"/>
-        <location filename="settingswidget.cpp" line="37"/>
+        <location filename="settingswidget.cpp" line="40"/>
+        <location filename="settingswidget.cpp" line="44"/>
         <source>&Display</source>
         <translation>&Display</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="34"/>
-        <location filename="settingswidget.cpp" line="38"/>
+        <location filename="settingswidget.cpp" line="41"/>
+        <location filename="settingswidget.cpp" line="45"/>
         <source>&Keyboard</source>
         <translation>&Tastatur</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="35"/>
-        <location filename="settingswidget.cpp" line="39"/>
+        <location filename="settingswidget.cpp" line="42"/>
+        <location filename="settingswidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Audio</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
+        <location filename="settingswidget.cpp" line="57"/>
         <source>Fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="52"/>
+        <location filename="settingswidget.cpp" line="59"/>
         <source>Custom</source>
         <translation>Eigener</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="54"/>
+        <location filename="settingswidget.cpp" line="61"/>
         <source>Window</source>
         <translation>Fenster</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="61"/>
+        <location filename="settingswidget.cpp" line="63"/>
+        <source>Use whole display</source>
+        <translation>Ganzen Bildschirm verwenden</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
-        <translation>DPI Auflösung festlegen</translation>
+        <translation>Auflösung festlegen (DPI)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="79"/>
+        <location filename="settingswidget.cpp" line="76"/>
+        <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="92"/>
         <source>Width:</source>
         <translation>Breite:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="settingswidget.cpp" line="95"/>
         <source>Height:</source>
         <translation>Höhe:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="settingswidget.cpp" line="102"/>
+        <source>&Display:</source>
+        <translation>&Bildschirm:</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="104"/>
+        <source>&Identify all displays</source>
+        <translation>&Alle Bildschirme identifizieren</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="142"/>
         <source>Keep current keyboard Settings</source>
         <translation>Tastaturlayout behalten</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="settingswidget.cpp" line="152"/>
         <source>Keyboard layout:</source>
         <translation>Tastaturlayout:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="113"/>
+        <location filename="settingswidget.cpp" line="154"/>
         <source>Keyboard model:</source>
         <translation>Tastatur:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="124"/>
+        <location filename="settingswidget.cpp" line="165"/>
         <source>Enable sound support</source>
         <translation>Audiounterstützung aktivieren</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="133"/>
+        <location filename="settingswidget.cpp" line="174"/>
         <source>Start sound daemon</source>
         <translation>Starte Sound Server</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="135"/>
+        <location filename="settingswidget.cpp" line="176"/>
         <source>Use running sound daemon</source>
         <translation>Benutze existierenden Sound Server</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="137"/>
+        <location filename="settingswidget.cpp" line="178"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
-        <translation>Benutze Port Weiterleitung über Tunnel
+        <translation>Benutze Port-Weiterleitung über Tunnel
  um Audiosignale über Firewalls zu verbinden</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="139"/>
+        <location filename="settingswidget.cpp" line="180"/>
         <source>Use default sound port</source>
         <translation>Benutze standard Audio Port</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="146"/>
+        <location filename="settingswidget.cpp" line="187"/>
         <source>Sound port:</source>
         <translation>Audio Port:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="173"/>
+        <location filename="settingswidget.cpp" line="214"/>
         <source>Client side printing support</source>
         <translation>Clientseitige Druckunterstützung</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="440"/>
+        <location filename="settingswidget.cpp" line="554"/>
         <source>us</source>
         <translation>de</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="441"/>
+        <location filename="settingswidget.cpp" line="555"/>
         <source>pc105/us</source>
         <translation>pc105/de</translation>
     </message>
@@ -2757,7 +2847,7 @@ sound system connections through firewalls</source>
     <message>
         <location filename="sharewidget.cpp" line="95"/>
         <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>Benutze SSH-Port-Weiterleitung über Tunnel um Dateisysteme über Firewalls zu verbinden</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="158"/>
@@ -2805,97 +2895,97 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="100"/>
+        <location filename="sshmasterconnection.cpp" line="124"/>
         <source>Can not initialize libssh</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann libssh nicht initialisieren</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="120"/>
+        <location filename="sshmasterconnection.cpp" line="144"/>
         <source>Can not create ssh session</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann SSH-Sitzung nicht erstellen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="135"/>
+        <location filename="sshmasterconnection.cpp" line="159"/>
         <source>Can not connect to </source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindungsaufbau nicht möglich </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="171"/>
+        <location filename="sshmasterconnection.cpp" line="200"/>
         <source>Authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="216"/>
         <source>channel_forward_listen failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_forward_listen schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="498"/>
+        <location filename="sshmasterconnection.cpp" line="530"/>
         <source>Can not open file </source>
-        <translation type="unfinished"></translation>
+        <translation>Kann Datei nicht öffnen </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="510"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not create remote file </source>
-        <translation type="unfinished"></translation>
+        <translation>Kann entfernte Datei nicht öffnen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="523"/>
+        <location filename="sshmasterconnection.cpp" line="555"/>
         <source>Can not write to remote file </source>
-        <translation type="unfinished"></translation>
+        <translation>Kann entfernte Datei nicht schreiben </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="573"/>
+        <location filename="sshmasterconnection.cpp" line="605"/>
         <source>can not connect to </source>
-        <translation type="unfinished"></translation>
+        <translation>Kann Verbindung nicht herstellen zu </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="682"/>
+        <location filename="sshmasterconnection.cpp" line="714"/>
         <source>channel_open_forward failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_open_forward schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_open_session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_open_session schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="708"/>
+        <location filename="sshmasterconnection.cpp" line="740"/>
         <source>channel_request_exec failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_request_exec schlug fehl</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="773"/>
+        <location filename="sshmasterconnection.cpp" line="805"/>
         <source>error writing to socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Schreiben auf Socket</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="791"/>
+        <location filename="sshmasterconnection.cpp" line="823"/>
         <source>error reading channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Channel Lesefehler</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="821"/>
+        <location filename="sshmasterconnection.cpp" line="853"/>
         <source>channel_write failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Channel Schreibfehler</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="833"/>
+        <location filename="sshmasterconnection.cpp" line="865"/>
         <source>error reading tcp socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesefehler TCP-Socket</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="92"/>
+        <location filename="sshprocess.cpp" line="97"/>
         <source>Error creating socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Socket-Fehler beim Erstellen</translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="110"/>
+        <location filename="sshprocess.cpp" line="115"/>
         <source>Error binding </source>
-        <translation type="unfinished"></translation>
+        <translation>Socket-Bind-Fehler</translation>
     </message>
 </context>
 <context>
@@ -2903,12 +2993,12 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingswidget.cpp" line="50"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <location filename="xsettingswidget.cpp" line="52"/>
         <source>Executable (*.exe)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführbare Datei (*.exe)</translation>
     </message>
 </context>
 <context>
@@ -2916,62 +3006,62 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingsui.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</translation>
+        <translation>Formular</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen X2GoClient neu starten, um die Änderungen zu aktivieren</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="50"/>
         <source>use integrated X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>integrierten X-Server verwenden</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="60"/>
         <source>use custom X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>benutzerdefinierten X-Server verwenden</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="70"/>
         <source>custom X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>benutzerdefinierter X-Server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="78"/>
         <source>executable:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführbare Datei:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="101"/>
         <source>start X-Server on X2Go client start</source>
-        <translation type="unfinished"></translation>
+        <translation>X-Server auf X2GoClient starten</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="113"/>
         <source>command line options:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommandozeilenoptionen:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="125"/>
         <source>X-Server command line options</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommandozeilenoptionen des X-Servers</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="131"/>
         <source>window mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fenstermodus:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="141"/>
         <source>fullscreen mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vollbildmodus:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="151"/>
         <source>single application:</source>
-        <translation type="unfinished"></translation>
+        <translation>Einzelanwendung:</translation>
     </message>
 </context>
 <context>
@@ -3002,7 +3092,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <source>Host key verification failed</source>
-        <translation type="obsolete">Host key verification failed</translation>
+        <translation type="obsolete">Host-Key Überprüfung fehlgeschlagen</translation>
     </message>
 </context>
 </TS>
diff --git a/x2goclient_fr.ts b/x2goclient_en.ts
similarity index 73%
copy from x2goclient_fr.ts
copy to x2goclient_en.ts
index 1cd6797..ff3ab11 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_en.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="en_US">
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
@@ -40,31 +40,6 @@
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.cpp" line="65"/>
-        <source>Idle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="68"/>
-        <source>Printing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
-        <source>Stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="81"/>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="81"/>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="cupsprintwidget.ui" line="19"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
@@ -104,6 +79,31 @@
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="65"/>
+        <source>Idle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="68"/>
+        <source>Printing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="71"/>
+        <source>Stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="81"/>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="81"/>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CUPSPrinterSettingsDialog</name>
@@ -124,6 +124,57 @@
     </message>
 </context>
 <context>
+    <name>ConTest</name>
+    <message>
+        <location filename="contest.ui" line="14"/>
+        <source>Connectivity test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="24"/>
+        <source>HTTPS connection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="31"/>
+        <source>SSH connection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="38"/>
+        <source>Connection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="123"/>
+        <location filename="contest.ui" line="167"/>
+        <source>Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="211"/>
+        <source>0 Kb/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="108"/>
+        <location filename="contest.cpp" line="115"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="150"/>
+        <source>Socket operation timed out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="162"/>
+        <location filename="contest.cpp" line="168"/>
+        <source>Failed: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigDialog</name>
     <message>
         <location filename="configdialog.cpp" line="50"/>
@@ -472,121 +523,121 @@
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="164"/>
+        <location filename="httpbrokerclient.cpp" line="178"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="167"/>
+        <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="294"/>
         <location filename="httpbrokerclient.cpp" line="308"/>
-        <location filename="httpbrokerclient.cpp" line="345"/>
+        <location filename="httpbrokerclient.cpp" line="328"/>
+        <location filename="httpbrokerclient.cpp" line="365"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="309"/>
+        <location filename="httpbrokerclient.cpp" line="329"/>
         <source>Login failed!<br>Please try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="346"/>
+        <location filename="httpbrokerclient.cpp" line="366"/>
         <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="433"/>
+        <location filename="httpbrokerclient.cpp" line="454"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="436"/>
+        <location filename="httpbrokerclient.cpp" line="457"/>
         <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="441"/>
+        <location filename="httpbrokerclient.cpp" line="462"/>
         <source>Secure connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="446"/>
+        <location filename="httpbrokerclient.cpp" line="467"/>
         <source>Issued to:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="447"/>
-        <location filename="httpbrokerclient.cpp" line="459"/>
+        <location filename="httpbrokerclient.cpp" line="468"/>
+        <location filename="httpbrokerclient.cpp" line="480"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="450"/>
-        <location filename="httpbrokerclient.cpp" line="462"/>
+        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="483"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="453"/>
-        <location filename="httpbrokerclient.cpp" line="465"/>
+        <location filename="httpbrokerclient.cpp" line="474"/>
+        <location filename="httpbrokerclient.cpp" line="486"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="456"/>
+        <location filename="httpbrokerclient.cpp" line="477"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="458"/>
+        <location filename="httpbrokerclient.cpp" line="479"/>
         <source>Issued by:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="469"/>
+        <location filename="httpbrokerclient.cpp" line="490"/>
         <source>Validity:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="470"/>
+        <location filename="httpbrokerclient.cpp" line="491"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="492"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="472"/>
+        <location filename="httpbrokerclient.cpp" line="493"/>
         <source>Fingerprints:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="473"/>
+        <location filename="httpbrokerclient.cpp" line="494"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="475"/>
+        <location filename="httpbrokerclient.cpp" line="496"/>
         <source>MD5	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="481"/>
+        <location filename="httpbrokerclient.cpp" line="502"/>
         <source>Exit X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="483"/>
+        <location filename="httpbrokerclient.cpp" line="504"/>
         <source>Add exception</source>
         <translation type="unfinished"></translation>
     </message>
@@ -594,622 +645,633 @@
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="80"/>
-        <location filename="onmainwindow_part3.cpp" line="307"/>
+        <location filename="onmainwindow.cpp" line="84"/>
+        <location filename="onmainwindow_part3.cpp" line="312"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="81"/>
+        <location filename="onmainwindow.cpp" line="85"/>
         <source>pc105/us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="126"/>
+        <location filename="onmainwindow.cpp" line="130"/>
         <source>X2Go client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="143"/>
-        <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2148"/>
+        <location filename="onmainwindow.cpp" line="147"/>
+        <location filename="onmainwindow_part2.cpp" line="189"/>
+        <location filename="onmainwindow_part2.cpp" line="2178"/>
         <source>connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="150"/>
+        <location filename="onmainwindow.cpp" line="154"/>
         <source>Internet browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="151"/>
+        <location filename="onmainwindow.cpp" line="155"/>
         <source>Email client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="152"/>
+        <location filename="onmainwindow.cpp" line="156"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="153"/>
+        <location filename="onmainwindow.cpp" line="157"/>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="325"/>
+        <location filename="onmainwindow.cpp" line="329"/>
         <source>&Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="329"/>
+        <location filename="onmainwindow.cpp" line="333"/>
         <source>Support ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="336"/>
-        <location filename="onmainwindow_part3.cpp" line="1536"/>
+        <location filename="onmainwindow.cpp" line="340"/>
+        <location filename="onmainwindow_part3.cpp" line="1542"/>
         <source>About X2GO client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="476"/>
-        <location filename="onmainwindow.cpp" line="926"/>
-        <location filename="onmainwindow_part4.cpp" line="1610"/>
+        <location filename="onmainwindow.cpp" line="485"/>
+        <location filename="onmainwindow.cpp" line="944"/>
+        <location filename="onmainwindow_part4.cpp" line="1844"/>
         <source>Share folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="479"/>
-        <location filename="onmainwindow.cpp" line="927"/>
-        <location filename="onmainwindow_part2.cpp" line="2200"/>
-        <location filename="onmainwindow_part4.cpp" line="1761"/>
+        <location filename="onmainwindow.cpp" line="488"/>
+        <location filename="onmainwindow.cpp" line="945"/>
+        <location filename="onmainwindow_part2.cpp" line="2230"/>
+        <location filename="onmainwindow_part4.cpp" line="1995"/>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="482"/>
-        <location filename="onmainwindow.cpp" line="928"/>
-        <location filename="onmainwindow_part4.cpp" line="1609"/>
-        <location filename="onmainwindow_part4.cpp" line="1763"/>
+        <location filename="onmainwindow.cpp" line="491"/>
+        <location filename="onmainwindow.cpp" line="946"/>
+        <location filename="onmainwindow_part4.cpp" line="1843"/>
+        <location filename="onmainwindow_part4.cpp" line="1997"/>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="484"/>
+        <location filename="onmainwindow.cpp" line="493"/>
         <source>Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="488"/>
-        <location filename="onmainwindow_part4.cpp" line="1054"/>
+        <location filename="onmainwindow.cpp" line="497"/>
+        <location filename="onmainwindow_part4.cpp" line="1288"/>
         <source>Detach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="491"/>
-        <location filename="onmainwindow_part4.cpp" line="2064"/>
+        <location filename="onmainwindow.cpp" line="500"/>
+        <location filename="onmainwindow_part4.cpp" line="2298"/>
         <source>Minimize toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
-        <location filename="onmainwindow.cpp" line="1782"/>
-        <location filename="onmainwindow_part3.cpp" line="1636"/>
+        <location filename="onmainwindow.cpp" line="610"/>
+        <location filename="onmainwindow.cpp" line="1820"/>
+        <location filename="onmainwindow_part3.cpp" line="1642"/>
         <source>Session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="653"/>
+        <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="654"/>
+        <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="655"/>
-        <location filename="onmainwindow.cpp" line="940"/>
+        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="958"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="658"/>
+        <location filename="onmainwindow.cpp" line="667"/>
         <source>&New session ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="659"/>
+        <location filename="onmainwindow.cpp" line="668"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="673"/>
         <source>Session management...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="665"/>
+        <location filename="onmainwindow.cpp" line="674"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="675"/>
+        <location filename="onmainwindow.cpp" line="684"/>
         <source>&Create session icon on desktop...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="684"/>
+        <location filename="onmainwindow.cpp" line="693"/>
         <source>&Set broker password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="692"/>
-        <location filename="onmainwindow.cpp" line="713"/>
+        <location filename="onmainwindow.cpp" line="704"/>
+        <source>&Connectivity test...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="711"/>
+        <location filename="onmainwindow.cpp" line="732"/>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="698"/>
+        <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="715"/>
+        <location filename="onmainwindow.cpp" line="734"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="721"/>
+        <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="722"/>
+        <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="739"/>
+        <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="776"/>
-        <location filename="onmainwindow.cpp" line="1775"/>
-        <location filename="onmainwindow_part3.cpp" line="1629"/>
-        <location filename="onmainwindow_part4.cpp" line="1422"/>
+        <location filename="onmainwindow.cpp" line="799"/>
+        <location filename="onmainwindow.cpp" line="1813"/>
+        <location filename="onmainwindow_part3.cpp" line="1635"/>
+        <location filename="onmainwindow_part4.cpp" line="1656"/>
         <source>Login:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
+        <location filename="onmainwindow.cpp" line="820"/>
+        <location filename="onmainwindow.cpp" line="848"/>
+        <location filename="onmainwindow.cpp" line="1495"/>
+        <location filename="onmainwindow.cpp" line="1524"/>
+        <location filename="onmainwindow.cpp" line="1532"/>
+        <location filename="onmainwindow.cpp" line="1678"/>
+        <location filename="onmainwindow.cpp" line="1705"/>
+        <location filename="onmainwindow.cpp" line="1708"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
+        <location filename="onmainwindow.cpp" line="2178"/>
+        <location filename="onmainwindow.cpp" line="2192"/>
+        <location filename="onmainwindow.cpp" line="2205"/>
+        <location filename="onmainwindow.cpp" line="2239"/>
+        <location filename="onmainwindow.cpp" line="2284"/>
+        <location filename="onmainwindow_part2.cpp" line="305"/>
+        <location filename="onmainwindow_part2.cpp" line="481"/>
+        <location filename="onmainwindow_part2.cpp" line="490"/>
+        <location filename="onmainwindow_part2.cpp" line="789"/>
+        <location filename="onmainwindow_part2.cpp" line="1240"/>
+        <location filename="onmainwindow_part2.cpp" line="1301"/>
+        <location filename="onmainwindow_part2.cpp" line="1352"/>
+        <location filename="onmainwindow_part2.cpp" line="1385"/>
+        <location filename="onmainwindow_part2.cpp" line="1429"/>
+        <location filename="onmainwindow_part2.cpp" line="1830"/>
+        <location filename="onmainwindow_part2.cpp" line="1856"/>
+        <location filename="onmainwindow_part2.cpp" line="1988"/>
+        <location filename="onmainwindow_part3.cpp" line="202"/>
+        <location filename="onmainwindow_part3.cpp" line="773"/>
+        <location filename="onmainwindow_part3.cpp" line="854"/>
+        <location filename="onmainwindow_part3.cpp" line="1098"/>
+        <location filename="onmainwindow_part3.cpp" line="1226"/>
+        <location filename="onmainwindow_part3.cpp" line="1279"/>
+        <location filename="onmainwindow_part3.cpp" line="1585"/>
+        <location filename="onmainwindow_part3.cpp" line="1587"/>
+        <location filename="onmainwindow_part3.cpp" line="1817"/>
+        <location filename="onmainwindow_part3.cpp" line="1865"/>
+        <location filename="onmainwindow_part3.cpp" line="1893"/>
+        <location filename="onmainwindow_part3.cpp" line="2263"/>
+        <location filename="onmainwindow_part3.cpp" line="2278"/>
+        <location filename="onmainwindow_part3.cpp" line="2332"/>
+        <location filename="onmainwindow_part4.cpp" line="29"/>
+        <location filename="onmainwindow_part4.cpp" line="54"/>
+        <location filename="onmainwindow_part4.cpp" line="2214"/>
+        <location filename="onmainwindow_part4.cpp" line="2485"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="820"/>
         <source>Operation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="811"/>
+        <location filename="onmainwindow.cpp" line="824"/>
         <source>Password changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="830"/>
+        <location filename="onmainwindow.cpp" line="848"/>
         <source>Wrong password!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="879"/>
+        <location filename="onmainwindow.cpp" line="852"/>
+        <location filename="onmainwindow.cpp" line="2393"/>
+        <location filename="onmainwindow_part4.cpp" line="2468"/>
+        <source>Connecting to broker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="897"/>
         <source><b>Authentication</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="920"/>
+        <location filename="onmainwindow.cpp" line="938"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="923"/>
-        <location filename="onmainwindow_part2.cpp" line="2061"/>
+        <location filename="onmainwindow.cpp" line="941"/>
+        <location filename="onmainwindow_part2.cpp" line="2091"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="951"/>
+        <location filename="onmainwindow.cpp" line="969"/>
         <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="807"/>
-        <location filename="onmainwindow.cpp" line="830"/>
-        <location filename="onmainwindow.cpp" line="1471"/>
-        <location filename="onmainwindow.cpp" line="1499"/>
-        <location filename="onmainwindow.cpp" line="1507"/>
-        <location filename="onmainwindow.cpp" line="1640"/>
-        <location filename="onmainwindow.cpp" line="1667"/>
-        <location filename="onmainwindow.cpp" line="1670"/>
-        <location filename="onmainwindow.cpp" line="1917"/>
-        <location filename="onmainwindow.cpp" line="2140"/>
-        <location filename="onmainwindow.cpp" line="2154"/>
-        <location filename="onmainwindow.cpp" line="2167"/>
-        <location filename="onmainwindow.cpp" line="2201"/>
-        <location filename="onmainwindow.cpp" line="2246"/>
-        <location filename="onmainwindow_part2.cpp" line="297"/>
-        <location filename="onmainwindow_part2.cpp" line="473"/>
-        <location filename="onmainwindow_part2.cpp" line="482"/>
-        <location filename="onmainwindow_part2.cpp" line="781"/>
-        <location filename="onmainwindow_part2.cpp" line="1232"/>
-        <location filename="onmainwindow_part2.cpp" line="1293"/>
-        <location filename="onmainwindow_part2.cpp" line="1344"/>
-        <location filename="onmainwindow_part2.cpp" line="1377"/>
-        <location filename="onmainwindow_part2.cpp" line="1421"/>
-        <location filename="onmainwindow_part2.cpp" line="1801"/>
-        <location filename="onmainwindow_part2.cpp" line="1827"/>
-        <location filename="onmainwindow_part2.cpp" line="1958"/>
-        <location filename="onmainwindow_part3.cpp" line="202"/>
-        <location filename="onmainwindow_part3.cpp" line="768"/>
-        <location filename="onmainwindow_part3.cpp" line="848"/>
-        <location filename="onmainwindow_part3.cpp" line="1092"/>
-        <location filename="onmainwindow_part3.cpp" line="1220"/>
-        <location filename="onmainwindow_part3.cpp" line="1273"/>
-        <location filename="onmainwindow_part3.cpp" line="1579"/>
-        <location filename="onmainwindow_part3.cpp" line="1581"/>
-        <location filename="onmainwindow_part3.cpp" line="1811"/>
-        <location filename="onmainwindow_part3.cpp" line="1859"/>
-        <location filename="onmainwindow_part3.cpp" line="1887"/>
-        <location filename="onmainwindow_part3.cpp" line="2257"/>
-        <location filename="onmainwindow_part3.cpp" line="2272"/>
-        <location filename="onmainwindow_part3.cpp" line="2326"/>
-        <location filename="onmainwindow_part4.cpp" line="29"/>
-        <location filename="onmainwindow_part4.cpp" line="54"/>
-        <location filename="onmainwindow_part4.cpp" line="1980"/>
-        <location filename="onmainwindow_part4.cpp" line="2251"/>
-        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1472"/>
-        <location filename="onmainwindow.cpp" line="1641"/>
-        <location filename="onmainwindow.cpp" line="1671"/>
+        <location filename="onmainwindow.cpp" line="1496"/>
+        <location filename="onmainwindow.cpp" line="1679"/>
+        <location filename="onmainwindow.cpp" line="1709"/>
         <source>Please check LDAP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1506"/>
+        <location filename="onmainwindow.cpp" line="1531"/>
         <source>no X2Go server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1805"/>
+        <location filename="onmainwindow.cpp" line="1843"/>
         <source>Create session icon on desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1806"/>
+        <location filename="onmainwindow.cpp" line="1844"/>
         <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"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1817"/>
+        <location filename="onmainwindow.cpp" line="1855"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1867"/>
+        <location filename="onmainwindow.cpp" line="1905"/>
         <source>X2Go Link to session </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1917"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
         <source>X2Go sessions not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2065"/>
+        <location filename="onmainwindow.cpp" line="2103"/>
         <source>Are you sure you want to delete this session?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2372"/>
+        <location filename="onmainwindow.cpp" line="2411"/>
         <location filename="onmainwindow_part3.cpp" line="68"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2431"/>
+        <location filename="onmainwindow.cpp" line="2473"/>
         <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2435"/>
+        <location filename="onmainwindow.cpp" line="2477"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2439"/>
+        <location filename="onmainwindow.cpp" line="2481"/>
         <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2443"/>
+        <location filename="onmainwindow.cpp" line="2485"/>
         <source> on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="290"/>
-        <location filename="onmainwindow_part2.cpp" line="1286"/>
-        <location filename="onmainwindow_part2.cpp" line="1370"/>
-        <location filename="onmainwindow_part2.cpp" line="1403"/>
-        <location filename="onmainwindow_part3.cpp" line="761"/>
-        <location filename="onmainwindow_part3.cpp" line="841"/>
-        <location filename="onmainwindow_part3.cpp" line="1213"/>
-        <location filename="onmainwindow_part3.cpp" line="1266"/>
-        <location filename="onmainwindow_part3.cpp" line="2250"/>
-        <source><b>Connection failed</b>
-</source>
+        <location filename="onmainwindow_part2.cpp" line="79"/>
+        <source>Host key for server changed.
+It is now: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="293"/>
-        <location filename="onmainwindow_part2.cpp" line="1289"/>
-        <location filename="onmainwindow_part2.cpp" line="1373"/>
-        <location filename="onmainwindow_part3.cpp" line="199"/>
-        <location filename="onmainwindow_part3.cpp" line="764"/>
-        <location filename="onmainwindow_part3.cpp" line="844"/>
-        <location filename="onmainwindow_part3.cpp" line="1216"/>
-        <location filename="onmainwindow_part3.cpp" line="1269"/>
-        <location filename="onmainwindow_part3.cpp" line="2253"/>
-        <source><b>Wrong password!</b><br><br></source>
+        <location filename="onmainwindow_part2.cpp" line="80"/>
+        <source>For security reasons, connection will be stopped</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="409"/>
-        <source>unknown</source>
+        <location filename="onmainwindow_part2.cpp" line="91"/>
+        <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="474"/>
-        <source>No server availabel</source>
+        <location filename="onmainwindow_part2.cpp" line="113"/>
+        <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1002"/>
-        <location filename="onmainwindow_part4.cpp" line="1752"/>
-        <source>Select session:</source>
+        <location filename="onmainwindow_part2.cpp" line="118"/>
+        <source>The server is unknown. Do you trust the host key?
+Public key hash: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1018"/>
-        <location filename="onmainwindow_part2.cpp" line="1112"/>
-        <location filename="onmainwindow_part2.cpp" line="2164"/>
-        <source>running</source>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="130"/>
+        <source>Host key verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1020"/>
-        <location filename="onmainwindow_part2.cpp" line="1305"/>
-        <source>suspended</source>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1194"/>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1026"/>
-        <source>Desktop</source>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1175"/>
+        <location filename="onmainwindow_part2.cpp" line="1195"/>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1028"/>
-        <source>single application</source>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
+        <source>Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1030"/>
-        <source>shadow session</source>
+        <location filename="onmainwindow_part2.cpp" line="298"/>
+        <location filename="onmainwindow_part2.cpp" line="1294"/>
+        <location filename="onmainwindow_part2.cpp" line="1378"/>
+        <location filename="onmainwindow_part2.cpp" line="1411"/>
+        <location filename="onmainwindow_part3.cpp" line="766"/>
+        <location filename="onmainwindow_part3.cpp" line="847"/>
+        <location filename="onmainwindow_part3.cpp" line="1219"/>
+        <location filename="onmainwindow_part3.cpp" line="1272"/>
+        <location filename="onmainwindow_part3.cpp" line="2256"/>
+        <source><b>Connection failed</b>
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1063"/>
-        <source>Information</source>
+        <location filename="onmainwindow_part2.cpp" line="301"/>
+        <location filename="onmainwindow_part2.cpp" line="1297"/>
+        <location filename="onmainwindow_part2.cpp" line="1381"/>
+        <location filename="onmainwindow_part3.cpp" line="199"/>
+        <location filename="onmainwindow_part3.cpp" line="769"/>
+        <location filename="onmainwindow_part3.cpp" line="850"/>
+        <location filename="onmainwindow_part3.cpp" line="1222"/>
+        <location filename="onmainwindow_part3.cpp" line="1275"/>
+        <location filename="onmainwindow_part3.cpp" line="2259"/>
+        <source><b>Wrong password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1064"/>
-        <source>No accessible desktop found</source>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
+        <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1077"/>
-        <location filename="onmainwindow_part4.cpp" line="2165"/>
-        <source>Filter</source>
+        <location filename="onmainwindow_part2.cpp" line="482"/>
+        <source>No server availabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1084"/>
-        <source>Select desktop:</source>
+        <location filename="onmainwindow_part2.cpp" line="491"/>
+        <location filename="onmainwindow_part2.cpp" line="790"/>
+        <location filename="onmainwindow_part2.cpp" line="1241"/>
+        <location filename="onmainwindow_part2.cpp" line="1353"/>
+        <source>Server not availabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1153"/>
-        <location filename="onmainwindow_part2.cpp" line="1173"/>
-        <location filename="onmainwindow_part2.cpp" line="1987"/>
-        <location filename="onmainwindow_part2.cpp" line="2376"/>
-        <source>Warning</source>
+        <location filename="onmainwindow_part2.cpp" line="1010"/>
+        <location filename="onmainwindow_part4.cpp" line="1986"/>
+        <source>Select session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1154"/>
-        <location filename="onmainwindow_part2.cpp" line="1174"/>
-        <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="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1120"/>
+        <location filename="onmainwindow_part2.cpp" line="2194"/>
+        <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1162"/>
-        <source>24 or 32</source>
+        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1313"/>
+        <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1163"/>
-        <location filename="onmainwindow_part2.cpp" line="1183"/>
-        <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
+        <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1166"/>
-        <location filename="onmainwindow_part2.cpp" line="1186"/>
-        <source>Yes</source>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
+        <source>single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="79"/>
-        <source>Host key for server changed.
-It is now: </source>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
+        <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="80"/>
-        <source>For security reasons, connection will be stopped</source>
+        <location filename="onmainwindow_part2.cpp" line="1071"/>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
-        <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="onmainwindow_part2.cpp" line="1072"/>
+        <source>No accessible desktop found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="110"/>
-        <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
+        <location filename="onmainwindow_part2.cpp" line="1085"/>
+        <location filename="onmainwindow_part4.cpp" line="2399"/>
+        <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="115"/>
-        <source>The server is unknown. Do you trust the host key?
-Public key hash: </source>
+        <location filename="onmainwindow_part2.cpp" line="1092"/>
+        <source>Select desktop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1167"/>
-        <location filename="onmainwindow_part2.cpp" line="1187"/>
-        <source>No</source>
+        <location filename="onmainwindow_part2.cpp" line="1161"/>
+        <location filename="onmainwindow_part2.cpp" line="1181"/>
+        <location filename="onmainwindow_part2.cpp" line="2017"/>
+        <location filename="onmainwindow_part2.cpp" line="2406"/>
+        <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
-        <source>Host key verification failed</source>
+        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1182"/>
+        <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
+        <source>24 or 32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="483"/>
-        <location filename="onmainwindow_part2.cpp" line="782"/>
-        <location filename="onmainwindow_part2.cpp" line="1233"/>
-        <location filename="onmainwindow_part2.cpp" line="1345"/>
-        <source>Server not availabel</source>
+        <location filename="onmainwindow_part2.cpp" line="1171"/>
+        <location filename="onmainwindow_part2.cpp" line="1191"/>
+        <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1250"/>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
         <source>suspending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1272"/>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
         <source>terminating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1799"/>
-        <location filename="onmainwindow_part3.cpp" line="1090"/>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
+        <location filename="onmainwindow_part3.cpp" line="1096"/>
         <source>Unable to create folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1825"/>
+        <location filename="onmainwindow_part2.cpp" line="1854"/>
         <source>Unable to write file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1930"/>
-        <location filename="onmainwindow_part4.cpp" line="1029"/>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part4.cpp" line="1263"/>
         <source>Attach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1956"/>
-        <location filename="onmainwindow_part3.cpp" line="2324"/>
+        <location filename="onmainwindow_part2.cpp" line="1986"/>
+        <location filename="onmainwindow_part3.cpp" line="2330"/>
         <source>Unable to create SSL tunnel:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1985"/>
+        <location filename="onmainwindow_part2.cpp" line="2015"/>
         <source>Unable to create SSL Tunnel:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2133"/>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2156"/>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
         <source>starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2158"/>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
         <source>resuming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2220"/>
-        <location filename="onmainwindow_part2.cpp" line="2488"/>
-        <location filename="onmainwindow_part2.cpp" line="2506"/>
+        <location filename="onmainwindow_part2.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="2518"/>
+        <location filename="onmainwindow_part2.cpp" line="2536"/>
         <source>Connection timeout, aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2221"/>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
         <source>aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2377"/>
+        <location filename="onmainwindow_part2.cpp" line="2407"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2456"/>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2458"/>
-        <location filename="onmainwindow_part4.cpp" line="1833"/>
-        <location filename="onmainwindow_part4.cpp" line="1855"/>
+        <location filename="onmainwindow_part2.cpp" line="2488"/>
+        <location filename="onmainwindow_part4.cpp" line="2067"/>
+        <location filename="onmainwindow_part4.cpp" line="2089"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
-        <location filename="onmainwindow_part4.cpp" line="1844"/>
+        <location filename="onmainwindow_part2.cpp" line="2490"/>
+        <location filename="onmainwindow_part4.cpp" line="2078"/>
         <source>Creation time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1221,146 +1283,146 @@ Unsaved documents will be lost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="404"/>
+        <location filename="onmainwindow_part3.cpp" line="409"/>
         <source> (can't open file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="415"/>
-        <location filename="onmainwindow_part3.cpp" line="425"/>
-        <location filename="onmainwindow_part3.cpp" line="435"/>
+        <location filename="onmainwindow_part3.cpp" line="420"/>
+        <location filename="onmainwindow_part3.cpp" line="430"/>
+        <location filename="onmainwindow_part3.cpp" line="440"/>
         <source> (file not exists)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="459"/>
+        <location filename="onmainwindow_part3.cpp" line="464"/>
         <source> (directory not exists)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="487"/>
+        <location filename="onmainwindow_part3.cpp" line="492"/>
         <source>wrong value for argument"--link"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="505"/>
+        <location filename="onmainwindow_part3.cpp" line="510"/>
         <source>wrong value for argument"--sound"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="522"/>
-        <location filename="onmainwindow_part3.cpp" line="533"/>
+        <location filename="onmainwindow_part3.cpp" line="527"/>
+        <location filename="onmainwindow_part3.cpp" line="538"/>
         <source>wrong value for argument"--geometry"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="551"/>
+        <location filename="onmainwindow_part3.cpp" line="556"/>
         <source>wrong value for argument"--set-kbd"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="568"/>
+        <location filename="onmainwindow_part3.cpp" line="573"/>
         <source>wrong value for argument"--ldap"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="590"/>
+        <location filename="onmainwindow_part3.cpp" line="595"/>
         <source>wrong value for argument"--ldap1"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="609"/>
+        <location filename="onmainwindow_part3.cpp" line="614"/>
         <source>wrong value for argument"--ldap2"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="663"/>
+        <location filename="onmainwindow_part3.cpp" line="668"/>
         <source>wrong value for argument"--pack"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="671"/>
-        <location filename="onmainwindow_part3.cpp" line="674"/>
+        <location filename="onmainwindow_part3.cpp" line="676"/>
+        <location filename="onmainwindow_part3.cpp" line="679"/>
         <source>wrong parameter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="719"/>
-        <location filename="onmainwindow_part3.cpp" line="745"/>
+        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="750"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="729"/>
         <source>Available pack methodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1511"/>
+        <location filename="onmainwindow_part3.cpp" line="1517"/>
         <source>Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1516"/>
+        <location filename="onmainwindow_part3.cpp" line="1522"/>
         <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1520"/>
+        <location filename="onmainwindow_part3.cpp" line="1526"/>
         <source><br>x2goplugin 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_part3.cpp" line="1524"/>
+        <location filename="onmainwindow_part3.cpp" line="1530"/>
         <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 authentification 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>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1537"/>
+        <location filename="onmainwindow_part3.cpp" line="1543"/>
         <source><b>X2Go client V. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1582"/>
+        <location filename="onmainwindow_part3.cpp" line="1588"/>
         <source>Please check LDAP Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1812"/>
+        <location filename="onmainwindow_part3.cpp" line="1818"/>
         <source>No valid card found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1860"/>
+        <location filename="onmainwindow_part3.cpp" line="1866"/>
         <source>This card is unknown by X2Go system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1888"/>
+        <location filename="onmainwindow_part3.cpp" line="1894"/>
         <source>Unable to create file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2053"/>
-        <location filename="onmainwindow_part3.cpp" line="2078"/>
+        <location filename="onmainwindow_part3.cpp" line="2059"/>
+        <location filename="onmainwindow_part3.cpp" line="2084"/>
         <source>Can't connect to X-Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2054"/>
-        <location filename="onmainwindow_part3.cpp" line="2079"/>
+        <location filename="onmainwindow_part3.cpp" line="2060"/>
+        <location filename="onmainwindow_part3.cpp" line="2085"/>
         <source>Can't connect to X-Server
 Please check your settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2087"/>
+        <location filename="onmainwindow_part3.cpp" line="2093"/>
         <source>Can't start X Server
 Please check your settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2101"/>
+        <location filename="onmainwindow_part3.cpp" line="2107"/>
         <location filename="onmainwindow_part4.cpp" line="422"/>
         <location filename="onmainwindow_part4.cpp" line="450"/>
         <source>Can't start X Server
@@ -1368,12 +1430,12 @@ Please check your installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2273"/>
+        <location filename="onmainwindow_part3.cpp" line="2279"/>
         <source>Unable to execute: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2289"/>
+        <location filename="onmainwindow_part3.cpp" line="2295"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
         <translation type="unfinished"></translation>
@@ -1391,155 +1453,153 @@ Please update to a newer x2goserver package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1118"/>
+        <location filename="onmainwindow_part4.cpp" line="141"/>
+        <source>WINDOWS-1252</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="153"/>
+        <source>ISO8859-1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1352"/>
         <source>X2Go Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1423"/>
+        <location filename="onmainwindow_part4.cpp" line="1534"/>
+        <source>wrong value for argument"speed"</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1657"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1424"/>
+        <location filename="onmainwindow_part4.cpp" line="1658"/>
         <source>Keyboard layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1465"/>
+        <location filename="onmainwindow_part4.cpp" line="1699"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1467"/>
-        <location filename="onmainwindow_part4.cpp" line="1756"/>
-        <location filename="onmainwindow_part4.cpp" line="1758"/>
+        <location filename="onmainwindow_part4.cpp" line="1701"/>
+        <location filename="onmainwindow_part4.cpp" line="1990"/>
+        <location filename="onmainwindow_part4.cpp" line="1992"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1600"/>
+        <location filename="onmainwindow_part4.cpp" line="1834"/>
         <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_part4.cpp" line="1608"/>
+        <location filename="onmainwindow_part4.cpp" line="1842"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1612"/>
+        <location filename="onmainwindow_part4.cpp" line="1846"/>
         <source>Show details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1754"/>
+        <location filename="onmainwindow_part4.cpp" line="1988"/>
         <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1766"/>
+        <location filename="onmainwindow_part4.cpp" line="2000"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1769"/>
+        <location filename="onmainwindow_part4.cpp" line="2003"/>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1772"/>
+        <location filename="onmainwindow_part4.cpp" line="2006"/>
         <source>View only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1835"/>
+        <location filename="onmainwindow_part4.cpp" line="2069"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1837"/>
+        <location filename="onmainwindow_part4.cpp" line="2071"/>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1839"/>
+        <location filename="onmainwindow_part4.cpp" line="2073"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1841"/>
+        <location filename="onmainwindow_part4.cpp" line="2075"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1846"/>
+        <location filename="onmainwindow_part4.cpp" line="2080"/>
         <source>Client IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1848"/>
+        <location filename="onmainwindow_part4.cpp" line="2082"/>
         <source>Session ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1852"/>
+        <location filename="onmainwindow_part4.cpp" line="2086"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1883"/>
+        <location filename="onmainwindow_part4.cpp" line="2117"/>
         <source>Only my desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1981"/>
+        <location filename="onmainwindow_part4.cpp" line="2215"/>
         <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2052"/>
+        <location filename="onmainwindow_part4.cpp" line="2286"/>
         <source>Restore toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2097"/>
+        <location filename="onmainwindow_part4.cpp" line="2331"/>
         <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>
-        <location filename="onmainwindow_part4.cpp" line="2252"/>
+        <location filename="onmainwindow_part4.cpp" line="2486"/>
         <source>Invalid reply from broker</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow_part4.cpp" line="2234"/>
-        <source>Connecting to broker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part4.cpp" line="141"/>
-        <source>WINDOWS-1252</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part4.cpp" line="153"/>
-        <source>ISO8859-1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow_part4.cpp" line="1300"/>
-        <source>wrong value for argument"speed"</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PrintDialog</name>
     <message>
+        <location filename="printdialog.ui" line="16"/>
+        <source>Print - X2Go client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="printdialog.cpp" line="25"/>
         <source>Print</source>
         <translation type="unfinished"></translation>
@@ -1554,11 +1614,6 @@ you can install sshd with
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="printdialog.ui" line="16"/>
-        <source>Print - X2Go client</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PrintProcess</name>
@@ -1589,11 +1644,6 @@ you can install sshd with
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.cpp" line="53"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="printwidget.ui" line="13"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
@@ -1659,21 +1709,14 @@ you can install sshd with
         <source>Show this dialog before start printing</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.cpp" line="37"/>
-        <source>Please enter your customized or individual printing command.
-Example:
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="printercmddialog.cpp" line="45"/>
-        <source><Path to gsprint.exe> -query -color</source>
+        <location filename="printwidget.cpp" line="53"/>
+        <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 type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PrinterCmdDialog</name>
     <message>
         <location filename="printercmddialog.ui" line="13"/>
         <source>Printer command</source>
@@ -1732,107 +1775,128 @@ lpr -P hp_laserjet</source>
         <source>Specify path as program parameter</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="printercmddialog.cpp" line="37"/>
+        <source>Please enter your customized or individual printing command.
+Example:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="printercmddialog.cpp" line="45"/>
+        <source><Path to gsprint.exe> -query -color</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="114"/>
+        <location filename="sessionbutton.cpp" line="116"/>
         <source>Session preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="118"/>
+        <location filename="sessionbutton.cpp" line="120"/>
         <source>Create session icon on desktop...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="123"/>
+        <location filename="sessionbutton.cpp" line="125"/>
         <source>Delete session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="136"/>
+        <location filename="sessionbutton.cpp" line="138"/>
         <source>Session actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
+        <location filename="sessionbutton.cpp" line="139"/>
         <source>Select type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="139"/>
+        <location filename="sessionbutton.cpp" line="141"/>
         <source>Select resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="140"/>
+        <location filename="sessionbutton.cpp" line="142"/>
         <source>Toggle sound support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="270"/>
+        <location filename="sessionbutton.cpp" line="272"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="275"/>
+        <location filename="sessionbutton.cpp" line="277"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="279"/>
+        <location filename="sessionbutton.cpp" line="281"/>
         <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="312"/>
+        <location filename="sessionbutton.cpp" line="314"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="323"/>
-        <location filename="sessionbutton.cpp" line="355"/>
-        <location filename="sessionbutton.cpp" line="588"/>
+        <location filename="sessionbutton.cpp" line="325"/>
+        <location filename="sessionbutton.cpp" line="357"/>
+        <location filename="sessionbutton.cpp" line="616"/>
         <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="324"/>
-        <location filename="sessionbutton.cpp" line="361"/>
-        <location filename="sessionbutton.cpp" line="594"/>
+        <location filename="sessionbutton.cpp" line="326"/>
+        <location filename="sessionbutton.cpp" line="363"/>
+        <location filename="sessionbutton.cpp" line="622"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="325"/>
-        <location filename="sessionbutton.cpp" line="349"/>
-        <location filename="sessionbutton.cpp" line="582"/>
+        <location filename="sessionbutton.cpp" line="327"/>
+        <location filename="sessionbutton.cpp" line="351"/>
+        <location filename="sessionbutton.cpp" line="610"/>
         <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="383"/>
-        <location filename="sessionbutton.cpp" line="395"/>
-        <location filename="sessionbutton.cpp" line="635"/>
+        <location filename="sessionbutton.cpp" line="385"/>
+        <location filename="sessionbutton.cpp" line="402"/>
+        <location filename="sessionbutton.cpp" line="663"/>
         <source>fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="390"/>
-        <location filename="sessionbutton.cpp" line="409"/>
+        <location filename="sessionbutton.cpp" line="389"/>
+        <location filename="sessionbutton.cpp" line="412"/>
+        <location filename="sessionbutton.cpp" line="416"/>
+        <location filename="sessionbutton.cpp" line="669"/>
+        <location filename="sessionbutton.cpp" line="672"/>
+        <source>Display </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sessionbutton.cpp" line="397"/>
+        <location filename="sessionbutton.cpp" line="437"/>
         <source>window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="417"/>
-        <location filename="sessionbutton.cpp" line="547"/>
+        <location filename="sessionbutton.cpp" line="445"/>
+        <location filename="sessionbutton.cpp" line="575"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="419"/>
-        <location filename="sessionbutton.cpp" line="549"/>
+        <location filename="sessionbutton.cpp" line="447"/>
+        <location filename="sessionbutton.cpp" line="577"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1919,221 +1983,246 @@ lpr -P hp_laserjet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="111"/>
+        <location filename="sessionwidget.cpp" line="108"/>
+        <source>Kerberos 5 (GSSAPI) authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sessionwidget.cpp" line="113"/>
         <source>&Session type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
+        <location filename="sessionwidget.cpp" line="118"/>
         <source>Session type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="125"/>
-        <location filename="sessionwidget.cpp" line="292"/>
+        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="296"/>
         <source>Connect to Windows terminal server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="126"/>
+        <location filename="sessionwidget.cpp" line="128"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="129"/>
         <source>Connect to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="128"/>
+        <location filename="sessionwidget.cpp" line="130"/>
         <source>Custom desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="129"/>
+        <location filename="sessionwidget.cpp" line="131"/>
         <source>Single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="131"/>
-        <location filename="sessionwidget.cpp" line="248"/>
+        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="sessionwidget.cpp" line="252"/>
         <source>Command:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="132"/>
+        <location filename="sessionwidget.cpp" line="134"/>
         <source>Advanced options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="143"/>
-        <location filename="sessionwidget.cpp" line="420"/>
-        <location filename="sessionwidget.cpp" line="482"/>
+        <location filename="sessionwidget.cpp" line="145"/>
+        <location filename="sessionwidget.cpp" line="429"/>
+        <location filename="sessionwidget.cpp" line="492"/>
         <source>Path to executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="192"/>
+        <location filename="sessionwidget.cpp" line="196"/>
         <source>Open picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="194"/>
+        <location filename="sessionwidget.cpp" line="198"/>
         <source>Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="215"/>
+        <location filename="sessionwidget.cpp" line="219"/>
         <source>Open key file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="sessionwidget.cpp" line="221"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="269"/>
-        <location filename="sessionwidget.cpp" line="384"/>
-        <source>Server:</source>
+        <location filename="sessionwidget.cpp" line="231"/>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="275"/>
-        <location filename="sessionwidget.cpp" line="392"/>
-        <source>XDMCP server:</source>
+        <location filename="sessionwidget.cpp" line="232"/>
+        <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="293"/>
-        <source>rdesktop command line options:</source>
+        <location filename="sessionwidget.cpp" line="273"/>
+        <location filename="sessionwidget.cpp" line="391"/>
+        <source>Server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="306"/>
-        <location filename="sessionwidget.cpp" line="404"/>
-        <source>New session</source>
+        <location filename="sessionwidget.cpp" line="279"/>
+        <location filename="sessionwidget.cpp" line="399"/>
+        <source>XDMCP server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="227"/>
-        <source>Error</source>
+        <location filename="sessionwidget.cpp" line="297"/>
+        <source>rdesktop command line options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="228"/>
-        <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="sessionwidget.cpp" line="310"/>
+        <location filename="sessionwidget.cpp" line="411"/>
+        <source>New session</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="33"/>
-        <location filename="settingswidget.cpp" line="37"/>
+        <location filename="settingswidget.cpp" line="40"/>
+        <location filename="settingswidget.cpp" line="44"/>
         <source>&Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="34"/>
-        <location filename="settingswidget.cpp" line="38"/>
+        <location filename="settingswidget.cpp" line="41"/>
+        <location filename="settingswidget.cpp" line="45"/>
         <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="35"/>
-        <location filename="settingswidget.cpp" line="39"/>
+        <location filename="settingswidget.cpp" line="42"/>
+        <location filename="settingswidget.cpp" line="46"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
+        <location filename="settingswidget.cpp" line="57"/>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="52"/>
+        <location filename="settingswidget.cpp" line="59"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="54"/>
+        <location filename="settingswidget.cpp" line="61"/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="61"/>
+        <location filename="settingswidget.cpp" line="63"/>
+        <source>Use whole display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="79"/>
+        <location filename="settingswidget.cpp" line="76"/>
+        <source>Xinerama extension (support for two or more physical displays)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="92"/>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="settingswidget.cpp" line="95"/>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="settingswidget.cpp" line="102"/>
+        <source>&Display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="104"/>
+        <source>&Identify all displays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="142"/>
         <source>Keep current keyboard Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="settingswidget.cpp" line="152"/>
         <source>Keyboard layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="113"/>
+        <location filename="settingswidget.cpp" line="154"/>
         <source>Keyboard model:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="124"/>
+        <location filename="settingswidget.cpp" line="165"/>
         <source>Enable sound support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="133"/>
+        <location filename="settingswidget.cpp" line="174"/>
         <source>Start sound daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="135"/>
+        <location filename="settingswidget.cpp" line="176"/>
         <source>Use running sound daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="137"/>
+        <location filename="settingswidget.cpp" line="178"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="139"/>
+        <location filename="settingswidget.cpp" line="180"/>
         <source>Use default sound port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="146"/>
+        <location filename="settingswidget.cpp" line="187"/>
         <source>Sound port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="173"/>
+        <location filename="settingswidget.cpp" line="214"/>
         <source>Client side printing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="440"/>
+        <location filename="settingswidget.cpp" line="554"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="441"/>
+        <location filename="settingswidget.cpp" line="555"/>
         <source>pc105/us</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2172,40 +2261,28 @@ sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="95"/>
-        <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="sharewidget.cpp" line="158"/>
-        <source>Select folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="sharewidget.cpp" line="76"/>
         <source>Filename encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="229"/>
-        <location filename="sharewidget.cpp" line="280"/>
-        <source>WINDOWS-1252</source>
+        <location filename="sharewidget.cpp" line="82"/>
+        <source>local:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="239"/>
-        <location filename="sharewidget.cpp" line="286"/>
-        <source>ISO8859-1</source>
+        <location filename="sharewidget.cpp" line="83"/>
+        <source>remote:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
-        <source>local:</source>
+        <location filename="sharewidget.cpp" line="95"/>
+        <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="83"/>
-        <source>remote:</source>
+        <location filename="sharewidget.cpp" line="158"/>
+        <source>Select folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2218,86 +2295,98 @@ sound system connections through firewalls</source>
         <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="sharewidget.cpp" line="229"/>
+        <location filename="sharewidget.cpp" line="280"/>
+        <source>WINDOWS-1252</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharewidget.cpp" line="239"/>
+        <location filename="sharewidget.cpp" line="286"/>
+        <source>ISO8859-1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="100"/>
+        <location filename="sshmasterconnection.cpp" line="124"/>
         <source>Can not initialize libssh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="120"/>
+        <location filename="sshmasterconnection.cpp" line="144"/>
         <source>Can not create ssh session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="135"/>
+        <location filename="sshmasterconnection.cpp" line="159"/>
         <source>Can not connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="171"/>
+        <location filename="sshmasterconnection.cpp" line="200"/>
         <source>Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="216"/>
         <source>channel_forward_listen failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="498"/>
+        <location filename="sshmasterconnection.cpp" line="530"/>
         <source>Can not open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="510"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="523"/>
+        <location filename="sshmasterconnection.cpp" line="555"/>
         <source>Can not write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="573"/>
+        <location filename="sshmasterconnection.cpp" line="605"/>
         <source>can not connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="682"/>
+        <location filename="sshmasterconnection.cpp" line="714"/>
         <source>channel_open_forward failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_open_session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="708"/>
+        <location filename="sshmasterconnection.cpp" line="740"/>
         <source>channel_request_exec failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="773"/>
+        <location filename="sshmasterconnection.cpp" line="805"/>
         <source>error writing to socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="791"/>
+        <location filename="sshmasterconnection.cpp" line="823"/>
         <source>error reading channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="821"/>
+        <location filename="sshmasterconnection.cpp" line="853"/>
         <source>channel_write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="833"/>
+        <location filename="sshmasterconnection.cpp" line="865"/>
         <source>error reading tcp socket</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2305,12 +2394,12 @@ sound system connections through firewalls</source>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="92"/>
+        <location filename="sshprocess.cpp" line="97"/>
         <source>Error creating socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="110"/>
+        <location filename="sshprocess.cpp" line="115"/>
         <source>Error binding </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/x2goclient_fr.qm b/x2goclient_fr.qm
deleted file mode 100644
index be651ee..0000000
--- a/x2goclient_fr.qm
+++ /dev/null
@@ -1 +0,0 @@
-<¸dÊÍ!¿`¡½Ý
\ No newline at end of file
diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts
index 1cd6797..02cf546 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="fr">
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
@@ -124,6 +124,57 @@
     </message>
 </context>
 <context>
+    <name>ConTest</name>
+    <message>
+        <location filename="contest.ui" line="14"/>
+        <source>Connectivity test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="24"/>
+        <source>HTTPS connection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="31"/>
+        <source>SSH connection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="38"/>
+        <source>Connection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="123"/>
+        <location filename="contest.ui" line="167"/>
+        <source>Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="211"/>
+        <source>0 Kb/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="108"/>
+        <location filename="contest.cpp" line="115"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="150"/>
+        <source>Socket operation timed out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="162"/>
+        <location filename="contest.cpp" line="168"/>
+        <source>Failed: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigDialog</name>
     <message>
         <location filename="configdialog.cpp" line="50"/>
@@ -472,121 +523,121 @@
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="164"/>
+        <location filename="httpbrokerclient.cpp" line="178"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="167"/>
+        <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="294"/>
         <location filename="httpbrokerclient.cpp" line="308"/>
-        <location filename="httpbrokerclient.cpp" line="345"/>
+        <location filename="httpbrokerclient.cpp" line="328"/>
+        <location filename="httpbrokerclient.cpp" line="365"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="309"/>
+        <location filename="httpbrokerclient.cpp" line="329"/>
         <source>Login failed!<br>Please try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="346"/>
+        <location filename="httpbrokerclient.cpp" line="366"/>
         <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="433"/>
+        <location filename="httpbrokerclient.cpp" line="454"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="436"/>
+        <location filename="httpbrokerclient.cpp" line="457"/>
         <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="441"/>
+        <location filename="httpbrokerclient.cpp" line="462"/>
         <source>Secure connection failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="446"/>
+        <location filename="httpbrokerclient.cpp" line="467"/>
         <source>Issued to:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="447"/>
-        <location filename="httpbrokerclient.cpp" line="459"/>
+        <location filename="httpbrokerclient.cpp" line="468"/>
+        <location filename="httpbrokerclient.cpp" line="480"/>
         <source>Common Name(CN)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="450"/>
-        <location filename="httpbrokerclient.cpp" line="462"/>
+        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="483"/>
         <source>Organization(O)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="453"/>
-        <location filename="httpbrokerclient.cpp" line="465"/>
+        <location filename="httpbrokerclient.cpp" line="474"/>
+        <location filename="httpbrokerclient.cpp" line="486"/>
         <source>Organizational Unit(OU)	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="456"/>
+        <location filename="httpbrokerclient.cpp" line="477"/>
         <source>Serial Number	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="458"/>
+        <location filename="httpbrokerclient.cpp" line="479"/>
         <source>Issued by:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="469"/>
+        <location filename="httpbrokerclient.cpp" line="490"/>
         <source>Validity:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="470"/>
+        <location filename="httpbrokerclient.cpp" line="491"/>
         <source>Issued on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="492"/>
         <source>expires on	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="472"/>
+        <location filename="httpbrokerclient.cpp" line="493"/>
         <source>Fingerprints:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="473"/>
+        <location filename="httpbrokerclient.cpp" line="494"/>
         <source>SHA1	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="475"/>
+        <location filename="httpbrokerclient.cpp" line="496"/>
         <source>MD5	</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="481"/>
+        <location filename="httpbrokerclient.cpp" line="502"/>
         <source>Exit X2Go Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="483"/>
+        <location filename="httpbrokerclient.cpp" line="504"/>
         <source>Add exception</source>
         <translation type="unfinished"></translation>
     </message>
@@ -594,473 +645,478 @@
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="80"/>
-        <location filename="onmainwindow_part3.cpp" line="307"/>
+        <location filename="onmainwindow.cpp" line="84"/>
+        <location filename="onmainwindow_part3.cpp" line="312"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="81"/>
+        <location filename="onmainwindow.cpp" line="85"/>
         <source>pc105/us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="126"/>
+        <location filename="onmainwindow.cpp" line="130"/>
         <source>X2Go client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="143"/>
-        <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2148"/>
+        <location filename="onmainwindow.cpp" line="147"/>
+        <location filename="onmainwindow_part2.cpp" line="189"/>
+        <location filename="onmainwindow_part2.cpp" line="2178"/>
         <source>connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="150"/>
+        <location filename="onmainwindow.cpp" line="154"/>
         <source>Internet browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="151"/>
+        <location filename="onmainwindow.cpp" line="155"/>
         <source>Email client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="152"/>
+        <location filename="onmainwindow.cpp" line="156"/>
         <source>OpenOffice.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="153"/>
+        <location filename="onmainwindow.cpp" line="157"/>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="325"/>
+        <location filename="onmainwindow.cpp" line="329"/>
         <source>&Settings ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="329"/>
+        <location filename="onmainwindow.cpp" line="333"/>
         <source>Support ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="336"/>
-        <location filename="onmainwindow_part3.cpp" line="1536"/>
+        <location filename="onmainwindow.cpp" line="340"/>
+        <location filename="onmainwindow_part3.cpp" line="1542"/>
         <source>About X2GO client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="476"/>
-        <location filename="onmainwindow.cpp" line="926"/>
-        <location filename="onmainwindow_part4.cpp" line="1610"/>
+        <location filename="onmainwindow.cpp" line="485"/>
+        <location filename="onmainwindow.cpp" line="944"/>
+        <location filename="onmainwindow_part4.cpp" line="1844"/>
         <source>Share folder...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="479"/>
-        <location filename="onmainwindow.cpp" line="927"/>
-        <location filename="onmainwindow_part2.cpp" line="2200"/>
-        <location filename="onmainwindow_part4.cpp" line="1761"/>
+        <location filename="onmainwindow.cpp" line="488"/>
+        <location filename="onmainwindow.cpp" line="945"/>
+        <location filename="onmainwindow_part2.cpp" line="2230"/>
+        <location filename="onmainwindow_part4.cpp" line="1995"/>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="482"/>
-        <location filename="onmainwindow.cpp" line="928"/>
-        <location filename="onmainwindow_part4.cpp" line="1609"/>
-        <location filename="onmainwindow_part4.cpp" line="1763"/>
+        <location filename="onmainwindow.cpp" line="491"/>
+        <location filename="onmainwindow.cpp" line="946"/>
+        <location filename="onmainwindow_part4.cpp" line="1843"/>
+        <location filename="onmainwindow_part4.cpp" line="1997"/>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="484"/>
+        <location filename="onmainwindow.cpp" line="493"/>
         <source>Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="488"/>
-        <location filename="onmainwindow_part4.cpp" line="1054"/>
+        <location filename="onmainwindow.cpp" line="497"/>
+        <location filename="onmainwindow_part4.cpp" line="1288"/>
         <source>Detach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="491"/>
-        <location filename="onmainwindow_part4.cpp" line="2064"/>
+        <location filename="onmainwindow.cpp" line="500"/>
+        <location filename="onmainwindow_part4.cpp" line="2298"/>
         <source>Minimize toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
-        <location filename="onmainwindow.cpp" line="1782"/>
-        <location filename="onmainwindow_part3.cpp" line="1636"/>
+        <location filename="onmainwindow.cpp" line="610"/>
+        <location filename="onmainwindow.cpp" line="1820"/>
+        <location filename="onmainwindow_part3.cpp" line="1642"/>
         <source>Session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="653"/>
+        <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="654"/>
+        <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="655"/>
-        <location filename="onmainwindow.cpp" line="940"/>
+        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="958"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="658"/>
+        <location filename="onmainwindow.cpp" line="667"/>
         <source>&New session ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="659"/>
+        <location filename="onmainwindow.cpp" line="668"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="673"/>
         <source>Session management...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="665"/>
+        <location filename="onmainwindow.cpp" line="674"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="675"/>
+        <location filename="onmainwindow.cpp" line="684"/>
         <source>&Create session icon on desktop...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="684"/>
+        <location filename="onmainwindow.cpp" line="693"/>
         <source>&Set broker password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="692"/>
-        <location filename="onmainwindow.cpp" line="713"/>
+        <location filename="onmainwindow.cpp" line="704"/>
+        <source>&Connectivity test...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="711"/>
+        <location filename="onmainwindow.cpp" line="732"/>
         <source>Show toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="698"/>
+        <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="715"/>
+        <location filename="onmainwindow.cpp" line="734"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="721"/>
+        <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="722"/>
+        <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="739"/>
+        <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="776"/>
-        <location filename="onmainwindow.cpp" line="1775"/>
-        <location filename="onmainwindow_part3.cpp" line="1629"/>
-        <location filename="onmainwindow_part4.cpp" line="1422"/>
+        <location filename="onmainwindow.cpp" line="799"/>
+        <location filename="onmainwindow.cpp" line="1813"/>
+        <location filename="onmainwindow_part3.cpp" line="1635"/>
+        <location filename="onmainwindow_part4.cpp" line="1656"/>
         <source>Login:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
+        <location filename="onmainwindow.cpp" line="820"/>
         <source>Operation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="811"/>
+        <location filename="onmainwindow.cpp" line="824"/>
         <source>Password changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="830"/>
+        <location filename="onmainwindow.cpp" line="848"/>
         <source>Wrong password!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="879"/>
+        <location filename="onmainwindow.cpp" line="897"/>
         <source><b>Authentication</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="920"/>
+        <location filename="onmainwindow.cpp" line="938"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="923"/>
-        <location filename="onmainwindow_part2.cpp" line="2061"/>
+        <location filename="onmainwindow.cpp" line="941"/>
+        <location filename="onmainwindow_part2.cpp" line="2091"/>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="951"/>
+        <location filename="onmainwindow.cpp" line="969"/>
         <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
-        <location filename="onmainwindow.cpp" line="830"/>
-        <location filename="onmainwindow.cpp" line="1471"/>
-        <location filename="onmainwindow.cpp" line="1499"/>
-        <location filename="onmainwindow.cpp" line="1507"/>
-        <location filename="onmainwindow.cpp" line="1640"/>
-        <location filename="onmainwindow.cpp" line="1667"/>
-        <location filename="onmainwindow.cpp" line="1670"/>
-        <location filename="onmainwindow.cpp" line="1917"/>
-        <location filename="onmainwindow.cpp" line="2140"/>
-        <location filename="onmainwindow.cpp" line="2154"/>
-        <location filename="onmainwindow.cpp" line="2167"/>
-        <location filename="onmainwindow.cpp" line="2201"/>
-        <location filename="onmainwindow.cpp" line="2246"/>
-        <location filename="onmainwindow_part2.cpp" line="297"/>
-        <location filename="onmainwindow_part2.cpp" line="473"/>
-        <location filename="onmainwindow_part2.cpp" line="482"/>
-        <location filename="onmainwindow_part2.cpp" line="781"/>
-        <location filename="onmainwindow_part2.cpp" line="1232"/>
-        <location filename="onmainwindow_part2.cpp" line="1293"/>
-        <location filename="onmainwindow_part2.cpp" line="1344"/>
-        <location filename="onmainwindow_part2.cpp" line="1377"/>
-        <location filename="onmainwindow_part2.cpp" line="1421"/>
-        <location filename="onmainwindow_part2.cpp" line="1801"/>
-        <location filename="onmainwindow_part2.cpp" line="1827"/>
-        <location filename="onmainwindow_part2.cpp" line="1958"/>
+        <location filename="onmainwindow.cpp" line="820"/>
+        <location filename="onmainwindow.cpp" line="848"/>
+        <location filename="onmainwindow.cpp" line="1495"/>
+        <location filename="onmainwindow.cpp" line="1524"/>
+        <location filename="onmainwindow.cpp" line="1532"/>
+        <location filename="onmainwindow.cpp" line="1678"/>
+        <location filename="onmainwindow.cpp" line="1705"/>
+        <location filename="onmainwindow.cpp" line="1708"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
+        <location filename="onmainwindow.cpp" line="2178"/>
+        <location filename="onmainwindow.cpp" line="2192"/>
+        <location filename="onmainwindow.cpp" line="2205"/>
+        <location filename="onmainwindow.cpp" line="2239"/>
+        <location filename="onmainwindow.cpp" line="2284"/>
+        <location filename="onmainwindow_part2.cpp" line="305"/>
+        <location filename="onmainwindow_part2.cpp" line="481"/>
+        <location filename="onmainwindow_part2.cpp" line="490"/>
+        <location filename="onmainwindow_part2.cpp" line="789"/>
+        <location filename="onmainwindow_part2.cpp" line="1240"/>
+        <location filename="onmainwindow_part2.cpp" line="1301"/>
+        <location filename="onmainwindow_part2.cpp" line="1352"/>
+        <location filename="onmainwindow_part2.cpp" line="1385"/>
+        <location filename="onmainwindow_part2.cpp" line="1429"/>
+        <location filename="onmainwindow_part2.cpp" line="1830"/>
+        <location filename="onmainwindow_part2.cpp" line="1856"/>
+        <location filename="onmainwindow_part2.cpp" line="1988"/>
         <location filename="onmainwindow_part3.cpp" line="202"/>
-        <location filename="onmainwindow_part3.cpp" line="768"/>
-        <location filename="onmainwindow_part3.cpp" line="848"/>
-        <location filename="onmainwindow_part3.cpp" line="1092"/>
-        <location filename="onmainwindow_part3.cpp" line="1220"/>
-        <location filename="onmainwindow_part3.cpp" line="1273"/>
-        <location filename="onmainwindow_part3.cpp" line="1579"/>
-        <location filename="onmainwindow_part3.cpp" line="1581"/>
-        <location filename="onmainwindow_part3.cpp" line="1811"/>
-        <location filename="onmainwindow_part3.cpp" line="1859"/>
-        <location filename="onmainwindow_part3.cpp" line="1887"/>
-        <location filename="onmainwindow_part3.cpp" line="2257"/>
-        <location filename="onmainwindow_part3.cpp" line="2272"/>
-        <location filename="onmainwindow_part3.cpp" line="2326"/>
+        <location filename="onmainwindow_part3.cpp" line="773"/>
+        <location filename="onmainwindow_part3.cpp" line="854"/>
+        <location filename="onmainwindow_part3.cpp" line="1098"/>
+        <location filename="onmainwindow_part3.cpp" line="1226"/>
+        <location filename="onmainwindow_part3.cpp" line="1279"/>
+        <location filename="onmainwindow_part3.cpp" line="1585"/>
+        <location filename="onmainwindow_part3.cpp" line="1587"/>
+        <location filename="onmainwindow_part3.cpp" line="1817"/>
+        <location filename="onmainwindow_part3.cpp" line="1865"/>
+        <location filename="onmainwindow_part3.cpp" line="1893"/>
+        <location filename="onmainwindow_part3.cpp" line="2263"/>
+        <location filename="onmainwindow_part3.cpp" line="2278"/>
+        <location filename="onmainwindow_part3.cpp" line="2332"/>
         <location filename="onmainwindow_part4.cpp" line="29"/>
         <location filename="onmainwindow_part4.cpp" line="54"/>
-        <location filename="onmainwindow_part4.cpp" line="1980"/>
-        <location filename="onmainwindow_part4.cpp" line="2251"/>
+        <location filename="onmainwindow_part4.cpp" line="2214"/>
+        <location filename="onmainwindow_part4.cpp" line="2485"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1472"/>
-        <location filename="onmainwindow.cpp" line="1641"/>
-        <location filename="onmainwindow.cpp" line="1671"/>
+        <location filename="onmainwindow.cpp" line="1496"/>
+        <location filename="onmainwindow.cpp" line="1679"/>
+        <location filename="onmainwindow.cpp" line="1709"/>
         <source>Please check LDAP settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1506"/>
+        <location filename="onmainwindow.cpp" line="1531"/>
         <source>no X2Go server found in LDAP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1805"/>
+        <location filename="onmainwindow.cpp" line="1843"/>
         <source>Create session icon on desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1806"/>
+        <location filename="onmainwindow.cpp" line="1844"/>
         <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"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1817"/>
+        <location filename="onmainwindow.cpp" line="1855"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1867"/>
+        <location filename="onmainwindow.cpp" line="1905"/>
         <source>X2Go Link to session </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1917"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
         <source>X2Go sessions not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2065"/>
+        <location filename="onmainwindow.cpp" line="2103"/>
         <source>Are you sure you want to delete this session?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2372"/>
+        <location filename="onmainwindow.cpp" line="2411"/>
         <location filename="onmainwindow_part3.cpp" line="68"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2431"/>
+        <location filename="onmainwindow.cpp" line="2473"/>
         <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2435"/>
+        <location filename="onmainwindow.cpp" line="2477"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2439"/>
+        <location filename="onmainwindow.cpp" line="2481"/>
         <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2443"/>
+        <location filename="onmainwindow.cpp" line="2485"/>
         <source> on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="290"/>
-        <location filename="onmainwindow_part2.cpp" line="1286"/>
-        <location filename="onmainwindow_part2.cpp" line="1370"/>
-        <location filename="onmainwindow_part2.cpp" line="1403"/>
-        <location filename="onmainwindow_part3.cpp" line="761"/>
-        <location filename="onmainwindow_part3.cpp" line="841"/>
-        <location filename="onmainwindow_part3.cpp" line="1213"/>
-        <location filename="onmainwindow_part3.cpp" line="1266"/>
-        <location filename="onmainwindow_part3.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="298"/>
+        <location filename="onmainwindow_part2.cpp" line="1294"/>
+        <location filename="onmainwindow_part2.cpp" line="1378"/>
+        <location filename="onmainwindow_part2.cpp" line="1411"/>
+        <location filename="onmainwindow_part3.cpp" line="766"/>
+        <location filename="onmainwindow_part3.cpp" line="847"/>
+        <location filename="onmainwindow_part3.cpp" line="1219"/>
+        <location filename="onmainwindow_part3.cpp" line="1272"/>
+        <location filename="onmainwindow_part3.cpp" line="2256"/>
         <source><b>Connection failed</b>
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="293"/>
-        <location filename="onmainwindow_part2.cpp" line="1289"/>
-        <location filename="onmainwindow_part2.cpp" line="1373"/>
+        <location filename="onmainwindow_part2.cpp" line="301"/>
+        <location filename="onmainwindow_part2.cpp" line="1297"/>
+        <location filename="onmainwindow_part2.cpp" line="1381"/>
         <location filename="onmainwindow_part3.cpp" line="199"/>
-        <location filename="onmainwindow_part3.cpp" line="764"/>
-        <location filename="onmainwindow_part3.cpp" line="844"/>
-        <location filename="onmainwindow_part3.cpp" line="1216"/>
-        <location filename="onmainwindow_part3.cpp" line="1269"/>
-        <location filename="onmainwindow_part3.cpp" line="2253"/>
+        <location filename="onmainwindow_part3.cpp" line="769"/>
+        <location filename="onmainwindow_part3.cpp" line="850"/>
+        <location filename="onmainwindow_part3.cpp" line="1222"/>
+        <location filename="onmainwindow_part3.cpp" line="1275"/>
+        <location filename="onmainwindow_part3.cpp" line="2259"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="409"/>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="474"/>
+        <location filename="onmainwindow_part2.cpp" line="482"/>
         <source>No server availabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1002"/>
-        <location filename="onmainwindow_part4.cpp" line="1752"/>
+        <location filename="onmainwindow_part2.cpp" line="1010"/>
+        <location filename="onmainwindow_part4.cpp" line="1986"/>
         <source>Select session:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1018"/>
-        <location filename="onmainwindow_part2.cpp" line="1112"/>
-        <location filename="onmainwindow_part2.cpp" line="2164"/>
+        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1120"/>
+        <location filename="onmainwindow_part2.cpp" line="2194"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1020"/>
-        <location filename="onmainwindow_part2.cpp" line="1305"/>
+        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1313"/>
         <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
         <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
         <source>single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1030"/>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
         <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1063"/>
+        <location filename="onmainwindow_part2.cpp" line="1071"/>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1064"/>
+        <location filename="onmainwindow_part2.cpp" line="1072"/>
         <source>No accessible desktop found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1077"/>
-        <location filename="onmainwindow_part4.cpp" line="2165"/>
+        <location filename="onmainwindow_part2.cpp" line="1085"/>
+        <location filename="onmainwindow_part4.cpp" line="2399"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1084"/>
+        <location filename="onmainwindow_part2.cpp" line="1092"/>
         <source>Select desktop:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1153"/>
-        <location filename="onmainwindow_part2.cpp" line="1173"/>
-        <location filename="onmainwindow_part2.cpp" line="1987"/>
-        <location filename="onmainwindow_part2.cpp" line="2376"/>
+        <location filename="onmainwindow_part2.cpp" line="1161"/>
+        <location filename="onmainwindow_part2.cpp" line="1181"/>
+        <location filename="onmainwindow_part2.cpp" line="2017"/>
+        <location filename="onmainwindow_part2.cpp" line="2406"/>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1154"/>
-        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1182"/>
         <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
         <source>24 or 32</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1163"/>
-        <location filename="onmainwindow_part2.cpp" line="1183"/>
+        <location filename="onmainwindow_part2.cpp" line="1171"/>
+        <location filename="onmainwindow_part2.cpp" line="1191"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1166"/>
-        <location filename="onmainwindow_part2.cpp" line="1186"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1194"/>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1076,140 +1132,140 @@ It is now: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
+        <location filename="onmainwindow_part2.cpp" line="91"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="110"/>
+        <location filename="onmainwindow_part2.cpp" line="113"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="115"/>
+        <location filename="onmainwindow_part2.cpp" line="118"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1167"/>
-        <location filename="onmainwindow_part2.cpp" line="1187"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1175"/>
+        <location filename="onmainwindow_part2.cpp" line="1195"/>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="130"/>
         <source>Host key verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
+        <source>Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="483"/>
-        <location filename="onmainwindow_part2.cpp" line="782"/>
-        <location filename="onmainwindow_part2.cpp" line="1233"/>
-        <location filename="onmainwindow_part2.cpp" line="1345"/>
+        <location filename="onmainwindow_part2.cpp" line="491"/>
+        <location filename="onmainwindow_part2.cpp" line="790"/>
+        <location filename="onmainwindow_part2.cpp" line="1241"/>
+        <location filename="onmainwindow_part2.cpp" line="1353"/>
         <source>Server not availabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1250"/>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
         <source>suspending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1272"/>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
         <source>terminating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1799"/>
-        <location filename="onmainwindow_part3.cpp" line="1090"/>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
+        <location filename="onmainwindow_part3.cpp" line="1096"/>
         <source>Unable to create folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1825"/>
+        <location filename="onmainwindow_part2.cpp" line="1854"/>
         <source>Unable to write file:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1930"/>
-        <location filename="onmainwindow_part4.cpp" line="1029"/>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part4.cpp" line="1263"/>
         <source>Attach X2Go window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1956"/>
-        <location filename="onmainwindow_part3.cpp" line="2324"/>
+        <location filename="onmainwindow_part2.cpp" line="1986"/>
+        <location filename="onmainwindow_part3.cpp" line="2330"/>
         <source>Unable to create SSL tunnel:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1985"/>
+        <location filename="onmainwindow_part2.cpp" line="2015"/>
         <source>Unable to create SSL Tunnel:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2133"/>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2156"/>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
         <source>starting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2158"/>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
         <source>resuming</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2220"/>
-        <location filename="onmainwindow_part2.cpp" line="2488"/>
-        <location filename="onmainwindow_part2.cpp" line="2506"/>
+        <location filename="onmainwindow_part2.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="2518"/>
+        <location filename="onmainwindow_part2.cpp" line="2536"/>
         <source>Connection timeout, aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2221"/>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
         <source>aborting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2377"/>
+        <location filename="onmainwindow_part2.cpp" line="2407"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2456"/>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
         <source>Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2458"/>
-        <location filename="onmainwindow_part4.cpp" line="1833"/>
-        <location filename="onmainwindow_part4.cpp" line="1855"/>
+        <location filename="onmainwindow_part2.cpp" line="2488"/>
+        <location filename="onmainwindow_part4.cpp" line="2067"/>
+        <location filename="onmainwindow_part4.cpp" line="2089"/>
         <source>Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
-        <location filename="onmainwindow_part4.cpp" line="1844"/>
+        <location filename="onmainwindow_part2.cpp" line="2490"/>
+        <location filename="onmainwindow_part4.cpp" line="2078"/>
         <source>Creation time</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1221,146 +1277,146 @@ Unsaved documents will be lost</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="404"/>
+        <location filename="onmainwindow_part3.cpp" line="409"/>
         <source> (can't open file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="415"/>
-        <location filename="onmainwindow_part3.cpp" line="425"/>
-        <location filename="onmainwindow_part3.cpp" line="435"/>
+        <location filename="onmainwindow_part3.cpp" line="420"/>
+        <location filename="onmainwindow_part3.cpp" line="430"/>
+        <location filename="onmainwindow_part3.cpp" line="440"/>
         <source> (file not exists)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="459"/>
+        <location filename="onmainwindow_part3.cpp" line="464"/>
         <source> (directory not exists)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="487"/>
+        <location filename="onmainwindow_part3.cpp" line="492"/>
         <source>wrong value for argument"--link"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="505"/>
+        <location filename="onmainwindow_part3.cpp" line="510"/>
         <source>wrong value for argument"--sound"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="522"/>
-        <location filename="onmainwindow_part3.cpp" line="533"/>
+        <location filename="onmainwindow_part3.cpp" line="527"/>
+        <location filename="onmainwindow_part3.cpp" line="538"/>
         <source>wrong value for argument"--geometry"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="551"/>
+        <location filename="onmainwindow_part3.cpp" line="556"/>
         <source>wrong value for argument"--set-kbd"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="568"/>
+        <location filename="onmainwindow_part3.cpp" line="573"/>
         <source>wrong value for argument"--ldap"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="590"/>
+        <location filename="onmainwindow_part3.cpp" line="595"/>
         <source>wrong value for argument"--ldap1"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="609"/>
+        <location filename="onmainwindow_part3.cpp" line="614"/>
         <source>wrong value for argument"--ldap2"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="663"/>
+        <location filename="onmainwindow_part3.cpp" line="668"/>
         <source>wrong value for argument"--pack"</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="671"/>
-        <location filename="onmainwindow_part3.cpp" line="674"/>
+        <location filename="onmainwindow_part3.cpp" line="676"/>
+        <location filename="onmainwindow_part3.cpp" line="679"/>
         <source>wrong parameter: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="719"/>
-        <location filename="onmainwindow_part3.cpp" line="745"/>
+        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="750"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="729"/>
         <source>Available pack methodes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1511"/>
+        <location filename="onmainwindow_part3.cpp" line="1517"/>
         <source>Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1516"/>
+        <location filename="onmainwindow_part3.cpp" line="1522"/>
         <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1520"/>
+        <location filename="onmainwindow_part3.cpp" line="1526"/>
         <source><br>x2goplugin 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_part3.cpp" line="1524"/>
+        <location filename="onmainwindow_part3.cpp" line="1530"/>
         <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 authentification 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>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1537"/>
+        <location filename="onmainwindow_part3.cpp" line="1543"/>
         <source><b>X2Go client V. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1582"/>
+        <location filename="onmainwindow_part3.cpp" line="1588"/>
         <source>Please check LDAP Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1812"/>
+        <location filename="onmainwindow_part3.cpp" line="1818"/>
         <source>No valid card found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1860"/>
+        <location filename="onmainwindow_part3.cpp" line="1866"/>
         <source>This card is unknown by X2Go system</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1888"/>
+        <location filename="onmainwindow_part3.cpp" line="1894"/>
         <source>Unable to create file: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2053"/>
-        <location filename="onmainwindow_part3.cpp" line="2078"/>
+        <location filename="onmainwindow_part3.cpp" line="2059"/>
+        <location filename="onmainwindow_part3.cpp" line="2084"/>
         <source>Can't connect to X-Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2054"/>
-        <location filename="onmainwindow_part3.cpp" line="2079"/>
+        <location filename="onmainwindow_part3.cpp" line="2060"/>
+        <location filename="onmainwindow_part3.cpp" line="2085"/>
         <source>Can't connect to X-Server
 Please check your settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2087"/>
+        <location filename="onmainwindow_part3.cpp" line="2093"/>
         <source>Can't start X Server
 Please check your settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2101"/>
+        <location filename="onmainwindow_part3.cpp" line="2107"/>
         <location filename="onmainwindow_part4.cpp" line="422"/>
         <location filename="onmainwindow_part4.cpp" line="450"/>
         <source>Can't start X Server
@@ -1368,12 +1424,12 @@ Please check your installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2273"/>
+        <location filename="onmainwindow_part3.cpp" line="2279"/>
         <source>Unable to execute: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2289"/>
+        <location filename="onmainwindow_part3.cpp" line="2295"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
         <translation type="unfinished"></translation>
@@ -1391,133 +1447,133 @@ Please update to a newer x2goserver package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1118"/>
+        <location filename="onmainwindow_part4.cpp" line="1352"/>
         <source>X2Go Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1423"/>
+        <location filename="onmainwindow_part4.cpp" line="1657"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1424"/>
+        <location filename="onmainwindow_part4.cpp" line="1658"/>
         <source>Keyboard layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1465"/>
+        <location filename="onmainwindow_part4.cpp" line="1699"/>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1467"/>
-        <location filename="onmainwindow_part4.cpp" line="1756"/>
-        <location filename="onmainwindow_part4.cpp" line="1758"/>
+        <location filename="onmainwindow_part4.cpp" line="1701"/>
+        <location filename="onmainwindow_part4.cpp" line="1990"/>
+        <location filename="onmainwindow_part4.cpp" line="1992"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1600"/>
+        <location filename="onmainwindow_part4.cpp" line="1834"/>
         <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_part4.cpp" line="1608"/>
+        <location filename="onmainwindow_part4.cpp" line="1842"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1612"/>
+        <location filename="onmainwindow_part4.cpp" line="1846"/>
         <source>Show details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1754"/>
+        <location filename="onmainwindow_part4.cpp" line="1988"/>
         <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1766"/>
+        <location filename="onmainwindow_part4.cpp" line="2000"/>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1769"/>
+        <location filename="onmainwindow_part4.cpp" line="2003"/>
         <source>Full access</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1772"/>
+        <location filename="onmainwindow_part4.cpp" line="2006"/>
         <source>View only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1835"/>
+        <location filename="onmainwindow_part4.cpp" line="2069"/>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1837"/>
+        <location filename="onmainwindow_part4.cpp" line="2071"/>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1839"/>
+        <location filename="onmainwindow_part4.cpp" line="2073"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1841"/>
+        <location filename="onmainwindow_part4.cpp" line="2075"/>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1846"/>
+        <location filename="onmainwindow_part4.cpp" line="2080"/>
         <source>Client IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1848"/>
+        <location filename="onmainwindow_part4.cpp" line="2082"/>
         <source>Session ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1852"/>
+        <location filename="onmainwindow_part4.cpp" line="2086"/>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1883"/>
+        <location filename="onmainwindow_part4.cpp" line="2117"/>
         <source>Only my desktops</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1981"/>
+        <location filename="onmainwindow_part4.cpp" line="2215"/>
         <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="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2052"/>
+        <location filename="onmainwindow_part4.cpp" line="2286"/>
         <source>Restore toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2097"/>
+        <location filename="onmainwindow_part4.cpp" line="2331"/>
         <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>
-        <location filename="onmainwindow_part4.cpp" line="2252"/>
+        <location filename="onmainwindow_part4.cpp" line="2486"/>
         <source>Invalid reply from broker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow_part4.cpp" line="2234"/>
+        <location filename="onmainwindow.cpp" line="852"/>
+        <location filename="onmainwindow.cpp" line="2393"/>
+        <location filename="onmainwindow_part4.cpp" line="2468"/>
         <source>Connecting to broker</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1532,7 +1588,7 @@ you can install sshd with
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1300"/>
+        <location filename="onmainwindow_part4.cpp" line="1534"/>
         <source>wrong value for argument"speed"</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1736,103 +1792,112 @@ lpr -P hp_laserjet</source>
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="114"/>
+        <location filename="sessionbutton.cpp" line="116"/>
         <source>Session preferences...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="118"/>
+        <location filename="sessionbutton.cpp" line="120"/>
         <source>Create session icon on desktop...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="123"/>
+        <location filename="sessionbutton.cpp" line="125"/>
         <source>Delete session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="136"/>
+        <location filename="sessionbutton.cpp" line="138"/>
         <source>Session actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
+        <location filename="sessionbutton.cpp" line="139"/>
         <source>Select type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="139"/>
+        <location filename="sessionbutton.cpp" line="141"/>
         <source>Select resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="140"/>
+        <location filename="sessionbutton.cpp" line="142"/>
         <source>Toggle sound support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="270"/>
+        <location filename="sessionbutton.cpp" line="272"/>
         <source>New Session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="275"/>
+        <location filename="sessionbutton.cpp" line="277"/>
         <source>running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="279"/>
+        <location filename="sessionbutton.cpp" line="281"/>
         <source>suspended</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="312"/>
+        <location filename="sessionbutton.cpp" line="314"/>
         <source>KDE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="323"/>
-        <location filename="sessionbutton.cpp" line="355"/>
-        <location filename="sessionbutton.cpp" line="588"/>
+        <location filename="sessionbutton.cpp" line="325"/>
+        <location filename="sessionbutton.cpp" line="357"/>
+        <location filename="sessionbutton.cpp" line="616"/>
         <source>RDP connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="324"/>
-        <location filename="sessionbutton.cpp" line="361"/>
-        <location filename="sessionbutton.cpp" line="594"/>
+        <location filename="sessionbutton.cpp" line="326"/>
+        <location filename="sessionbutton.cpp" line="363"/>
+        <location filename="sessionbutton.cpp" line="622"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="325"/>
-        <location filename="sessionbutton.cpp" line="349"/>
-        <location filename="sessionbutton.cpp" line="582"/>
+        <location filename="sessionbutton.cpp" line="327"/>
+        <location filename="sessionbutton.cpp" line="351"/>
+        <location filename="sessionbutton.cpp" line="610"/>
         <source>Connection to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="383"/>
-        <location filename="sessionbutton.cpp" line="395"/>
-        <location filename="sessionbutton.cpp" line="635"/>
+        <location filename="sessionbutton.cpp" line="385"/>
+        <location filename="sessionbutton.cpp" line="402"/>
+        <location filename="sessionbutton.cpp" line="663"/>
         <source>fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="390"/>
-        <location filename="sessionbutton.cpp" line="409"/>
+        <location filename="sessionbutton.cpp" line="389"/>
+        <location filename="sessionbutton.cpp" line="412"/>
+        <location filename="sessionbutton.cpp" line="416"/>
+        <location filename="sessionbutton.cpp" line="669"/>
+        <location filename="sessionbutton.cpp" line="672"/>
+        <source>Display </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sessionbutton.cpp" line="397"/>
+        <location filename="sessionbutton.cpp" line="437"/>
         <source>window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="417"/>
-        <location filename="sessionbutton.cpp" line="547"/>
+        <location filename="sessionbutton.cpp" line="445"/>
+        <location filename="sessionbutton.cpp" line="575"/>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="419"/>
-        <location filename="sessionbutton.cpp" line="549"/>
+        <location filename="sessionbutton.cpp" line="447"/>
+        <location filename="sessionbutton.cpp" line="577"/>
         <source>Disabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1919,109 +1984,114 @@ lpr -P hp_laserjet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="111"/>
+        <location filename="sessionwidget.cpp" line="108"/>
+        <source>Kerberos 5 (GSSAPI) authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sessionwidget.cpp" line="113"/>
         <source>&Session type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
+        <location filename="sessionwidget.cpp" line="118"/>
         <source>Session type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="125"/>
-        <location filename="sessionwidget.cpp" line="292"/>
+        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="296"/>
         <source>Connect to Windows terminal server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="126"/>
+        <location filename="sessionwidget.cpp" line="128"/>
         <source>XDMCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="129"/>
         <source>Connect to local desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="128"/>
+        <location filename="sessionwidget.cpp" line="130"/>
         <source>Custom desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="129"/>
+        <location filename="sessionwidget.cpp" line="131"/>
         <source>Single application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="131"/>
-        <location filename="sessionwidget.cpp" line="248"/>
+        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="sessionwidget.cpp" line="252"/>
         <source>Command:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="132"/>
+        <location filename="sessionwidget.cpp" line="134"/>
         <source>Advanced options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="143"/>
-        <location filename="sessionwidget.cpp" line="420"/>
-        <location filename="sessionwidget.cpp" line="482"/>
+        <location filename="sessionwidget.cpp" line="145"/>
+        <location filename="sessionwidget.cpp" line="429"/>
+        <location filename="sessionwidget.cpp" line="492"/>
         <source>Path to executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="192"/>
+        <location filename="sessionwidget.cpp" line="196"/>
         <source>Open picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="194"/>
+        <location filename="sessionwidget.cpp" line="198"/>
         <source>Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="215"/>
+        <location filename="sessionwidget.cpp" line="219"/>
         <source>Open key file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="sessionwidget.cpp" line="221"/>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="269"/>
-        <location filename="sessionwidget.cpp" line="384"/>
+        <location filename="sessionwidget.cpp" line="273"/>
+        <location filename="sessionwidget.cpp" line="391"/>
         <source>Server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="275"/>
-        <location filename="sessionwidget.cpp" line="392"/>
+        <location filename="sessionwidget.cpp" line="279"/>
+        <location filename="sessionwidget.cpp" line="399"/>
         <source>XDMCP server:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="293"/>
+        <location filename="sessionwidget.cpp" line="297"/>
         <source>rdesktop command line options:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="306"/>
-        <location filename="sessionwidget.cpp" line="404"/>
+        <location filename="sessionwidget.cpp" line="310"/>
+        <location filename="sessionwidget.cpp" line="411"/>
         <source>New session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="227"/>
+        <location filename="sessionwidget.cpp" line="231"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="228"/>
+        <location filename="sessionwidget.cpp" line="232"/>
         <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>
@@ -2029,111 +2099,131 @@ lpr -P hp_laserjet</source>
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="33"/>
-        <location filename="settingswidget.cpp" line="37"/>
+        <location filename="settingswidget.cpp" line="40"/>
+        <location filename="settingswidget.cpp" line="44"/>
         <source>&Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="34"/>
-        <location filename="settingswidget.cpp" line="38"/>
+        <location filename="settingswidget.cpp" line="41"/>
+        <location filename="settingswidget.cpp" line="45"/>
         <source>&Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="35"/>
-        <location filename="settingswidget.cpp" line="39"/>
+        <location filename="settingswidget.cpp" line="42"/>
+        <location filename="settingswidget.cpp" line="46"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
+        <location filename="settingswidget.cpp" line="57"/>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="52"/>
+        <location filename="settingswidget.cpp" line="59"/>
         <source>Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="54"/>
+        <location filename="settingswidget.cpp" line="61"/>
         <source>Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="61"/>
+        <location filename="settingswidget.cpp" line="63"/>
+        <source>Use whole display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="79"/>
+        <location filename="settingswidget.cpp" line="76"/>
+        <source>Xinerama extension (support for two or more physical displays)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="92"/>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="settingswidget.cpp" line="95"/>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="settingswidget.cpp" line="102"/>
+        <source>&Display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="104"/>
+        <source>&Identify all displays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="142"/>
         <source>Keep current keyboard Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="settingswidget.cpp" line="152"/>
         <source>Keyboard layout:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="113"/>
+        <location filename="settingswidget.cpp" line="154"/>
         <source>Keyboard model:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="124"/>
+        <location filename="settingswidget.cpp" line="165"/>
         <source>Enable sound support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="133"/>
+        <location filename="settingswidget.cpp" line="174"/>
         <source>Start sound daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="135"/>
+        <location filename="settingswidget.cpp" line="176"/>
         <source>Use running sound daemon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="137"/>
+        <location filename="settingswidget.cpp" line="178"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="139"/>
+        <location filename="settingswidget.cpp" line="180"/>
         <source>Use default sound port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="146"/>
+        <location filename="settingswidget.cpp" line="187"/>
         <source>Sound port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="173"/>
+        <location filename="settingswidget.cpp" line="214"/>
         <source>Client side printing support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="440"/>
+        <location filename="settingswidget.cpp" line="554"/>
         <source>us</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="441"/>
+        <location filename="settingswidget.cpp" line="555"/>
         <source>pc105/us</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2222,82 +2312,82 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="100"/>
+        <location filename="sshmasterconnection.cpp" line="124"/>
         <source>Can not initialize libssh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="120"/>
+        <location filename="sshmasterconnection.cpp" line="144"/>
         <source>Can not create ssh session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="135"/>
+        <location filename="sshmasterconnection.cpp" line="159"/>
         <source>Can not connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="171"/>
+        <location filename="sshmasterconnection.cpp" line="200"/>
         <source>Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="216"/>
         <source>channel_forward_listen failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="498"/>
+        <location filename="sshmasterconnection.cpp" line="530"/>
         <source>Can not open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="510"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="523"/>
+        <location filename="sshmasterconnection.cpp" line="555"/>
         <source>Can not write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="573"/>
+        <location filename="sshmasterconnection.cpp" line="605"/>
         <source>can not connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="682"/>
+        <location filename="sshmasterconnection.cpp" line="714"/>
         <source>channel_open_forward failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_open_session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="708"/>
+        <location filename="sshmasterconnection.cpp" line="740"/>
         <source>channel_request_exec failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="773"/>
+        <location filename="sshmasterconnection.cpp" line="805"/>
         <source>error writing to socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="791"/>
+        <location filename="sshmasterconnection.cpp" line="823"/>
         <source>error reading channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="821"/>
+        <location filename="sshmasterconnection.cpp" line="853"/>
         <source>channel_write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="833"/>
+        <location filename="sshmasterconnection.cpp" line="865"/>
         <source>error reading tcp socket</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2305,12 +2395,12 @@ sound system connections through firewalls</source>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="92"/>
+        <location filename="sshprocess.cpp" line="97"/>
         <source>Error creating socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="110"/>
+        <location filename="sshprocess.cpp" line="115"/>
         <source>Error binding </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/x2goclient_zh_tw.ts b/x2goclient_nb_no.ts
similarity index 56%
copy from x2goclient_zh_tw.ts
copy to x2goclient_nb_no.ts
index d5669c1..f541e95 100644
--- a/x2goclient_zh_tw.ts
+++ b/x2goclient_nb_no.ts
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_TW">
+<TS version="2.0" language="nb_NO">
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
         <location filename="brokerpassdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation>對話框</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="22"/>
         <source>Old password:</source>
-        <translation>舊密碼:</translation>
+        <translation>Gammelt passord:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="36"/>
         <source>New password:</source>
-        <translation>新密碼:</translation>
+        <translation>Nytt passord:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="50"/>
         <source>Confirm password:</source>
-        <translation>請再輸入一遍新密碼:</translation>
+        <translation>Bekreft passordet:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="79"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>hm... Am I supposed to translate this?</translatorcomment>
+        <translation>TestLabel</translation>
     </message>
 </context>
 <context>
@@ -34,75 +35,75 @@
     <message>
         <location filename="brokerpassdlg.cpp" line="41"/>
         <source>Passwords do not match</source>
-        <translation>密碼不相符</translation>
+        <translation>Passordene stemmer ikke</translation>
     </message>
 </context>
 <context>
     <name>CUPSPrintWidget</name>
     <message>
+        <location filename="cupsprintwidget.cpp" line="65"/>
+        <source>Idle</source>
+        <translation>Inaktiv</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="68"/>
+        <source>Printing</source>
+        <translation>Skriver</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="71"/>
+        <source>Stopped</source>
+        <translation>Stoppet</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="81"/>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <location filename="cupsprintwidget.cpp" line="81"/>
+        <source>No</source>
+        <translation>Nei</translation>
+    </message>
+    <message>
         <location filename="cupsprintwidget.ui" line="19"/>
         <source>Form</source>
-        <translation>表單</translation>
+        <translation>Form</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="25"/>
         <source>Name:</source>
-        <translation>姓名:</translation>
+        <translation>Navn:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="42"/>
         <source>Properties</source>
-        <translation>屬性</translation>
+        <translation>Egenskaper</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="49"/>
         <source>State:</source>
-        <translation>狀態:</translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="63"/>
         <source>Accepting jobs:</source>
-        <translation>接收的工作:</translation>
+        <translation>Aksepterer jobber:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="77"/>
         <source>Type:</source>
-        <translation>類別:</translation>
+        <translation>Type:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="91"/>
         <source>Location:</source>
-        <translation>位置:</translation>
+        <translation>Plassering:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="105"/>
         <source>Comment:</source>
-        <translation>註解:</translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="65"/>
-        <source>Idle</source>
-        <translation>é–’ç½®</translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="68"/>
-        <source>Printing</source>
-        <translation>正在列印</translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
-        <source>Stopped</source>
-        <translation>已停止</translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="81"/>
-        <source>Yes</source>
-        <translation>是</translation>
-    </message>
-    <message>
-        <location filename="cupsprintwidget.cpp" line="81"/>
-        <source>No</source>
-        <translation>否</translation>
+        <translation>Kommentar:</translation>
     </message>
 </context>
 <context>
@@ -110,17 +111,17 @@
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="104"/>
         <source>No option selected</source>
-        <translation type="unfinished">尚未選取任何選項</translation>
+        <translation>Ingen alternativer valgt</translation>
     </message>
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="265"/>
         <source>This value is in conflict with other option</source>
-        <translation>此設定值與其它選項衝突</translation>
+        <translation>Dette alternativet er i konflikt med et annet alternativ</translation>
     </message>
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="275"/>
         <source>Options conflict</source>
-        <translation>選項衝突</translation>
+        <translation>Alternativskonflikt</translation>
     </message>
 </context>
 <context>
@@ -128,28 +129,29 @@
     <message>
         <location filename="contest.ui" line="14"/>
         <source>Connectivity test</source>
-        <translation>連線測式</translation>
+        <translation>Tilkoblings-test</translation>
     </message>
     <message>
         <location filename="contest.ui" line="24"/>
         <source>HTTPS connection:</source>
-        <translation>加密HTTP連線:</translation>
+        <translation>HTTPS tilkobling</translation>
     </message>
     <message>
         <location filename="contest.ui" line="31"/>
         <source>SSH connection:</source>
-        <translation>SSH連線:</translation>
+        <translation>SSH tilkobling</translation>
     </message>
     <message>
         <location filename="contest.ui" line="38"/>
         <source>Connection speed:</source>
-        <translation>連線速度:</translation>
+        <translatorcomment>Due to the limited space in the UI dialog, I couldn't choose the "correct" word for speed here, so I had to choose a shorter one which isn't the best translation, but it will do.</translatorcomment>
+        <translation>Sambandsfart:</translation>
     </message>
     <message>
         <location filename="contest.ui" line="123"/>
         <location filename="contest.ui" line="167"/>
         <source>Failed</source>
-        <translation>失敗</translation>
+        <translation>Feilet</translation>
     </message>
     <message>
         <location filename="contest.ui" line="211"/>
@@ -160,18 +162,19 @@
         <location filename="contest.cpp" line="108"/>
         <location filename="contest.cpp" line="115"/>
         <source>OK</source>
-        <translation>確定</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="contest.cpp" line="150"/>
         <source>Socket operation timed out</source>
-        <translation>網路操作逾時</translation>
+        <translatorcomment>Grr..! really hard to get this correctly translated, should rather keep the english words here, as we don't have any good ones for these in technical terms</translatorcomment>
+        <translation>Sokkel handlingen ble tidsavbrutt</translation>
     </message>
     <message>
         <location filename="contest.cpp" line="162"/>
         <location filename="contest.cpp" line="168"/>
         <source>Failed: </source>
-        <translation>失敗:</translation>
+        <translation>Feilet: </translation>
     </message>
 </context>
 <context>
@@ -179,157 +182,158 @@
     <message>
         <location filename="configdialog.cpp" line="50"/>
         <source>General</source>
-        <translation>一般設定</translation>
+        <translation>Genrelt</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="59"/>
         <source>Display icon in system tray</source>
-        <translation>在系統狀態列中顯示圖示</translation>
+        <translation>Vis ikon i systemkurven</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="66"/>
         <source>Hide to system tray when minimized</source>
-        <translation>最小化時縮至系統狀態列</translation>
+        <translation>Skjul til systemkurven ved minimering</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="67"/>
         <source>Hide to system tray when closed</source>
-        <translation>關閉時隱藏至系統狀態列</translation>
+        <translation>Skjul til systemkurven ved lukking</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="68"/>
         <source>Hide to system tray after connection is established</source>
-        <translation>連線建立後隱藏至系統狀態列</translation>
+        <translation>Skjul til systemkurven etter tilkoblingen er opprettet</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="69"/>
         <source>Restore from system tray after session is disconnected</source>
-        <translation>當工作階段斷線後從系統狀態列中還原</translation>
+        <translation>Gjenopprett fra systemkurven etter sesjonen blir frakoblet</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="87"/>
         <source>Use LDAP</source>
-        <translation>使用LDAP</translation>
+        <translation>Benytt LDAP</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="111"/>
         <source>Server URL:</source>
-        <translation type="unfinished">伺服器網址:</translation>
+        <translation>Server URL:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="112"/>
         <source>BaseDN:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>According to what I could gather these parts of the certificate shouldn't be translated</translatorcomment>
+        <translation>BaseDN:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="114"/>
         <source>Failover server 1 URL:</source>
-        <translation>備援伺服器網1 網址:</translation>
+        <translation>URL til reserveserver 1:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="116"/>
         <source>Failover server 2 URL:</source>
-        <translation>備援伺服器網2 網址:</translation>
+        <translation>URL til reserveserver 2:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="198"/>
         <location filename="configdialog.cpp" line="340"/>
         <source>X-Server settings</source>
-        <translation>X伺服器設定</translation>
+        <translation>X-Server innstillinger</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="207"/>
         <source>X11 application:</source>
-        <translation>X11應用程式:</translation>
+        <translation>X11 applikasjon:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="218"/>
         <source>X11 version:</source>
-        <translation>X11版本:</translation>
+        <translation>X11 versjon:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="233"/>
         <source>Find X11 application</source>
-        <translation>尋找X11應用程式</translation>
+        <translation>Finn X11 applikasjon</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="250"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>檔案系統匯出時用戶端所使用的SSH連接埠:</translation>
+        <translation>Klientside SSH port for bruk av filsystem eksport:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="260"/>
         <source>Start session embedded inside website</source>
-        <translation>將工作階段嵌入至網站內</translation>
+        <translation>Start sesjonen innebygd i websiden</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="264"/>
         <location filename="configdialog.cpp" line="567"/>
         <location filename="configdialog.cpp" line="579"/>
         <source>Advanced options</source>
-        <translation>進階選項</translation>
+        <translation>Avanserte alternativer</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="291"/>
         <source>Defaults</source>
-        <translation>預設</translation>
+        <translation>Standardoppsett</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="292"/>
         <source>&OK</source>
-        <translation>確定(&O)</translation>
+        <translation>&OK</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="293"/>
         <source>&Cancel</source>
-        <translation>取消(&C)</translation>
+        <translation>&Avbryt</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="316"/>
         <source>Settings</source>
-        <translation>設定</translation>
+        <translation>Innstillinger</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="336"/>
         <source>Printing</source>
-        <translation>列印功能</translation>
+        <translation>Utksrift</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="503"/>
         <location filename="configdialog.cpp" line="521"/>
         <location filename="configdialog.cpp" line="540"/>
         <source>Warning</source>
-        <translation>警告</translation>
+        <translation>Advarsel</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="504"/>
         <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>x2goclient kan ikke finne en passende X11 applikasjon. Vennligst installer Apple X11, eller oppgi stien til applikasjonen</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="522"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>您正在使用X11(Apple X-Window 伺服器) 版本 </translation>
+        <translation>Du benytter X11 (Apple X-Window Server) versjon </translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="524"/>
         <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>. 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>
         <location filename="configdialog.cpp" line="541"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>在您選擇的路徑中沒有合適的X11應用程式</translation>
+        <translation>Ingen passende X11 applikasjon ble funnet i valgt sti</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="577"/>
         <source>&Connection</source>
-        <translation>連線(&C)</translation>
+        <translation>&Tilkobling</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="578"/>
         <source>&Settings</source>
-        <translation>設定(&S)</translation>
+        <translation>&Innstillinger</translation>
     </message>
 </context>
 <context>
@@ -337,32 +341,32 @@
     <message>
         <location filename="connectionwidget.cpp" line="33"/>
         <source>&Connection speed</source>
-        <translation>連線速度(&C)</translation>
+        <translation>&Sambandsfart</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="38"/>
         <source>Connection speed:</source>
-        <translation>連線速度:</translation>
+        <translation>Sambandsfart:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="68"/>
         <source>C&ompression</source>
-        <translation>壓縮(&o)</translation>
+        <translation>&Komprimering</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="85"/>
         <source>Method:</source>
-        <translation>方式:</translation>
+        <translation>Metode:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="87"/>
         <source>Compression method:</source>
-        <translation>壓縮方式:</translation>
+        <translation>Komprimeringsmetode:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="89"/>
         <source>Image quality:</source>
-        <translation>影像品質:</translation>
+        <translation>Bildekvalitet:</translation>
     </message>
 </context>
 <context>
@@ -370,72 +374,72 @@
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="19"/>
         <source>Dialog</source>
-        <translation>對話框</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="35"/>
         <source>General</source>
-        <translation>一般設定</translation>
+        <translation>Generelt</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="45"/>
         <source>Page size:</source>
-        <translation>頁面尺寸:</translation>
+        <translation>Arkstørrelse:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="62"/>
         <source>Paper type:</source>
-        <translation>紙張類型:</translation>
+        <translation>Papirtype:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="72"/>
         <source>Paper source:</source>
-        <translation>紙張來源:</translation>
+        <translation>Papirkilde:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="99"/>
         <source>Duplex Printing</source>
-        <translation>雙面列印</translation>
+        <translation>Tosidig utskrift</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="105"/>
         <source>None</source>
-        <translation>ç„¡</translation>
+        <translation>Ingen</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="112"/>
         <source>Long side</source>
-        <translation>長邊翻轉</translation>
+        <translation>Langsiden</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="119"/>
         <source>Short side</source>
-        <translation>短邊翻轉</translation>
+        <translation>Kortsiden</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="143"/>
         <source>Driver settings</source>
-        <translation>驅動程式設定</translation>
+        <translation>Driver innstillinger</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="175"/>
         <source>Option</source>
-        <translation>選項</translation>
+        <translation>Alternativ</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="180"/>
         <source>Value</source>
-        <translation>數值</translation>
+        <translation>Verdi</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="186"/>
         <source>No option selected</source>
-        <translation>目前沒有選取任何選項</translation>
+        <translation>Ingen alternativer er valgt</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="205"/>
         <source>text</source>
-        <translation>文字</translation>
+        <translation>tekst</translation>
     </message>
 </context>
 <context>
@@ -443,42 +447,42 @@
     <message>
         <location filename="editconnectiondialog.cpp" line="52"/>
         <source>&Session</source>
-        <translation>工作階段(&S)</translation>
+        <translation>&Sesjon</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="53"/>
         <source>&Connection</source>
-        <translation>連線(&C)</translation>
+        <translation>Tilk&obling</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="54"/>
         <source>&Settings</source>
-        <translation>設定(&S)</translation>
+        <translation>&Innstillinger</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="55"/>
         <source>&Shared folders</source>
-        <translation>共享資料夾(&S)</translation>
+        <translation>&Delte mapper</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="57"/>
         <source>&OK</source>
-        <translation>確定(&O)</translation>
+        <translation>&OK</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="58"/>
         <source>&Cancel</source>
-        <translation>取消(&C)</translation>
+        <translation>&Avbryt</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="59"/>
         <source>Defaults</source>
-        <translation>預設值</translation>
+        <translation>Standardoppsett</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="109"/>
         <source>Session preferences - </source>
-        <translation>工作階段偏好設定 - </translation>
+        <translation>Sesjonsinnstillinger - </translation>
     </message>
 </context>
 <context>
@@ -486,38 +490,38 @@
     <message>
         <location filename="exportdialog.cpp" line="38"/>
         <source>&Cancel</source>
-        <translation>取消(&C)</translation>
+        <translation>&Avbryt</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="44"/>
         <source>&share</source>
-        <translation>分享(&s)</translation>
+        <translation>d&el</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="45"/>
         <source>&Preferences ...</source>
-        <translation>偏好設定(&P) ...</translation>
+        <translation>&Innstillinger ...</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="46"/>
         <source>&Custom folder ...</source>
-        <translation>自訂資料夾(&C) ...</translation>
+        <translation>&Egentilpasset mappe ...</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="56"/>
         <source>Delete</source>
         <comment>Delete</comment>
-        <translation>刪除</translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="73"/>
         <source>share folders</source>
-        <translation>共享資料夾</translation>
+        <translation>delte mapper</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="139"/>
         <source>Select folder</source>
-        <translation>選擇資料夾</translation>
+        <translation>Valgt mappe</translation>
     </message>
 </context>
 <context>
@@ -525,121 +529,127 @@
     <message>
         <location filename="httpbrokerclient.cpp" line="178"/>
         <source>us</source>
-        <translation>us</translation>
+        <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment>
+        <translation>no</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
-        <translation>pc105/us</translation>
+        <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment>
+        <translation>pc105/no</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="308"/>
         <location filename="httpbrokerclient.cpp" line="328"/>
         <location filename="httpbrokerclient.cpp" line="365"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Feil</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="329"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>登入失敗! <br>請再試一次</translation>
-    </message>
-    <message>
-        <location filename="httpbrokerclient.cpp" line="366"/>
-        <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>您的工作階段已中斷連線。請返回登入畫面或是在瀏覽器中重新載入頁面以重新連回之前的工作階段。</translation>
+        <translation>Innlogging feilet! <br>Vennligst forsøk igjen</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="454"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
-        <translation><br><b>伺服使器使用了不合法的安全憑證</b><br><br></translation>
+        <translation><br><b>Servereren benytter et ugyldig sikkerhetssertifikat.</b><br><br></translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="457"/>
         <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>
+        <translation><p style='background:#FFFFDC;'>Du burde ikke legge til et unntak om du benytter en internett forbindelse som du ikke stoler 100% på, eller om du ikke er vant med å se advarsler for denne serveren.</p></translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="462"/>
         <source>Secure connection failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sikker tilkobling feilet</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="467"/>
         <source>Issued to:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Utstedet til:
+</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="468"/>
         <location filename="httpbrokerclient.cpp" line="480"/>
         <source>Common Name(CN)	</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn (CN)	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="471"/>
         <location filename="httpbrokerclient.cpp" line="483"/>
         <source>Organization(O)	</source>
-        <translation type="unfinished"></translation>
+        <translation>Organisation (O)	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="474"/>
         <location filename="httpbrokerclient.cpp" line="486"/>
         <source>Organizational Unit(OU)	</source>
-        <translation type="unfinished"></translation>
+        <translation>Organisasjonsenhet (OU)	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="477"/>
         <source>Serial Number	</source>
-        <translation type="unfinished"></translation>
+        <translation>Serienummer	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="479"/>
         <source>Issued by:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Utstedet av:
+</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="490"/>
         <source>Validity:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Gyldighet:
+</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="491"/>
         <source>Issued on	</source>
-        <translation type="unfinished"></translation>
+        <translation>Utstedet den	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="492"/>
         <source>expires on	</source>
-        <translation type="unfinished"></translation>
+        <translation>Utløper den	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="493"/>
         <source>Fingerprints:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Fingeravtrykk:
+</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="494"/>
         <source>SHA1	</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA1	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="496"/>
         <source>MD5	</source>
-        <translation type="unfinished"></translation>
+        <translation>MD5	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="502"/>
         <source>Exit X2Go Client</source>
-        <translation type="unfinished"></translation>
+        <translation>Avlsutt X2Go Klienten</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="504"/>
         <source>Add exception</source>
-        <translation type="unfinished"></translation>
+        <translation>Legg til unntak</translation>
+    </message>
+    <message>
+        <location filename="httpbrokerclient.cpp" line="366"/>
+        <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>Sesjonen din ble koblet ned. For å få tilgang til den kjørende sesjonen din, vennligst returner til innloggingssiden, eller benytt "oppdater" funksjonen i nettleseren din.</translation>
     </message>
 </context>
 <context>
@@ -648,198 +658,131 @@
         <location filename="onmainwindow.cpp" line="84"/>
         <location filename="onmainwindow_part3.cpp" line="312"/>
         <source>us</source>
-        <translation>us</translation>
+        <translation>no</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="85"/>
         <source>pc105/us</source>
-        <translation>pc105/us</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="130"/>
-        <source>X2Go client</source>
-        <translation>X2Go用戶端</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="147"/>
-        <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2152"/>
-        <source>connecting</source>
-        <translation>正在連線</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="154"/>
-        <source>Internet browser</source>
-        <translation>網頁瀏覽器</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="155"/>
-        <source>Email client</source>
-        <translation>電子郵件軟體</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="156"/>
-        <source>OpenOffice.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="157"/>
-        <source>Terminal</source>
-        <translation>終端機</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="329"/>
-        <source>&Settings ...</source>
-        <translation>設定(&S) ...</translation>
+        <translation>pc105/de</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="333"/>
         <source>Support ...</source>
-        <translation>支援 ...</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="340"/>
-        <location filename="onmainwindow_part3.cpp" line="1542"/>
-        <source>About X2GO client</source>
-        <translation>關於X2GO用戶端</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="485"/>
-        <location filename="onmainwindow.cpp" line="944"/>
-        <location filename="onmainwindow_part4.cpp" line="1844"/>
-        <source>Share folder...</source>
-        <translation>共享資料夾...</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="488"/>
-        <location filename="onmainwindow.cpp" line="945"/>
-        <location filename="onmainwindow_part2.cpp" line="2204"/>
-        <location filename="onmainwindow_part4.cpp" line="1995"/>
-        <source>Suspend</source>
-        <translation>暫停</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="491"/>
-        <location filename="onmainwindow.cpp" line="946"/>
-        <location filename="onmainwindow_part4.cpp" line="1843"/>
-        <location filename="onmainwindow_part4.cpp" line="1997"/>
-        <source>Terminate</source>
-        <translation>終止</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="493"/>
-        <source>Reconnect</source>
-        <translation>重新連線</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="497"/>
-        <location filename="onmainwindow_part4.cpp" line="1288"/>
-        <source>Detach X2Go window</source>
-        <translation>脫離X2Go視窗</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="500"/>
-        <location filename="onmainwindow_part4.cpp" line="2298"/>
-        <source>Minimize toolbar</source>
-        <translation>將工具列最小化</translation>
+        <translatorcomment>Need to double-check this one</translatorcomment>
+        <translation>Støtte ...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="610"/>
         <location filename="onmainwindow.cpp" line="1820"/>
         <location filename="onmainwindow_part3.cpp" line="1642"/>
         <source>Session:</source>
-        <translation>工作階段:</translation>
+        <translation>Sesjon:</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
-        <translation>離開(&Q)</translation>
+        <translation>&Avslutt</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="664"/>
         <location filename="onmainwindow.cpp" line="958"/>
         <source>Quit</source>
-        <translation>離開</translation>
+        <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="667"/>
-        <source>&New session ...</source>
-        <translation>新增工作階段(&N) ...</translation>
+        <source>&New Session ...</source>
+        <translation type="obsolete">&Neue Sitzung ...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="668"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="673"/>
-        <source>Session management...</source>
-        <translation>工作階段管理員...</translation>
+        <source>Session Management...</source>
+        <translation type="obsolete">Sitzungsverwaltung...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="674"/>
         <source>Ctrl+E</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="684"/>
-        <source>&Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示(&C)...</translation>
+        <source>LDAP &Settings ...</source>
+        <translation type="obsolete">LDAP &Konfiguration ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="693"/>
-        <source>&Set broker password...</source>
-        <translation>設定代理伺服器密碼(&S)...</translation>
-    </message>
-    <message>
-        <location filename="onmainwindow.cpp" line="704"/>
-        <source>&Connectivity test...</source>
-        <translation>連線能力測試(&C)...</translation>
+        <location filename="onmainwindow_part4.cpp" line="2286"/>
+        <source>Restore toolbar</source>
+        <translation>Gjenopprett verktøylinjen</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="711"/>
-        <location filename="onmainwindow.cpp" line="732"/>
-        <source>Show toolbar</source>
-        <translation>顯示工具列</translation>
+        <source>About X2GO Client</source>
+        <translation type="obsolete">Ãœber X2GO Client</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
-        <translation>關於Qt</translation>
+        <translation>Om QT</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
+        <source>Session</source>
+        <translation>Sesjon</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="734"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
-        <translation>工作階段(&S)</translation>
+        <translation>&Sesjon</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
-        <translation>選項(&O)</translation>
+        <translation>&Innstillinger</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
-        <translation>幫助(&H)</translation>
+        <translation>&Hjelp</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="799"/>
-        <location filename="onmainwindow.cpp" line="1813"/>
-        <location filename="onmainwindow_part3.cpp" line="1635"/>
-        <location filename="onmainwindow_part4.cpp" line="1656"/>
-        <source>Login:</source>
-        <translation>登入:</translation>
+        <location filename="onmainwindow_part4.cpp" line="1657"/>
+        <source>Password:</source>
+        <translation>Passord:</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1658"/>
+        <source>Keyboard layout:</source>
+        <translation>Tastatur utseende:</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1699"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1701"/>
+        <location filename="onmainwindow_part4.cpp" line="1990"/>
+        <location filename="onmainwindow_part4.cpp" line="1992"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="2486"/>
+        <source>Invalid reply from broker</source>
+        <translatorcomment>Need to update/create the Norwegian documentation to make clear what the "megeleren" actually is in this context.</translatorcomment>
+        <translation>Ugyldig svar fra megleren</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="820"/>
@@ -856,18 +799,18 @@
         <location filename="onmainwindow.cpp" line="2205"/>
         <location filename="onmainwindow.cpp" line="2239"/>
         <location filename="onmainwindow.cpp" line="2284"/>
-        <location filename="onmainwindow_part2.cpp" line="300"/>
-        <location filename="onmainwindow_part2.cpp" line="476"/>
-        <location filename="onmainwindow_part2.cpp" line="485"/>
-        <location filename="onmainwindow_part2.cpp" line="784"/>
-        <location filename="onmainwindow_part2.cpp" line="1235"/>
-        <location filename="onmainwindow_part2.cpp" line="1296"/>
-        <location filename="onmainwindow_part2.cpp" line="1347"/>
-        <location filename="onmainwindow_part2.cpp" line="1380"/>
-        <location filename="onmainwindow_part2.cpp" line="1424"/>
-        <location filename="onmainwindow_part2.cpp" line="1804"/>
+        <location filename="onmainwindow_part2.cpp" line="305"/>
+        <location filename="onmainwindow_part2.cpp" line="481"/>
+        <location filename="onmainwindow_part2.cpp" line="490"/>
+        <location filename="onmainwindow_part2.cpp" line="789"/>
+        <location filename="onmainwindow_part2.cpp" line="1240"/>
+        <location filename="onmainwindow_part2.cpp" line="1301"/>
+        <location filename="onmainwindow_part2.cpp" line="1352"/>
+        <location filename="onmainwindow_part2.cpp" line="1385"/>
+        <location filename="onmainwindow_part2.cpp" line="1429"/>
         <location filename="onmainwindow_part2.cpp" line="1830"/>
-        <location filename="onmainwindow_part2.cpp" line="1962"/>
+        <location filename="onmainwindow_part2.cpp" line="1856"/>
+        <location filename="onmainwindow_part2.cpp" line="1988"/>
         <location filename="onmainwindow_part3.cpp" line="202"/>
         <location filename="onmainwindow_part3.cpp" line="773"/>
         <location filename="onmainwindow_part3.cpp" line="854"/>
@@ -887,182 +830,254 @@
         <location filename="onmainwindow_part4.cpp" line="2214"/>
         <location filename="onmainwindow_part4.cpp" line="2485"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Feil</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="820"/>
-        <source>Operation failed</source>
-        <translation>更改密碼失敗</translation>
+        <location filename="onmainwindow.cpp" line="2411"/>
+        <location filename="onmainwindow_part3.cpp" line="68"/>
+        <source>KDE</source>
+        <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="824"/>
-        <source>Password changed</source>
-        <translation>密碼已更改成功</translation>
+        <location filename="onmainwindow.cpp" line="2485"/>
+        <source> on </source>
+        <translation> på </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="848"/>
-        <source>Wrong password!</source>
-        <translation>輸入了錯誤的密碼!</translation>
+        <location filename="onmainwindow.cpp" line="799"/>
+        <location filename="onmainwindow.cpp" line="1813"/>
+        <location filename="onmainwindow_part3.cpp" line="1635"/>
+        <location filename="onmainwindow_part4.cpp" line="1656"/>
+        <source>Login:</source>
+        <translation>Brukernavn:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="852"/>
-        <location filename="onmainwindow.cpp" line="2393"/>
-        <location filename="onmainwindow_part4.cpp" line="2468"/>
-        <source>Connecting to broker</source>
-        <translation>連線至連線代理伺服器</translation>
+        <location filename="onmainwindow_part2.cpp" line="1010"/>
+        <location filename="onmainwindow_part4.cpp" line="1986"/>
+        <source>Select session:</source>
+        <translation>Velg sesjon:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="897"/>
-        <source><b>Authentication</b></source>
-        <translation><b>身份驗證</b></translation>
+        <location filename="onmainwindow_part4.cpp" line="1988"/>
+        <source>Resume</source>
+        <translation>Gjenoppta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="938"/>
-        <source>Restore</source>
-        <translation>還原</translation>
+        <location filename="onmainwindow.cpp" line="488"/>
+        <location filename="onmainwindow.cpp" line="945"/>
+        <location filename="onmainwindow_part2.cpp" line="2230"/>
+        <location filename="onmainwindow_part4.cpp" line="1995"/>
+        <source>Suspend</source>
+        <translatorcomment>I disagree with the word 'Suspend' here, if it was suspending then the session would be paused. As this is not the case, it's more like disconnect (and the counterpart: reconnect). I used the translation fro 'Disconnect' here, and will research the possibility of changing the Suspend word to Disconnect also in the english translation.</translatorcomment>
+        <translation>Koble fra</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="941"/>
-        <location filename="onmainwindow_part2.cpp" line="2065"/>
-        <source>Not connected</source>
-        <translation>尚未連線</translation>
+        <location filename="onmainwindow.cpp" line="491"/>
+        <location filename="onmainwindow.cpp" line="946"/>
+        <location filename="onmainwindow_part4.cpp" line="1843"/>
+        <location filename="onmainwindow_part4.cpp" line="1997"/>
+        <source>Terminate</source>
+        <translatorcomment>Need to revisit this word to see if the chosen one is *strong* enough</translatorcomment>
+        <translation>Avslutte</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="969"/>
-        <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation>
+        <location filename="onmainwindow_part4.cpp" line="2000"/>
+        <source>New</source>
+        <translation>Ny</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1496"/>
-        <location filename="onmainwindow.cpp" line="1679"/>
-        <location filename="onmainwindow.cpp" line="1709"/>
-        <source>Please check LDAP settings</source>
-        <translation>請確認LDAP的設定</translation>
+        <location filename="onmainwindow_part2.cpp" line="2488"/>
+        <location filename="onmainwindow_part4.cpp" line="2067"/>
+        <location filename="onmainwindow_part4.cpp" line="2089"/>
+        <source>Display</source>
+        <translation>Skjerm</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1531"/>
-        <source>no X2Go server found in LDAP </source>
-        <translation>在LDAP環境中沒有找到X2Go伺服器</translation>
+        <location filename="onmainwindow_part4.cpp" line="2069"/>
+        <source>Status</source>
+        <translation>Status</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1843"/>
-        <source>Create session icon on desktop</source>
-        <translation>在桌面上建立工作階段圖示</translation>
+        <location filename="onmainwindow_part4.cpp" line="2075"/>
+        <source>Server</source>
+        <translation>Server</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1844"/>
-        <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>桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式,您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。
-
-是否要使用X2Go用戶端的隱藏模式?</translation>
+        <source>Creation Time</source>
+        <translation type="obsolete">Startzeit</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1855"/>
-        <source>New Session</source>
-        <translation>新的工作階段</translation>
+        <location filename="onmainwindow_part4.cpp" line="2080"/>
+        <source>Client IP</source>
+        <translation>Klient IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1905"/>
-        <source>X2Go Link to session </source>
-        <translation>X2Go工作階段的連結</translation>
+        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1120"/>
+        <location filename="onmainwindow_part2.cpp" line="2194"/>
+        <source>running</source>
+        <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1955"/>
-        <source>X2Go sessions not found</source>
-        <translation>無法找到X2Go的工作</translation>
+        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1313"/>
+        <source>suspended</source>
+        <translation>Frakoblet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2103"/>
-        <source>Are you sure you want to delete this session?</source>
-        <translation>您確定要刪除此工作階段嗎?</translation>
+        <source>Unable to create Folder:</source>
+        <translation type="obsolete">Ordner kann nicht erzeugt werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2411"/>
-        <location filename="onmainwindow_part3.cpp" line="68"/>
-        <source>KDE</source>
-        <translation type="unfinished"></translation>
+        <source>Unable to write File:</source>
+        <translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2473"/>
-        <source>RDP connection</source>
-        <translation>RDP連線</translation>
+        <location filename="onmainwindow_part2.cpp" line="2015"/>
+        <source>Unable to create SSL Tunnel:
+</source>
+        <translation>Klarer ikke å opprette SSL tunnel:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2477"/>
-        <source>XDMCP</source>
-        <translation type="unfinished"></translation>
+        <location filename="onmainwindow_part2.cpp" line="1161"/>
+        <location filename="onmainwindow_part2.cpp" line="1181"/>
+        <location filename="onmainwindow_part2.cpp" line="2017"/>
+        <location filename="onmainwindow_part2.cpp" line="2406"/>
+        <source>Warning</source>
+        <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2481"/>
-        <source>Connection to local desktop</source>
-        <translation>連線至本地桌面</translation>
+        <location filename="onmainwindow.cpp" line="147"/>
+        <location filename="onmainwindow_part2.cpp" line="189"/>
+        <location filename="onmainwindow_part2.cpp" line="2178"/>
+        <source>connecting</source>
+        <translation>kobler til</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2485"/>
-        <source> on </source>
-        <translation> æ–¼ </translation>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
+        <source>starting</source>
+        <translation>starter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="79"/>
-        <source>Host key for server changed.
-It is now: </source>
-        <translation>主機的SSH密鑰已經更換。
-現在的密鑰為: </translation>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
+        <source>resuming</source>
+        <translation>gjenopptar</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="80"/>
-        <source>For security reasons, connection will be stopped</source>
-        <translation>由於安全性的考量,目前的連線已被中止</translation>
+        <location filename="onmainwindow_part2.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="2518"/>
+        <location filename="onmainwindow_part2.cpp" line="2536"/>
+        <source>Connection timeout, aborting</source>
+        <translation>Tilkoblingen tidsavbrutt, avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
-        <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>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
+        <source>aborting</source>
+        <translation>Avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="110"/>
-        <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰,這個檔案將會自動被建立。</translation>
+        <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_part2.cpp" line="115"/>
-        <source>The server is unknown. Do you trust the host key?
-Public key hash: </source>
-        <translation>此為未知的伺服器,您要選擇信任此主機密鑰嗎?
-此公開密鑰的雜湊值為:</translation>
+        <location filename="onmainwindow_part4.cpp" line="1842"/>
+        <source>Abort</source>
+        <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
-        <source>Host key verification failed</source>
-        <translation>主機密鑰驗證任失敗</translation>
+        <source>Show Details</source>
+        <translation type="obsolete">Zeige Details</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1169"/>
-        <location filename="onmainwindow_part2.cpp" line="1189"/>
-        <source>Yes</source>
-        <translation>是</translation>
+        <location filename="onmainwindow_part3.cpp" line="409"/>
+        <source> (can't open file)</source>
+        <translation> (kan ikke åpne filen)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1170"/>
-        <location filename="onmainwindow_part2.cpp" line="1190"/>
-        <source>No</source>
-        <translation>否</translation>
+        <location filename="onmainwindow_part3.cpp" line="420"/>
+        <location filename="onmainwindow_part3.cpp" line="430"/>
+        <location filename="onmainwindow_part3.cpp" line="440"/>
+        <source> (file not exists)</source>
+        <translation> (filen finnes ikke)</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="464"/>
+        <source> (directory not exists)</source>
+        <translation> (mappen finnes ikke)</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
-        <translation>認證失敗</translation>
+        <location filename="onmainwindow_part3.cpp" line="492"/>
+        <source>wrong value for argument"--link"</source>
+        <translatorcomment>Chose to use 'parameteren' here, the direct translation is 'argument', but didn't fit in my opinion. The cmdline arguments, will they be translated as well?</translatorcomment>
+        <translation>ugyldig verdi for parameteren "--link"</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="510"/>
+        <source>wrong value for argument"--sound"</source>
+        <translation>ugyldig verdi for parameteren "--sound"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="293"/>
-        <location filename="onmainwindow_part2.cpp" line="1289"/>
-        <location filename="onmainwindow_part2.cpp" line="1373"/>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part3.cpp" line="527"/>
+        <location filename="onmainwindow_part3.cpp" line="538"/>
+        <source>wrong value for argument"--geometry"</source>
+        <translation>ugyldig verdi for parameteren "--geometry"</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="556"/>
+        <source>wrong value for argument"--set-kbd"</source>
+        <translation>ugyldig verdi for parameteren "--set-kbd"</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="573"/>
+        <source>wrong value for argument"--ldap"</source>
+        <translation>ugyldig verdi for parameteren "--ldap"</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="668"/>
+        <source>wrong value for argument"--pack"</source>
+        <translation>ugyldig verdi for parameteren "--pack"</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="676"/>
+        <location filename="onmainwindow_part3.cpp" line="679"/>
+        <source>wrong parameter: </source>
+        <translation>ugyldig parameter: </translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="729"/>
+        <source>Available pack methodes:</source>
+        <translation>Tilgjengelige pakkemetoder:</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="1517"/>
+        <source>Support</source>
+        <translatorcomment>Will have to revisit this one, not sure if it fits</translatorcomment>
+        <translation>Støtte</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="1522"/>
+        <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+        <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="1588"/>
+        <source>Please check LDAP Settings</source>
+        <translation>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>
+    </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_part2.cpp" line="298"/>
+        <location filename="onmainwindow_part2.cpp" line="1294"/>
+        <location filename="onmainwindow_part2.cpp" line="1378"/>
+        <location filename="onmainwindow_part2.cpp" line="1411"/>
         <location filename="onmainwindow_part3.cpp" line="766"/>
         <location filename="onmainwindow_part3.cpp" line="847"/>
         <location filename="onmainwindow_part3.cpp" line="1219"/>
@@ -1070,541 +1085,704 @@ Public key hash: </source>
         <location filename="onmainwindow_part3.cpp" line="2256"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>連線失敗</b>
+        <translation><b>Tilkoblingen feilet</b>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="296"/>
-        <location filename="onmainwindow_part2.cpp" line="1292"/>
-        <location filename="onmainwindow_part2.cpp" line="1376"/>
-        <location filename="onmainwindow_part3.cpp" line="199"/>
-        <location filename="onmainwindow_part3.cpp" line="769"/>
-        <location filename="onmainwindow_part3.cpp" line="850"/>
-        <location filename="onmainwindow_part3.cpp" line="1222"/>
-        <location filename="onmainwindow_part3.cpp" line="1275"/>
-        <location filename="onmainwindow_part3.cpp" line="2259"/>
-        <source><b>Wrong password!</b><br><br></source>
-        <translation><b>不正確的密碼!</b><br><br></translation>
+        <source>No Server availabel</source>
+        <translation type="obsolete">es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="412"/>
-        <source>unknown</source>
-        <translation>未知</translation>
+        <location filename="onmainwindow_part4.cpp" line="2082"/>
+        <source>Session ID</source>
+        <translation>Sesjons ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="477"/>
-        <source>No server availabel</source>
-        <translation>伺服器不存在l</translation>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
+        <source>suspending</source>
+        <translation>Kobler fra</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="486"/>
-        <location filename="onmainwindow_part2.cpp" line="785"/>
-        <location filename="onmainwindow_part2.cpp" line="1236"/>
-        <location filename="onmainwindow_part2.cpp" line="1348"/>
-        <source>Server not availabel</source>
-        <translation>伺服器不存在|</translation>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
+        <source>terminating</source>
+        <translation>Avslutter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1005"/>
-        <location filename="onmainwindow_part4.cpp" line="1986"/>
-        <source>Select session:</source>
-        <translation>請選擇工作階段:</translation>
+        <location filename="onmainwindow_part3.cpp" line="196"/>
+        <source><b>Connection failed</b>
+:
+</source>
+        <translation><b>Tilkoblingen feilet</b>
+:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1021"/>
-        <location filename="onmainwindow_part2.cpp" line="1115"/>
-        <location filename="onmainwindow_part2.cpp" line="2168"/>
-        <source>running</source>
-        <translation>正在執行中</translation>
+        <source>Share Folder...</source>
+        <translation type="obsolete">Ordner freigeben...</translation>
+    </message>
+    <message>
+        <source>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. Example:
+            --ldap=ldapserver:389:o=organization,c=de
+            --command=<cmd>                  Set default command, default value 'KDE'
+            --sound=<0|1>                    Enable sound, default value '1'
+            --geomerty=<W>x<H>|fullscreen    Set default geometry, default value '800x600'
+            --link=<modem|isdn|adsl|wan|lan> Set default link type, default 'lan'
+            --pack=<packmethod>              Set default pack method, default '16m-jpeg-9'
+            --kbd-layout=<layout>            Set default keyboard layout, default 'us'
+            --kbd-type=<typed>               Set default keyboard type, default 'pc105/us'
+            --set-kbd=<0|1>                  Overwrite current keyboard settings, default '0'
+</source>
+        <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. Example:            --ldap=ldapserver:389:o=organization,c=de            --command=<cmd>                  Set default command, default value 'KDE'            --sound=<0|1>                    Enable sound, default value '1'            --geomerty=<W>x<H>|fullscreen    Set default geometry, default value '800x600'            --link=<modem|isdn|adsl
 |wan|lan> Set default link type, default 'lan'            --pack=<packmethod>              Set default pack method, default '16m-jpeg-9'            --kbd-layout=<layout>            Set default keyboard layout, default 'us'            --kbd-type=<typed>               Set default keyboard type, default 'pc105/us'            --set-kbd=<0|1>                  Overwrite current keyboard settings, default '0'</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1023"/>
-        <location filename="onmainwindow_part2.cpp" line="1308"/>
-        <source>suspended</source>
-        <translation>已暫停</translation>
+        <location filename="onmainwindow_part4.cpp" line="28"/>
+        <source>Unable to read :
+</source>
+        <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment>
+        <translation>Klarer ikke å lese:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1029"/>
-        <source>Desktop</source>
-        <translation>桌面</translation>
+        <location filename="onmainwindow_part4.cpp" line="53"/>
+        <source>Unable to write :
+</source>
+        <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment>
+        <translation>Klarer ikke å skrive:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1031"/>
-        <source>single application</source>
-        <translation>單一的應用程式</translation>
+        <source><b>X2Go Client V. 2.0.1</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 authentification 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="obsolete"><b>X2Go Client 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 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>
-        <location filename="onmainwindow_part2.cpp" line="1033"/>
-        <source>shadow session</source>
-        <translation type="unfinished"></translation>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
+        <source><b>Wrong Password!</b><br><br></source>
+        <translatorcomment>Should we actually tell that it's the password that's wrong? Isn't that considered bad practice in regards to security? I propose to use "Wrong Username or Password!" instead.</translatorcomment>
+        <translation><b>Feil passord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1066"/>
-        <source>Information</source>
-        <translation>資訊</translation>
+        <location filename="onmainwindow_part3.cpp" line="595"/>
+        <source>wrong value for argument"--ldap1"</source>
+        <translation>ugyldig verdi for parameteren "--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1067"/>
-        <source>No accessible desktop found</source>
-        <translation>目前沒有找到可訪問的工作桌面</translation>
+        <location filename="onmainwindow_part3.cpp" line="614"/>
+        <source>wrong value for argument"--ldap2"</source>
+        <translation>ugyldig verdi for parameteren "--ldap2"</translation>
+    </message>
+    <message>
+        <source>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. Example:
+			--ldap=ldapserver:389:o=organization,c=de
+			--ldap1=<host:port>              LDAP Failover Server #1 
+			--ldap2=<host:port>              LDAP Failover Server #2 
+			--command=<cmd>                  Set default command, default value 'KDE'
+			--sound=<0|1>                    Enable sound, default value '1'
+			--geomerty=<W>x<H>|fullscreen    Set default geometry, default value '800x600'
+			--link=<modem|isdn|adsl|wan|lan> Set default link type, default 'lan'
+			--pack=<packmethod>              Set default pack method, default '16m-jpeg-9'
+			--kbd-layout=<layout>            Set default keyboard layout, default 'us'
+			--kbd-type=<typed>               Set default keyboard type, default 'pc105/us'
+			--set-kbd=<0|1>                  Overwrite current keyboard settings, default '0'
+</source>
+        <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. Example:			--ldap=ldapserver:389:o=organization,c=de			--ldap1=<host:port>              LDAP Failover Server #1 			--ldap2=<host:port>              LDAP Failover Server #2 			--command=<cmd>                  Set default command, default value 'KDE'			--sound=<0|1>                    Enable sound, default value '1'			--geomerty=<W>x<H>|fullscreen    Set default geometry, default value '800x600'			--link=<modem|isdn|adsl|wan
 |lan> Set default link type, default 'lan'			--pack=<packmethod>              Set default pack method, default '16m-jpeg-9'			--kbd-layout=<layout>            Set default keyboard layout, default 'us'			--kbd-type=<typed>               Set default keyboard type, default 'pc105/us'			--set-kbd=<0|1>                  Overwrite current keyboard settings, default '0'</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1080"/>
-        <location filename="onmainwindow_part4.cpp" line="2399"/>
-        <source>Filter</source>
-        <translation>篩選器</translation>
+        <location filename="onmainwindow_part3.cpp" line="1894"/>
+        <source>Unable to create file: </source>
+        <translation>Klarer ikke å opprette filen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1087"/>
-        <source>Select desktop:</source>
-        <translation>請選擇工作桌面:</translation>
+        <location filename="onmainwindow_part3.cpp" line="1818"/>
+        <source>No valid card found</source>
+        <translation>Ingen gyldige kort ble funnet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1156"/>
-        <location filename="onmainwindow_part2.cpp" line="1176"/>
-        <location filename="onmainwindow_part2.cpp" line="1991"/>
-        <location filename="onmainwindow_part2.cpp" line="2380"/>
-        <source>Warning</source>
-        <translation>警告</translation>
+        <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="329"/>
+        <source>&Settings ...</source>
+        <translatorcomment>Need to revisit the keybindings in all the Norwegian strings to check for consistency and collisions</translatorcomment>
+        <translation>&Innstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1157"/>
-        <location filename="onmainwindow_part2.cpp" line="1177"/>
+        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="750"/>
+        <source>Options</source>
+        <translatorcomment>Hm.. Should we actually use different words here in Norwegian? Or could they mean the same? Need to check the UI first</translatorcomment>
+        <translation>Alternativer</translation>
+    </message>
+    <message>
+        <source>Can't read host rsa key:</source>
+        <translation type="obsolete">RSA Schlüssel konnte nicht gelesen werden:</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="2059"/>
+        <location filename="onmainwindow_part3.cpp" line="2084"/>
+        <source>Can't connect to X-Server</source>
+        <translation>Klarte ikke å koble til X-Serveren</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="2060"/>
+        <location filename="onmainwindow_part3.cpp" line="2085"/>
+        <source>Can't connect to X-Server
+Please check your settings</source>
+        <translation>Klarte ikke å koble til X-Serveren
+Vennligst sjekk innstillingene dine</translation>
+    </message>
+    <message>
+        <source>Can't start X-Server</source>
+        <translation type="obsolete">X-Server konnte nicht gestartet werden</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="2093"/>
+        <source>Can't start X Server
+Please check your settings</source>
+        <translation>Klarte ikke å starte X-Serveren
+Vennligst sjekk instillingene dine</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1182"/>
         <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>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>
-        <location filename="onmainwindow_part2.cpp" line="1165"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
         <source>24 or 32</source>
-        <translation>24或32</translation>
+        <translation>24 eller 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1166"/>
-        <location filename="onmainwindow_part2.cpp" line="1186"/>
+        <location filename="onmainwindow_part2.cpp" line="1171"/>
+        <location filename="onmainwindow_part2.cpp" line="1191"/>
         <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>
-    </message>
-    <message>
-        <location filename="onmainwindow_part2.cpp" line="1253"/>
-        <source>suspending</source>
-        <translation>正在暫停工作中</translation>
+        <translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. <br>Gjenoppta denne sesjonen uansett?</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1275"/>
-        <source>terminating</source>
-        <translation>正在中止工作中</translation>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1194"/>
+        <source>Yes</source>
+        <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1409"/>
-        <source><b>Wrong Password!</b><br><br></source>
-        <translation><b>不正確的密碼!</b><br><br></translation>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1175"/>
+        <location filename="onmainwindow_part2.cpp" line="1195"/>
+        <source>No</source>
+        <translation>Nei</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1802"/>
-        <location filename="onmainwindow_part3.cpp" line="1096"/>
-        <source>Unable to create folder:</source>
-        <translation>無法創建資料夾:</translation>
+        <source><b>X2Go Client V. </source>
+        <translation type="obsolete"><b>X2Go Client V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1828"/>
-        <source>Unable to write file:</source>
-        <translation>檔案無法寫入:</translation>
+        <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 authentification 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="obsolete"></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 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>
-        <location filename="onmainwindow_part2.cpp" line="1934"/>
-        <location filename="onmainwindow_part4.cpp" line="1263"/>
-        <source>Attach X2Go window</source>
-        <translation>連接X2Go視窗</translation>
+        <source></b><br> (C. 2006-2008 <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 authentification 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="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 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>
-        <location filename="onmainwindow_part2.cpp" line="1960"/>
-        <location filename="onmainwindow_part3.cpp" line="2330"/>
-        <source>Unable to create SSL tunnel:
-</source>
-        <translation>無法建立SSL通道:</translation>
+        <location filename="onmainwindow.cpp" line="156"/>
+        <source>OpenOffice.org</source>
+        <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1989"/>
-        <source>Unable to create SSL Tunnel:
-</source>
-        <translation>無法建立SSL通道:
-</translation>
+        <location filename="onmainwindow.cpp" line="157"/>
+        <source>Terminal</source>
+        <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2137"/>
-        <source>Finished</source>
-        <translation>已完成</translation>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
+        <source>unknown</source>
+        <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2160"/>
-        <source>starting</source>
-        <translation>正在開始</translation>
+        <location filename="onmainwindow_part4.cpp" line="2071"/>
+        <source>Command</source>
+        <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2162"/>
-        <source>resuming</source>
-        <translation>正在還原</translation>
+        <location filename="onmainwindow_part4.cpp" line="2073"/>
+        <source>Type</source>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2224"/>
-        <location filename="onmainwindow_part2.cpp" line="2492"/>
-        <location filename="onmainwindow_part2.cpp" line="2510"/>
-        <source>Connection timeout, aborting</source>
-        <translation>連線超時,中止中</translation>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
+        <source>Desktop</source>
+        <translation>Skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2225"/>
-        <source>aborting</source>
-        <translation>中止中</translation>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
+        <source>single application</source>
+        <translation>enkel applikasjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2381"/>
-        <source>Are you sure you want to terminate this session?
-Unsaved documents will be lost</source>
-        <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
+        <source>shadow session</source>
+        <translatorcomment>hm.. Need to revisit this one, not sure if I should use a better technical term in Norwegian</translatorcomment>
+        <translation>skygge sesjonen</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
-        <source>Session</source>
-        <translation>工作階段</translation>
+        <source><br>Sudo configuration error</source>
+        <translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2462"/>
-        <location filename="onmainwindow_part4.cpp" line="2067"/>
-        <location filename="onmainwindow_part4.cpp" line="2089"/>
-        <source>Display</source>
-        <translation>顯示</translation>
+        <location filename="onmainwindow_part3.cpp" line="2279"/>
+        <source>Unable to execute: </source>
+        <translation>Klarte ikke å utføre:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2464"/>
-        <location filename="onmainwindow_part4.cpp" line="2078"/>
-        <source>Creation time</source>
-        <translation>創建時間</translation>
+        <location filename="onmainwindow.cpp" line="130"/>
+        <source>X2Go client</source>
+        <translation>X2Go klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="196"/>
-        <source><b>Connection failed</b>
-:
-</source>
-        <translation><b>連線失敗</b>
-:
-</translation>
+        <location filename="onmainwindow.cpp" line="154"/>
+        <source>Internet browser</source>
+        <translation>Nettleser</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="409"/>
-        <source> (can't open file)</source>
-        <translation> (無法開啟檔案)</translation>
+        <location filename="onmainwindow.cpp" line="155"/>
+        <source>Email client</source>
+        <translation>Epost program</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="420"/>
-        <location filename="onmainwindow_part3.cpp" line="430"/>
-        <location filename="onmainwindow_part3.cpp" line="440"/>
-        <source> (file not exists)</source>
-        <translation> (檔案不存在)</translation>
+        <location filename="onmainwindow.cpp" line="667"/>
+        <source>&New session ...</source>
+        <translation>&Ny sesjon ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="464"/>
-        <source> (directory not exists)</source>
-        <translation> (目錄不存在)</translation>
+        <location filename="onmainwindow.cpp" line="673"/>
+        <source>Session management...</source>
+        <translation>Sesjonshåndtering...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="492"/>
-        <source>wrong value for argument"--link"</source>
-        <translation>"--link"參數的值錯誤</translation>
+        <location filename="onmainwindow.cpp" line="711"/>
+        <location filename="onmainwindow.cpp" line="732"/>
+        <source>Show toolbar</source>
+        <translation>Vis verktøylinje</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="510"/>
-        <source>wrong value for argument"--sound"</source>
-        <translation>"--sound"參數的值錯誤</translation>
+        <location filename="onmainwindow.cpp" line="340"/>
+        <location filename="onmainwindow_part3.cpp" line="1542"/>
+        <source>About X2GO client</source>
+        <translation>Om X2GO klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="527"/>
-        <location filename="onmainwindow_part3.cpp" line="538"/>
-        <source>wrong value for argument"--geometry"</source>
-        <translation>"--geometry"參數的值錯誤</translation>
+        <location filename="onmainwindow.cpp" line="1496"/>
+        <location filename="onmainwindow.cpp" line="1679"/>
+        <location filename="onmainwindow.cpp" line="1709"/>
+        <source>Please check LDAP settings</source>
+        <translation>Vennligst sjekk LDAP innstillingene</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="556"/>
-        <source>wrong value for argument"--set-kbd"</source>
-        <translation>"--set-kbd"參數的值錯誤</translation>
+        <location filename="onmainwindow.cpp" line="1531"/>
+        <source>no X2Go server found in LDAP </source>
+        <translation>Inge X2Go server ble funnet i LDAP </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="573"/>
-        <source>wrong value for argument"--ldap"</source>
-        <translation>"--ldap"參數的值錯誤</translation>
+        <location filename="onmainwindow.cpp" line="2103"/>
+        <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>
-        <location filename="onmainwindow_part3.cpp" line="595"/>
-        <source>wrong value for argument"--ldap1"</source>
-        <translation>"--ldap1"參數的值錯誤</translation>
+        <location filename="onmainwindow_part2.cpp" line="301"/>
+        <location filename="onmainwindow_part2.cpp" line="1297"/>
+        <location filename="onmainwindow_part2.cpp" line="1381"/>
+        <location filename="onmainwindow_part3.cpp" line="199"/>
+        <location filename="onmainwindow_part3.cpp" line="769"/>
+        <location filename="onmainwindow_part3.cpp" line="850"/>
+        <location filename="onmainwindow_part3.cpp" line="1222"/>
+        <location filename="onmainwindow_part3.cpp" line="1275"/>
+        <location filename="onmainwindow_part3.cpp" line="2259"/>
+        <source><b>Wrong password!</b><br><br></source>
+        <translation><b>Feil passord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="614"/>
-        <source>wrong value for argument"--ldap2"</source>
-        <translation>"--ldap2"參數的值錯誤</translation>
+        <location filename="onmainwindow_part2.cpp" line="482"/>
+        <source>No server availabel</source>
+        <translation>Ingen tilgjengelig server</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="668"/>
-        <source>wrong value for argument"--pack"</source>
-        <translation>"--pack"參數的值錯誤</translation>
+        <location filename="onmainwindow.cpp" line="941"/>
+        <location filename="onmainwindow_part2.cpp" line="2091"/>
+        <source>Not connected</source>
+        <oldsource>Active connection</oldsource>
+        <translation>Ikke tilkoblet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="676"/>
-        <location filename="onmainwindow_part3.cpp" line="679"/>
-        <source>wrong parameter: </source>
-        <translation>錯誤的參數:</translation>
+        <location filename="onmainwindow_part2.cpp" line="2490"/>
+        <location filename="onmainwindow_part4.cpp" line="2078"/>
+        <source>Creation time</source>
+        <translation>Opprettelsestidspunkt</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="724"/>
-        <location filename="onmainwindow_part3.cpp" line="750"/>
-        <source>Options</source>
-        <translation>選項</translation>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
+        <location filename="onmainwindow_part3.cpp" line="1096"/>
+        <source>Unable to create folder:</source>
+        <translation>Klarer ikke å opprette katalogen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="729"/>
-        <source>Available pack methodes:</source>
-        <translation>可用的包裝方法:</translation>
+        <location filename="onmainwindow_part2.cpp" line="79"/>
+        <source>Host key for server changed.
+It is now: </source>
+        <translation>Vertsnøkkel for serveren har endret seg.
+Den er nå: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1517"/>
-        <source>Support</source>
-        <translation>支援</translation>
+        <location filename="onmainwindow_part2.cpp" line="80"/>
+        <source>For security reasons, connection will be stopped</source>
+        <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1522"/>
-        <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation type="unfinished"></translation>
+        <location filename="onmainwindow_part2.cpp" line="91"/>
+        <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 server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1526"/>
-        <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>
+        <location filename="onmainwindow_part2.cpp" line="113"/>
+        <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>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1530"/>
-        <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 authentification 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>
+        <location filename="onmainwindow_part2.cpp" line="118"/>
+        <source>The server is unknown. Do you trust the host key?
+Public key hash: </source>
+        <translation>Serveren er ukjent. Stoler du på vertsnøkkelen?
+Offentlig nøkkel: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1543"/>
-        <source><b>X2Go client V. </source>
-        <translation><b>X2Go 客戶端 V. </translation>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="130"/>
+        <source>Host key verification failed</source>
+        <translation>Verifiseringen av vertsnøkkelen feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1588"/>
-        <source>Please check LDAP Settings</source>
-        <translation>請檢查LDAP的設定</translation>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
+        <source>Authentication failed</source>
+        <translation>PÃ¥logging feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1818"/>
-        <source>No valid card found</source>
-        <translation>沒有發現合法的卡片</translation>
+        <location filename="onmainwindow_part2.cpp" line="491"/>
+        <location filename="onmainwindow_part2.cpp" line="790"/>
+        <location filename="onmainwindow_part2.cpp" line="1241"/>
+        <location filename="onmainwindow_part2.cpp" line="1353"/>
+        <source>Server not availabel</source>
+        <translation>Serveren er ikke tilgjengelig</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1866"/>
-        <source>This card is unknown by X2Go system</source>
-        <translation>X2Go系統無法辨識此張卡片</translation>
+        <location filename="onmainwindow_part2.cpp" line="1854"/>
+        <source>Unable to write file:</source>
+        <translation>Klarer ikke å skrive til filen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1894"/>
-        <source>Unable to create file: </source>
-        <translation>檔案無法創建:</translation>
+        <location filename="onmainwindow_part2.cpp" line="1986"/>
+        <location filename="onmainwindow_part3.cpp" line="2330"/>
+        <source>Unable to create SSL tunnel:
+</source>
+        <translation>Klarte ikke å opprette SSL tunnel:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2059"/>
-        <location filename="onmainwindow_part3.cpp" line="2084"/>
-        <source>Can't connect to X-Server</source>
-        <translation>無法連接至X伺服器</translation>
+        <location filename="onmainwindow_part4.cpp" line="1834"/>
+        <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
+        <translatorcomment>Uncertain if the translation for "Creation time" is the most fitting one.</translatorcomment>
+        <translation><b>Sesjons ID:<br>Server:<br>Brukernavn:<br>Skjerm:<br>Opprettet:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2060"/>
-        <location filename="onmainwindow_part3.cpp" line="2085"/>
-        <source>Can't connect to X-Server
-Please check your settings</source>
-        <translation>無法連接至X伺服器
-請檢查您的設定值</translation>
+        <location filename="onmainwindow.cpp" line="485"/>
+        <location filename="onmainwindow.cpp" line="944"/>
+        <location filename="onmainwindow_part4.cpp" line="1844"/>
+        <source>Share folder...</source>
+        <translation>Del mappe...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2093"/>
-        <source>Can't start X Server
-Please check your settings</source>
-        <translation>無法啟動X伺服器
-請檢查您的設定值</translation>
+        <location filename="onmainwindow_part4.cpp" line="1846"/>
+        <source>Show details</source>
+        <translation>Vis detailjer</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2107"/>
-        <location filename="onmainwindow_part4.cpp" line="422"/>
-        <location filename="onmainwindow_part4.cpp" line="450"/>
-        <source>Can't start X Server
-Please check your installation</source>
-        <translation>無法啟動X伺服器
-請檢查X伺服器安是否有安裝正確</translation>
+        <location filename="onmainwindow_part3.cpp" line="1543"/>
+        <source><b>X2Go client V. </source>
+        <translation><b>X2Go klient v. </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2279"/>
-        <source>Unable to execute: </source>
-        <translation>無法執行:</translation>
+        <location filename="onmainwindow_part3.cpp" line="1866"/>
+        <source>This card is unknown by X2Go system</source>
+        <translatorcomment>Need to double-check if the translation of "card" is suitable here</translatorcomment>
+        <translation>Dette kortet er ukjent for X2Go systemet</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="2295"/>
         <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>Serveren støtter ikke eksport av filsystemet over en SSH Tunnel
+Vennligst oppdater til en nyere x2goserver pakke</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="28"/>
-        <source>Unable to read :
-</source>
-        <translation>無法讀取:
-</translation>
+        <location filename="onmainwindow.cpp" line="684"/>
+        <source>&Create session icon on desktop...</source>
+        <translation>&Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="53"/>
-        <source>Unable to write :
-</source>
-        <translation>無法寫入:
-</translation>
+        <location filename="onmainwindow.cpp" line="693"/>
+        <source>&Set broker password...</source>
+        <translatorcomment>Still uncertain what to best use as a translation for "broker"</translatorcomment>
+        <translation>&Sett megler passord...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="141"/>
-        <source>WINDOWS-1252</source>
-        <translation type="unfinished"></translation>
+        <location filename="onmainwindow.cpp" line="704"/>
+        <source>&Connectivity test...</source>
+        <translation>&Tilkoblings-test...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="153"/>
-        <source>ISO8859-1</source>
-        <translation type="unfinished"></translation>
+        <location filename="onmainwindow.cpp" line="820"/>
+        <source>Operation failed</source>
+        <translation>Handlingen feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1352"/>
-        <source>X2Go Session</source>
-        <translation>X2Go工作階段</translation>
+        <location filename="onmainwindow.cpp" line="824"/>
+        <source>Password changed</source>
+        <translation>Passordet er endret</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1534"/>
-        <source>wrong value for argument"speed"</source>
-        <translation>錯誤的"speed"參數值</translation>
+        <location filename="onmainwindow.cpp" line="848"/>
+        <source>Wrong password!</source>
+        <translation>Feil passord!</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1657"/>
-        <source>Password:</source>
-        <translation>密碼:</translation>
+        <location filename="onmainwindow.cpp" line="897"/>
+        <source><b>Authentication</b></source>
+        <translation><b>Autentisering</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1658"/>
-        <source>Keyboard layout:</source>
-        <translation>鑑盤佈局:</translation>
+        <location filename="onmainwindow.cpp" line="938"/>
+        <source>Restore</source>
+        <translation>Gjenopprett</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1699"/>
-        <source>Ok</source>
-        <translation>確定</translation>
+        <location filename="onmainwindow.cpp" line="969"/>
+        <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>
+        <translatorcomment>According to the Norwegian skolelinux translation projects discussion on the words "context menu", I've chosen to follow their guidance and used "sprettoppmeny"</translatorcomment>
+        <translation>Venstre museknapp for å skjule/gjenopprette  -  Høyre museknapp viser sprettoppmeny</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1701"/>
-        <location filename="onmainwindow_part4.cpp" line="1990"/>
-        <location filename="onmainwindow_part4.cpp" line="1992"/>
-        <source>Cancel</source>
-        <translation>取消</translation>
+        <location filename="onmainwindow.cpp" line="1843"/>
+        <source>Create session icon on desktop</source>
+        <translation>Opprett sesjonsikon på skrivebordet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1834"/>
-        <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>
+        <location filename="onmainwindow.cpp" line="1844"/>
+        <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.
+
+Ønsker du å aktivere skjult modus for x2goklient?</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1842"/>
-        <source>Abort</source>
-        <translation>退出</translation>
+        <location filename="onmainwindow.cpp" line="1855"/>
+        <source>New Session</source>
+        <translation>Ny sesjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1846"/>
-        <source>Show details</source>
-        <translation>顯示細節</translation>
+        <location filename="onmainwindow.cpp" line="1955"/>
+        <source>X2Go sessions not found</source>
+        <translation>X2Go sesjoner ble ikke funnet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1988"/>
-        <source>Resume</source>
-        <translation>恢復</translation>
+        <location filename="onmainwindow.cpp" line="2473"/>
+        <source>RDP connection</source>
+        <translation>RDP tilkobling</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2000"/>
-        <source>New</source>
-        <translation>新增</translation>
+        <location filename="onmainwindow.cpp" line="1905"/>
+        <source>X2Go Link to session </source>
+        <translatorcomment>Uncertain of the context here, need to doublecheck this.</translatorcomment>
+        <translation>X2Go kobling til sesjon </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2003"/>
-        <source>Full access</source>
-        <translation>完全存取</translation>
+        <location filename="onmainwindow.cpp" line="497"/>
+        <location filename="onmainwindow_part4.cpp" line="1288"/>
+        <source>Detach X2Go window</source>
+        <translation>Løsne X2Go vindu</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2006"/>
-        <source>View only</source>
-        <translation>僅查看</translation>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part4.cpp" line="1263"/>
+        <source>Attach X2Go window</source>
+        <translation>Feste X2Go vindu</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2069"/>
-        <source>Status</source>
-        <translation>狀態</translation>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
+        <source>Finished</source>
+        <translation>Ferdig</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2071"/>
-        <source>Command</source>
-        <translation>指令</translation>
+        <location filename="onmainwindow_part2.cpp" line="2407"/>
+        <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?
+Ulagrede data vil gå tapt</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2073"/>
-        <source>Type</source>
-        <translation>åž‹æ…‹</translation>
+        <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 authentification 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="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 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>
-        <location filename="onmainwindow_part4.cpp" line="2075"/>
-        <source>Server</source>
-        <translation>伺服器</translation>
+        <location filename="onmainwindow_part3.cpp" line="2107"/>
+        <location filename="onmainwindow_part4.cpp" line="422"/>
+        <location filename="onmainwindow_part4.cpp" line="450"/>
+        <source>Can't start X Server
+Please check your installation</source>
+        <translation>Klarer ikke å starte X Serveren
+Vennligst sjekk din installasjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2080"/>
-        <source>Client IP</source>
-        <translation>客戶端IP</translation>
+        <location filename="onmainwindow_part4.cpp" line="1352"/>
+        <source>X2Go Session</source>
+        <translation>X2Go sesjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2082"/>
-        <source>Session ID</source>
-        <translation>工作階段識別碼</translation>
+        <location filename="onmainwindow.cpp" line="500"/>
+        <location filename="onmainwindow_part4.cpp" line="2298"/>
+        <source>Minimize toolbar</source>
+        <translation>Minimer verktøylinje</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2086"/>
-        <source>User</source>
-        <translation>使用者</translation>
+        <location filename="onmainwindow_part4.cpp" line="2331"/>
+        <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;Trykk her&nbsp;&nbsp;&nbsp;<br> &nbsp;&nbsp;&nbsp;for å gjenopprette&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;verktøylinjen&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2117"/>
-        <source>Only my desktops</source>
-        <translation>只選擇我的桌面</translation>
+        <source>Can't open config file: </source>
+        <translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2215"/>
         <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>SSH伺服器沒有執行起來,遠端列印與檔案共享功能需要先安裝SSH伺服器
-您可以使用下列指令來安裝SSH伺服器:
+        <translation>sshd er ikke startet og du trenger denne for skriver- og fildeling.
+Du kan installere sshd med:
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2286"/>
-        <source>Restore toolbar</source>
-        <translation>還原工具列</translation>
+        <location filename="onmainwindow.cpp" line="2481"/>
+        <source>Connection to local desktop</source>
+        <translation>Tilkobling til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2331"/>
-        <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="onmainwindow_part2.cpp" line="1071"/>
+        <source>Information</source>
+        <translation>Informasjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2486"/>
-        <source>Invalid reply from broker</source>
-        <translation>代理伺服器的回應不合法</translation>
+        <location filename="onmainwindow_part2.cpp" line="1085"/>
+        <location filename="onmainwindow_part4.cpp" line="2399"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="1092"/>
+        <source>Select desktop:</source>
+        <translation>Velg skrivebord:</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="2006"/>
+        <source>View only</source>
+        <translation>Kun vis</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="2086"/>
+        <source>User</source>
+        <translation>Bruker</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="2477"/>
+        <source>XDMCP</source>
+        <translation>XDMCP</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part2.cpp" line="1072"/>
+        <source>No accessible desktop found</source>
+        <translation>Ingen tilgjengelige skrivebord ble funnet</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="2003"/>
+        <source>Full access</source>
+        <translation>Full tilgang</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="2117"/>
+        <source>Only my desktops</source>
+        <translation>Kun mine skrivebord</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="493"/>
+        <source>Reconnect</source>
+        <translation>Gjenoppkoble</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="852"/>
+        <location filename="onmainwindow.cpp" line="2393"/>
+        <location filename="onmainwindow_part4.cpp" line="2468"/>
+        <source>Connecting to broker</source>
+        <translation>Koble til megleren</translation>
+    </message>
+    <message>
+        <source></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
+        <translation type="obsolete"></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="1526"/>
+        <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>
+    </message>
+    <message>
+        <location filename="onmainwindow_part3.cpp" line="1530"/>
+        <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 authentification 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>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="141"/>
+        <source>WINDOWS-1252</source>
+        <translation>WINDOWS-1252</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="153"/>
+        <source>ISO8859-1</source>
+        <translation>ISO8859-1</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow_part4.cpp" line="1534"/>
+        <source>wrong value for argument"speed"</source>
+        <translation>wrong value for argument"speed"</translation>
+    </message>
+    <message>
+        <source>application/x2go:x2go:Configuration File for X2Go Session</source>
+        <translation type="obsolete">application/x2go:x2go:Konfiguration Datei für eine X2Go Sitzung</translation>
     </message>
 </context>
 <context>
@@ -1612,22 +1790,24 @@ you can install sshd with
     <message>
         <location filename="printdialog.ui" line="16"/>
         <source>Print - X2Go client</source>
-        <translation>列印 - X2Go用戶端</translation>
+        <translation>Utskrift - X2Go klient</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="25"/>
         <source>Print</source>
-        <translation>列印</translation>
+        <translatorcomment>note to myself: Need to doublecheck the context of this word, other places 'utskrift' is a better translation, but I'm guessing this the actual print-button text.</translatorcomment>
+        <translation>Skriv ut</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="54"/>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>您已經停用X2Go用戶端的列印對話框</translation>
+        <translation>Du har deaktivert X2Go klientens utskriftsdialog.</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="56"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>您可能需要於X2Go用戶端的設定對話框中(選單 -> 選項 -> 設定)重新啟用這個對話框</translation>
+        <translatorcomment>Hm... This indicates that I might have overlooked the usage of the word 'settings' somewhere - will have to look how this will look.</translatorcomment>
+        <translation>Du kan reaktivere denne dialogen ved å benytte x2goclient innstillingene (Meny -> Innstillinger -> Innstillinger)</translation>
     </message>
 </context>
 <context>
@@ -1635,25 +1815,26 @@ you can install sshd with
     <message>
         <location filename="printprocess.cpp" line="155"/>
         <source>Save File</source>
-        <translation>儲存檔案</translation>
+        <translation>Lagre fil</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="157"/>
         <source>PDF Document (*.pdf)</source>
-        <translation>PDF文件 (*.pdf)</translation>
+        <translation>PDF Dokuemtn (*.pdf)</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="251"/>
         <location filename="printprocess.cpp" line="274"/>
         <source>Failed to execute command:
 </source>
-        <translation>執行命令失敗:</translation>
+        <translation>Klarte ikke å utføre kommandoen:
+</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="266"/>
         <location filename="printprocess.cpp" line="273"/>
         <source>Printing error</source>
-        <translation>列印錯誤</translation>
+        <translation>Utskriftsfeil</translation>
     </message>
 </context>
 <context>
@@ -1661,73 +1842,74 @@ you can install sshd with
     <message>
         <location filename="printwidget.ui" line="13"/>
         <source>Form</source>
-        <translation>表單</translation>
+        <translation>Skjema</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="23"/>
         <source>Print</source>
-        <translation>列印</translation>
+        <translation>Utskrift</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="33"/>
         <source>View as PDF</source>
-        <translation>以PDF格式查看</translation>
+        <translation>Vis som PDF</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="63"/>
         <source>Print settings</source>
-        <translation>列印設定</translation>
+        <translation>Utskriftsinnstillinger</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="69"/>
         <source>Printer:</source>
-        <translation>印表機:</translation>
+        <translation>Skriver:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="79"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
-        <translation>以預設的Windows PDF閱讀器列印(必需要安裝閱讀器)</translation>
+        <translation>Skriv ut via standard Windows PDF leser
+(lese programmet må være installert)</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="94"/>
         <source>Printer command:</source>
-        <translation>印表機指令:</translation>
+        <translation>Utskriftskommando:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="116"/>
         <source>...</source>
-        <translation></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="147"/>
         <source>Viewer settings</source>
-        <translation>閱讀器設定</translation>
+        <translation>Instillinger for PDF leser</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="153"/>
         <source>Open in viewer application</source>
-        <translation>在閱讀器程式裡開啟</translation>
+        <translation>Ã…pne i leseprogrammet</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="165"/>
         <source>Command:</source>
-        <translation>指令:</translation>
+        <translation>Kommando:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="177"/>
         <source>Save to disk</source>
-        <translation>儲存到磁碟裡</translation>
+        <translation>Lagre til disk</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="207"/>
         <source>Show this dialog before start printing</source>
-        <translation>開始列印前先顯示此對話框</translation>
+        <translation>Vis denne dialogen før start av utskrift</translation>
     </message>
     <message>
         <location filename="printwidget.cpp" line="53"/>
         <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>請設定您的客戶端列印設定<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>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">her</a>.</translation>
     </message>
 </context>
 <context>
@@ -1735,12 +1917,12 @@ you can install sshd with
     <message>
         <location filename="printercmddialog.ui" line="13"/>
         <source>Printer command</source>
-        <translation>印表機指令</translation>
+        <translation>Utskriftskommando</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="19"/>
         <source>Command</source>
-        <translation>指令</translation>
+        <translation>Kommando</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="25"/>
@@ -1748,64 +1930,65 @@ you can install sshd with
 Examples:
 kprinter
 lpr -P hp_laserjet</source>
-        <translation>請輸入您自定的列印指令。
-例如:
+        <translation>Vennligst skriv inn din egen, eller individuelle utskriftskommando.
+Eksempler:
 kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="44"/>
         <source>Output format</source>
-        <translation>輸出格式</translation>
+        <translation>Utformat</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="50"/>
         <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>
+        <translation>Vennligst velg filformat for utskrift (relatert til ditt uskriftsoppsett - om du benytter CUPS kan du bruke PDF)</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="66"/>
         <source>PDF</source>
-        <translation></translation>
+        <translation>PDF</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="73"/>
         <source>PS</source>
-        <translation></translation>
+        <translation>PS</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="86"/>
         <source>Data structure</source>
-        <translation>數據結構</translation>
+        <translation>Datastruktur</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="92"/>
         <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>
+        <translation>Vennligst velg metoden for inndatafil for utskrift (noen kommandoer aksepterer utskriftsfiler som programparametere, noen forventer data på standard inn):</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="108"/>
         <source>standard input (STDIN)</source>
-        <translation>標準輸入 (STDIN)</translation>
+        <translation>Standard inn (STDIN)</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="115"/>
         <source>Specify path as program parameter</source>
-        <translation>指定一個路徑做為程式的參數</translation>
+        <translation>Spesifiser stien som programparameter</translation>
     </message>
     <message>
         <location filename="printercmddialog.cpp" line="37"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
-        <translation>請輸入您自定的列印指令
-範例:
+        <translation>Vennligst skriv inn din egen, eller individuelle utskriftskommando.
+Eksempel:
 </translation>
     </message>
     <message>
         <location filename="printercmddialog.cpp" line="45"/>
         <source><Path to gsprint.exe> -query -color</source>
-        <translation><Path to gsprint.exe> -query -color</translation>
+        <translatorcomment>Need to doublecheck this one</translatorcomment>
+        <translation><Sti til gsprint.exe> -query -color</translation>
     </message>
 </context>
 <context>
@@ -1813,85 +1996,85 @@ Example:
     <message>
         <location filename="sessionbutton.cpp" line="116"/>
         <source>Session preferences...</source>
-        <translation>工作階段偏好設定...</translation>
+        <translation>Sesjonsinnstillinger...</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="120"/>
         <source>Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示</translation>
+        <translation>Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="125"/>
         <source>Delete session</source>
-        <translation>刪除工作階段</translation>
+        <translation>Slett sesjon</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="138"/>
         <source>Session actions</source>
-        <translation>工作階段動作</translation>
+        <translation>Sesjonshandlinger</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="139"/>
         <source>Select type</source>
-        <translation>選擇類型</translation>
+        <translation>Velg type</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="141"/>
         <source>Select resolution</source>
-        <translation>選擇解析度</translation>
+        <translation>Velg oppløsning</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="142"/>
         <source>Toggle sound support</source>
-        <translation>切換聲音支援</translation>
+        <translation>Slå av/på lydstøtte</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="272"/>
         <source>New Session</source>
-        <translation>新工作階段</translation>
+        <translation>Ny sesjon</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="277"/>
         <source>running</source>
-        <translation>執行中</translation>
+        <translation>aktiv</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="281"/>
         <source>suspended</source>
-        <translation>已暫停</translation>
+        <translation>frakoblet</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="314"/>
         <source>KDE</source>
-        <translation type="unfinished"></translation>
+        <translation>KDE</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="325"/>
         <location filename="sessionbutton.cpp" line="357"/>
         <location filename="sessionbutton.cpp" line="616"/>
         <source>RDP connection</source>
-        <translation>RDP連線</translation>
+        <translation>RDP tilkobling</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="326"/>
         <location filename="sessionbutton.cpp" line="363"/>
         <location filename="sessionbutton.cpp" line="622"/>
         <source>XDMCP</source>
-        <translation type="unfinished"></translation>
+        <translation>XDMCP</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="327"/>
         <location filename="sessionbutton.cpp" line="351"/>
         <location filename="sessionbutton.cpp" line="610"/>
         <source>Connection to local desktop</source>
-        <translation>連線至本地桌面</translation>
+        <translation>Tilkobling til lokalt skrivebord</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="385"/>
         <location filename="sessionbutton.cpp" line="402"/>
         <location filename="sessionbutton.cpp" line="663"/>
         <source>fullscreen</source>
-        <translation>全螢幕</translation>
+        <translation>fullskjerm</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="389"/>
@@ -1900,25 +2083,25 @@ Example:
         <location filename="sessionbutton.cpp" line="669"/>
         <location filename="sessionbutton.cpp" line="672"/>
         <source>Display </source>
-        <translation>顯示</translation>
+        <translation>Skjerm </translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="397"/>
         <location filename="sessionbutton.cpp" line="437"/>
         <source>window</source>
-        <translation>視窗</translation>
+        <translation>vindu</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="445"/>
         <location filename="sessionbutton.cpp" line="575"/>
         <source>Enabled</source>
-        <translation>啟用</translation>
+        <translation>Aktivert</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="447"/>
         <location filename="sessionbutton.cpp" line="577"/>
         <source>Disabled</source>
-        <translation>停用</translation>
+        <translation>Deaktivert</translation>
     </message>
 </context>
 <context>
@@ -1926,38 +2109,38 @@ Example:
     <message>
         <location filename="sessionmanagedialog.cpp" line="35"/>
         <source>E&xit</source>
-        <translation>離開(&x)</translation>
+        <translation>&Avslutt</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="41"/>
         <source>&New session</source>
-        <translation>建立新的工作階段(&N)</translation>
+        <translation>&Ny sesjon</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="42"/>
         <source>&Session preferences</source>
-        <translation>工作階段偏好設定(&S)</translation>
+        <translation>&Sesjonsinnstillinger</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="43"/>
         <source>&Delete session</source>
-        <translation>刪除工作階段(&D)</translation>
+        <translation>S&lett sesjon</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="47"/>
         <source>&Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示(&C)...</translation>
+        <translation>&Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="81"/>
         <source>Delete</source>
         <comment>Delete</comment>
-        <translation>刪除</translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="109"/>
         <source>Session management</source>
-        <translation>管理工作階段</translation>
+        <translation>Sesjonshåndtering</translation>
     </message>
 </context>
 <context>
@@ -1965,154 +2148,155 @@ Example:
     <message>
         <location filename="sessionwidget.cpp" line="52"/>
         <source>Session name:</source>
-        <translation>工作階段名稱:</translation>
+        <translation>Sesjonsnavn:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="57"/>
         <source><< change icon</source>
-        <translation><< 更換圖示</translation>
+        <translation><< endre ikon</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="60"/>
         <source>&Server</source>
-        <translation>伺服器(&S)</translation>
+        <translation>&Server</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="87"/>
         <source>Host:</source>
-        <translation>主機:</translation>
+        <translation>Vert:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="88"/>
         <source>Login:</source>
-        <translation>登入帳號:</translation>
+        <translation>Brukernavn:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="89"/>
         <source>SSH port:</source>
-        <translation>SSH連接埠:</translation>
+        <translation>SSH port:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="101"/>
         <source>Use RSA/DSA key for ssh connection:</source>
-        <translation>使用RSA/DSA密鑰於SSH連線:</translation>
+        <translation>Bruk RSA/DSA  nøkkel for SSH tilkobling:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="107"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>嘗試自動登入 (ssh代理或預設SSH密鑰)</translation>
+        <translation>Forsøk automatisk pålogging (SSH agent, eller standard SSH nøkkel)</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="108"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
-        <translation>Kerberos 5 (GSSAPI) 認證</translation>
+        <translation>Kerberos 5 (GSSAPI) autentisering</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="113"/>
         <source>&Session type</source>
-        <translation>工作階段類型(&S)</translation>
+        <translation>&Sesjontype</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="118"/>
         <source>Session type:</source>
-        <translation>工作階段類型:</translation>
+        <translation>Sesjontype:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="127"/>
         <location filename="sessionwidget.cpp" line="296"/>
         <source>Connect to Windows terminal server</source>
-        <translation>連線至微軟終端伺服器</translation>
+        <translation>Koble til Windows terminal server</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="128"/>
         <source>XDMCP</source>
-        <translation type="unfinished"></translation>
+        <translation>XDMCP</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="129"/>
         <source>Connect to local desktop</source>
-        <translation>連線至本地桌面</translation>
+        <translation>Koble til lokalt skrivebord</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="130"/>
         <source>Custom desktop</source>
-        <translation>自訂桌面類型</translation>
+        <translatorcomment>The normal "brukertilpasset" doesn't fit here</translatorcomment>
+        <translation>Selvvalgt skrivebord</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="131"/>
         <source>Single application</source>
-        <translation>單一應用程式</translation>
+        <translation>Enkel applikasjon</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="133"/>
         <location filename="sessionwidget.cpp" line="252"/>
         <source>Command:</source>
-        <translation>指令:</translation>
+        <translation>Kommando:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="134"/>
         <source>Advanced options...</source>
-        <translation>進階設定...</translation>
+        <translation>Avanserte alternativer...</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="145"/>
         <location filename="sessionwidget.cpp" line="429"/>
         <location filename="sessionwidget.cpp" line="492"/>
         <source>Path to executable</source>
-        <translation>執行路徑</translation>
+        <translation>Sti til programfil</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="196"/>
         <source>Open picture</source>
-        <translation>開啟圖片</translation>
+        <translation>Ã…pne bilde</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="198"/>
         <source>Pictures</source>
-        <translation>圖片</translation>
+        <translation>Bilder</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="219"/>
         <source>Open key file</source>
-        <translation>開啟密鑰檔案</translation>
+        <translation>Åpne nøkkelfil</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="221"/>
         <source>All files</source>
-        <translation>所有檔案</translation>
+        <translation>Alle filer</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="231"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Feil</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="232"/>
         <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>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>
         <location filename="sessionwidget.cpp" line="273"/>
         <location filename="sessionwidget.cpp" line="391"/>
         <source>Server:</source>
-        <translation>伺服器:</translation>
+        <translation>Server:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="279"/>
         <location filename="sessionwidget.cpp" line="399"/>
         <source>XDMCP server:</source>
-        <translation>XDMCP 伺服器:</translation>
+        <translation>XDMCP server:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="297"/>
         <source>rdesktop command line options:</source>
-        <translation>rdesktop 指令選項:</translation>
+        <translation>rdesktop kommandolinjevalg:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="310"/>
         <location filename="sessionwidget.cpp" line="411"/>
         <source>New session</source>
-        <translation>新的工作階段</translation>
+        <translation>Ny sesjon</translation>
     </message>
 </context>
 <context>
@@ -2121,131 +2305,132 @@ Example:
         <location filename="settingswidget.cpp" line="40"/>
         <location filename="settingswidget.cpp" line="44"/>
         <source>&Display</source>
-        <translation>顯示(&D)</translation>
+        <translation>&Skjerm</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="41"/>
         <location filename="settingswidget.cpp" line="45"/>
         <source>&Keyboard</source>
-        <translation>鍵盤(&K)</translation>
+        <translation>&Tastatur</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="42"/>
         <location filename="settingswidget.cpp" line="46"/>
         <source>Sound</source>
-        <translation>聲音</translation>
+        <translation>Lyd</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="57"/>
         <source>Fullscreen</source>
-        <translation>全螢幕</translation>
+        <translation>Fullskjerm</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="59"/>
         <source>Custom</source>
-        <translation>自定</translation>
+        <translation>Tilpasset</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="61"/>
         <source>Window</source>
-        <translation>視窗</translation>
+        <translation>Vindu</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="63"/>
         <source>Use whole display</source>
-        <translation>使用整個顯示器</translation>
+        <translation>Bruk hele skjermen</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
-        <translation>設定顯示DPI</translation>
+        <translation>Sett skjermens DPI</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="76"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
-        <translation>Xinerama延伸功能(支援兩個以上的螢幕)</translation>
+        <translation>Xinerama utvidelse (støtte for to, eller flere fysiske skjermer)</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="92"/>
         <source>Width:</source>
-        <translation>寬度:</translation>
+        <translation>Bredde:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="95"/>
         <source>Height:</source>
-        <translation>高度:</translation>
+        <translation>Høyde:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="102"/>
         <source>&Display:</source>
-        <translation>顯示器(&D):</translation>
+        <translation>&Skjerm:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="104"/>
         <source>&Identify all displays</source>
-        <translation>辨認所有顯示器(&I)</translation>
+        <translation>&Identifiser alle skjermer</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="142"/>
         <source>Keep current keyboard Settings</source>
-        <translation>保持目前的鍵盤設定</translation>
+        <translation>Behold gjeldende tastaturoppsett</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="152"/>
         <source>Keyboard layout:</source>
-        <translation>鍵盤佈局:</translation>
+        <translation>Tastatur utseende:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="154"/>
         <source>Keyboard model:</source>
-        <translation>鍵盤型號:</translation>
+        <translation>Tastatur modell:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="165"/>
         <source>Enable sound support</source>
-        <translation>啟用音效支援</translation>
+        <translation>Aktiver lydstøtte</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="174"/>
         <source>Start sound daemon</source>
-        <translation>開啟聲音背景程式</translation>
+        <translatorcomment>The translated word for daemon is not easy to understand in this context, I choose to use 'tjener' since I never use this as a translation for 'server'</translatorcomment>
+        <translation>Start lydtjeneren</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="176"/>
         <source>Use running sound daemon</source>
-        <translation>使用目前的音效背景程式</translation>
+        <translation>Benytt kjørende lydtjener</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="178"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
-        <translation>使用SSH連接埠轉送來建立
-可通過防火牆的聲音通道</translation>
+        <translation>Benytt SSH port videresendring for å tunnelere
+lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="180"/>
         <source>Use default sound port</source>
-        <translation>使用預設的聲音連接埠</translation>
+        <translation>Benytt standard lyd port</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="187"/>
         <source>Sound port:</source>
-        <translation>聲音連接埠:</translation>
+        <translation>Lyd port:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="214"/>
         <source>Client side printing support</source>
-        <translation>用戶端列印支援</translation>
+        <translation>Klientside utskrifts støtte</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="557"/>
+        <location filename="settingswidget.cpp" line="554"/>
         <source>us</source>
-        <translation>us</translation>
+        <translation>no</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="558"/>
+        <location filename="settingswidget.cpp" line="555"/>
         <source>pc105/us</source>
-        <translation>pc105/us</translation>
+        <translation>pc105/no</translation>
     </message>
 </context>
 <context>
@@ -2253,176 +2438,180 @@ sound system connections through firewalls</source>
     <message>
         <location filename="sharewidget.cpp" line="37"/>
         <source>&Folders</source>
-        <translation>資料夾(&F)</translation>
+        <translation>&Mapper</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="47"/>
         <source>Path</source>
-        <translation>路徑</translation>
+        <translation>Sti</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="49"/>
         <location filename="sharewidget.cpp" line="131"/>
         <source>Automount</source>
-        <translation>自動掛載</translation>
+        <translation>Automonter</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="58"/>
         <source>Add</source>
-        <translation>新增</translation>
+        <translation>Legg til</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="59"/>
         <source>Delete</source>
-        <translation>刪除</translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="69"/>
         <source>Path:</source>
-        <translation>路徑:</translation>
+        <translation>Sti:</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="76"/>
         <source>Filename encoding</source>
-        <translation>檔案編碼方式</translation>
+        <translation>Tegnkoding av filnavn</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="82"/>
         <source>local:</source>
-        <translation>本地端:</translation>
+        <translation>lokal:</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="83"/>
         <source>remote:</source>
-        <translation>遠端:</translation>
+        <translatorcomment>ouch! This word is really hard to get right in Norwegian in these contextes...</translatorcomment>
+        <translation>fjerntliggende:</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="95"/>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>使用SSH連接埠轉送來建立可通過防火牆的檔案系統通道</translation>
+        <translation>Benytt SSH port videresendring for å tunnelere lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="158"/>
         <source>Select folder</source>
-        <translation>選擇資料夾</translation>
+        <translation>Velg mappe</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="169"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Feil</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="170"/>
         <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>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>
         <location filename="sharewidget.cpp" line="229"/>
         <location filename="sharewidget.cpp" line="280"/>
         <source>WINDOWS-1252</source>
-        <translation type="unfinished"></translation>
+        <translation>WINDOWS-1252</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="239"/>
         <location filename="sharewidget.cpp" line="286"/>
         <source>ISO8859-1</source>
-        <translation type="unfinished"></translation>
+        <translation>ISO8859-1</translation>
     </message>
 </context>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="111"/>
+        <location filename="sshmasterconnection.cpp" line="124"/>
         <source>Can not initialize libssh</source>
-        <translation>libssh無法初始化</translation>
+        <translatorcomment>I need to revisit the word 'initiere', a better word could be 'klargjøre'</translatorcomment>
+        <translation>Klarer ikke å initiere libssh</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="131"/>
+        <location filename="sshmasterconnection.cpp" line="144"/>
         <source>Can not create ssh session</source>
-        <translation>無法建立SSH工作階段</translation>
+        <translation>Klarer ikke å opprette ssh sesjon</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="146"/>
+        <location filename="sshmasterconnection.cpp" line="159"/>
         <source>Can not connect to </source>
-        <translation>無法連線至 </translation>
+        <translation>Klarer ikke å koble til </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="200"/>
         <source>Authentication failed</source>
-        <translation>驗證失敗</translation>
+        <translation>Autentisering feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="203"/>
+        <location filename="sshmasterconnection.cpp" line="216"/>
         <source>channel_forward_listen failed</source>
-        <translation>channel_forward_listen失敗</translation>
+        <translatorcomment>I'm not sure if this is a static variable which shouldn't be translated or not, but I left it as I believe it's a variable.</translatorcomment>
+        <translation>channel_forward_listen feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="517"/>
+        <location filename="sshmasterconnection.cpp" line="530"/>
         <source>Can not open file </source>
-        <translation>無法開啟檔案</translation>
+        <translation>Kan ikke åpne filen </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="529"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not create remote file </source>
-        <translation>無法創建遠端檔案</translation>
+        <translation>Klarer ikke å opprette fil over nettverket </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="542"/>
+        <location filename="sshmasterconnection.cpp" line="555"/>
         <source>Can not write to remote file </source>
-        <translation>無法寫入資料至遠端檔案</translation>
+        <translation>Klarer ikke å skrive til filen over nettverket </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="592"/>
+        <location filename="sshmasterconnection.cpp" line="605"/>
         <source>can not connect to </source>
-        <translation>無法連線至 </translation>
+        <translation>Klarer ikke å koble til </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="714"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward失敗</translation>
+        <translation>channel_open_forward feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="720"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session失敗</translation>
+        <translation>channel_open_session feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="727"/>
+        <location filename="sshmasterconnection.cpp" line="740"/>
         <source>channel_request_exec failed</source>
-        <translation>channel_request_exec失敗</translation>
+        <translation>channel_request_exec feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="792"/>
+        <location filename="sshmasterconnection.cpp" line="805"/>
         <source>error writing to socket</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Really not any great words to best translate socket into...</translatorcomment>
+        <translation>feil ved skriving til sokkelen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="810"/>
+        <location filename="sshmasterconnection.cpp" line="823"/>
         <source>error reading channel</source>
-        <translation type="unfinished"></translation>
+        <translation>feil under lesing av kanalen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="840"/>
+        <location filename="sshmasterconnection.cpp" line="853"/>
         <source>channel_write failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_write feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="852"/>
+        <location filename="sshmasterconnection.cpp" line="865"/>
         <source>error reading tcp socket</source>
-        <translation type="unfinished"></translation>
+        <translation>feil ved lesing av tcp sokkelen</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="92"/>
+        <location filename="sshprocess.cpp" line="97"/>
         <source>Error creating socket</source>
-        <translation type="unfinished"></translation>
+        <translation>feil under opprettelse av sokkelen</translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="110"/>
+        <location filename="sshprocess.cpp" line="115"/>
         <source>Error binding </source>
-        <translation type="unfinished"></translation>
+        <translation>Feil ved binding </translation>
     </message>
 </context>
 <context>
@@ -2430,12 +2619,12 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingswidget.cpp" line="50"/>
         <source>Open File</source>
-        <translation>開啟檔案</translation>
+        <translation>Ã…pne fil</translation>
     </message>
     <message>
         <location filename="xsettingswidget.cpp" line="52"/>
         <source>Executable (*.exe)</source>
-        <translation>執行檔 (*.exe)</translation>
+        <translation>Programfil (*.exe)</translation>
     </message>
 </context>
 <context>
@@ -2443,62 +2632,65 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingsui.ui" line="14"/>
         <source>Form</source>
-        <translation>表單</translation>
+        <translation>Skjema</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
-        <source>You must restart the X2go Client for the changes to take effect</source>
-        <translation>您必需重新啟動X2go用戶端以讓設定變更生效</translation>
+        <source>You must restart the X2Go Client for the changes to take effect</source>
+        <translation>Du må restarte X2Go klienten for at endringene skal tre i kraft</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="50"/>
         <source>use integrated X-Server</source>
-        <translation>使用內建的X伺服器</translation>
+        <translation>Benytt integrert X-Server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="60"/>
         <source>use custom X-Server</source>
-        <translation>使用自定的X伺服器</translation>
+        <translation>Benytt egentilpasset X-Server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="70"/>
         <source>custom X-Server</source>
-        <translation>自定X伺服器</translation>
+        <translation>egentilpasset X-Server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="78"/>
         <source>executable:</source>
-        <translation>執行路徑:</translation>
+        <translation>programfil:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="101"/>
         <source>start X-Server on X2Go client start</source>
-        <translation>當X2Go用戶端啟動時啟動X伺服器</translation>
+        <translation>start X-Serveren når X2Go klienten startes</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="113"/>
         <source>command line options:</source>
-        <translation>指令列選項:</translation>
+        <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment>
+        <translation>kommandolinjevalg</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="125"/>
         <source>X-Server command line options</source>
-        <translation>X伺服器指令列選項</translation>
+        <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment>
+        <translation>X-Server kommandolinjevalg</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="131"/>
         <source>window mode:</source>
-        <translation>視窗模式:</translation>
+        <translation>Vindus-modus:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="141"/>
         <source>fullscreen mode:</source>
-        <translation>全螢幕模式:</translation>
+        <translation>fullskjerm-modus:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="151"/>
         <source>single application:</source>
-        <translation>單一應用程式:</translation>
+        <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment>
+        <translation>enkeltapplikasjon:</translation>
     </message>
 </context>
 </TS>
diff --git a/x2goclient_ru.qm b/x2goclient_ru.qm
deleted file mode 100644
index 1dd3769..0000000
Binary files a/x2goclient_ru.qm and /dev/null differ
diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts
index b49003a..3bc79f4 100644
--- a/x2goclient_ru.ts
+++ b/x2goclient_ru.ts
@@ -124,6 +124,57 @@
     </message>
 </context>
 <context>
+    <name>ConTest</name>
+    <message>
+        <location filename="contest.ui" line="14"/>
+        <source>Connectivity test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="24"/>
+        <source>HTTPS connection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="31"/>
+        <source>SSH connection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="38"/>
+        <source>Connection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="123"/>
+        <location filename="contest.ui" line="167"/>
+        <source>Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="211"/>
+        <source>0 Kb/s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="108"/>
+        <location filename="contest.cpp" line="115"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="150"/>
+        <source>Socket operation timed out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="contest.cpp" line="162"/>
+        <location filename="contest.cpp" line="168"/>
+        <source>Failed: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigDialog</name>
     <message>
         <location filename="configdialog.cpp" line="87"/>
@@ -874,125 +925,125 @@ sound system connections through firewalls</source>
 <context>
     <name>HttpBrokerClient</name>
     <message>
-        <location filename="httpbrokerclient.cpp" line="164"/>
+        <location filename="httpbrokerclient.cpp" line="178"/>
         <source>us</source>
         <translation>ru</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="167"/>
+        <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
         <translation>pc105/ru</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="294"/>
         <location filename="httpbrokerclient.cpp" line="308"/>
-        <location filename="httpbrokerclient.cpp" line="345"/>
+        <location filename="httpbrokerclient.cpp" line="328"/>
+        <location filename="httpbrokerclient.cpp" line="365"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="309"/>
+        <location filename="httpbrokerclient.cpp" line="329"/>
         <source>Login failed!<br>Please try again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="433"/>
+        <location filename="httpbrokerclient.cpp" line="454"/>
         <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="436"/>
+        <location filename="httpbrokerclient.cpp" line="457"/>
         <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="441"/>
+        <location filename="httpbrokerclient.cpp" line="462"/>
         <source>Secure connection failed</source>
         <translation>Безопасное соединение невозможно</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="446"/>
+        <location filename="httpbrokerclient.cpp" line="467"/>
         <source>Issued to:
 </source>
         <translation>Issued to:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="447"/>
-        <location filename="httpbrokerclient.cpp" line="459"/>
+        <location filename="httpbrokerclient.cpp" line="468"/>
+        <location filename="httpbrokerclient.cpp" line="480"/>
         <source>Common Name(CN)	</source>
         <translation>Common Name(CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="450"/>
-        <location filename="httpbrokerclient.cpp" line="462"/>
+        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="483"/>
         <source>Organization(O)	</source>
         <translation>Organization(O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="453"/>
-        <location filename="httpbrokerclient.cpp" line="465"/>
+        <location filename="httpbrokerclient.cpp" line="474"/>
+        <location filename="httpbrokerclient.cpp" line="486"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="456"/>
+        <location filename="httpbrokerclient.cpp" line="477"/>
         <source>Serial Number	</source>
         <translation>Serial Number	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="458"/>
+        <location filename="httpbrokerclient.cpp" line="479"/>
         <source>Issued by:
 </source>
         <translation>Issued by:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="469"/>
+        <location filename="httpbrokerclient.cpp" line="490"/>
         <source>Validity:
 </source>
         <translation>Validity:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="470"/>
+        <location filename="httpbrokerclient.cpp" line="491"/>
         <source>Issued on	</source>
         <translation>Issued on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="471"/>
+        <location filename="httpbrokerclient.cpp" line="492"/>
         <source>expires on	</source>
         <translation>expires on	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="472"/>
+        <location filename="httpbrokerclient.cpp" line="493"/>
         <source>Fingerprints:
 </source>
         <translation>Fingerprints:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="473"/>
+        <location filename="httpbrokerclient.cpp" line="494"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="475"/>
+        <location filename="httpbrokerclient.cpp" line="496"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="481"/>
+        <location filename="httpbrokerclient.cpp" line="502"/>
         <source>Exit X2Go Client</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="483"/>
+        <location filename="httpbrokerclient.cpp" line="504"/>
         <source>Add exception</source>
         <translation>Добавить исключение</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="346"/>
+        <location filename="httpbrokerclient.cpp" line="366"/>
         <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>Ваша сессия больше не действительна. Чтобы продолжить соединение, вернитесь на страницу регистрации или используйте функцию обновления страницы броузера.</translation>
     </message>
@@ -1000,41 +1051,41 @@ sound system connections through firewalls</source>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="80"/>
-        <location filename="onmainwindow_part3.cpp" line="307"/>
+        <location filename="onmainwindow.cpp" line="84"/>
+        <location filename="onmainwindow_part3.cpp" line="312"/>
         <source>us</source>
         <translation>ru</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="81"/>
+        <location filename="onmainwindow.cpp" line="85"/>
         <source>pc105/us</source>
         <translation>pc105/ru</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="329"/>
+        <location filename="onmainwindow.cpp" line="333"/>
         <source>Support ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="601"/>
-        <location filename="onmainwindow.cpp" line="1782"/>
-        <location filename="onmainwindow_part3.cpp" line="1636"/>
+        <location filename="onmainwindow.cpp" line="610"/>
+        <location filename="onmainwindow.cpp" line="1820"/>
+        <location filename="onmainwindow_part3.cpp" line="1642"/>
         <source>Session:</source>
         <translation>Сессия:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="653"/>
+        <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
         <translation>&Выход</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="654"/>
+        <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="655"/>
-        <location filename="onmainwindow.cpp" line="940"/>
+        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="958"/>
         <source>Quit</source>
         <translation>Выход</translation>
     </message>
@@ -1043,7 +1094,7 @@ sound system connections through firewalls</source>
         <translation type="obsolete">&Новая сессия ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="659"/>
+        <location filename="onmainwindow.cpp" line="668"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -1052,17 +1103,17 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Управление сессиями...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="665"/>
+        <location filename="onmainwindow.cpp" line="674"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="325"/>
+        <location filename="onmainwindow.cpp" line="329"/>
         <source>&Settings ...</source>
         <translation>&Установки ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2052"/>
+        <location filename="onmainwindow_part4.cpp" line="2286"/>
         <source>Restore toolbar</source>
         <translation>Восстановить панель инструментов</translation>
     </message>
@@ -1071,121 +1122,121 @@ sound system connections through firewalls</source>
         <translation type="obsolete">О программе "X2GO Client"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="698"/>
+        <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
         <translation>О Qt</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2456"/>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
         <source>Session</source>
         <translation>Сессия</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="715"/>
+        <location filename="onmainwindow.cpp" line="734"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="721"/>
+        <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
         <translation>&Сессия</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="722"/>
+        <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
         <translation>&Опции</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="739"/>
+        <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
         <translation>&Помощь</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="776"/>
-        <location filename="onmainwindow.cpp" line="1775"/>
-        <location filename="onmainwindow_part3.cpp" line="1629"/>
-        <location filename="onmainwindow_part4.cpp" line="1422"/>
+        <location filename="onmainwindow.cpp" line="799"/>
+        <location filename="onmainwindow.cpp" line="1813"/>
+        <location filename="onmainwindow_part3.cpp" line="1635"/>
+        <location filename="onmainwindow_part4.cpp" line="1656"/>
         <source>Login:</source>
         <translation>Пользователь:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1423"/>
+        <location filename="onmainwindow_part4.cpp" line="1657"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1424"/>
+        <location filename="onmainwindow_part4.cpp" line="1658"/>
         <source>Keyboard layout:</source>
         <translation type="unfinished">Раскладка Клавиатуры:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1465"/>
+        <location filename="onmainwindow_part4.cpp" line="1699"/>
         <source>Ok</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1467"/>
-        <location filename="onmainwindow_part4.cpp" line="1756"/>
-        <location filename="onmainwindow_part4.cpp" line="1758"/>
+        <location filename="onmainwindow_part4.cpp" line="1701"/>
+        <location filename="onmainwindow_part4.cpp" line="1990"/>
+        <location filename="onmainwindow_part4.cpp" line="1992"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2252"/>
+        <location filename="onmainwindow_part4.cpp" line="2486"/>
         <source>Invalid reply from broker</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
-        <location filename="onmainwindow.cpp" line="830"/>
-        <location filename="onmainwindow.cpp" line="1471"/>
-        <location filename="onmainwindow.cpp" line="1499"/>
-        <location filename="onmainwindow.cpp" line="1507"/>
-        <location filename="onmainwindow.cpp" line="1640"/>
-        <location filename="onmainwindow.cpp" line="1667"/>
-        <location filename="onmainwindow.cpp" line="1670"/>
-        <location filename="onmainwindow.cpp" line="1917"/>
-        <location filename="onmainwindow.cpp" line="2140"/>
-        <location filename="onmainwindow.cpp" line="2154"/>
-        <location filename="onmainwindow.cpp" line="2167"/>
-        <location filename="onmainwindow.cpp" line="2201"/>
-        <location filename="onmainwindow.cpp" line="2246"/>
-        <location filename="onmainwindow_part2.cpp" line="297"/>
-        <location filename="onmainwindow_part2.cpp" line="473"/>
-        <location filename="onmainwindow_part2.cpp" line="482"/>
-        <location filename="onmainwindow_part2.cpp" line="781"/>
-        <location filename="onmainwindow_part2.cpp" line="1232"/>
-        <location filename="onmainwindow_part2.cpp" line="1293"/>
-        <location filename="onmainwindow_part2.cpp" line="1344"/>
-        <location filename="onmainwindow_part2.cpp" line="1377"/>
-        <location filename="onmainwindow_part2.cpp" line="1421"/>
-        <location filename="onmainwindow_part2.cpp" line="1801"/>
-        <location filename="onmainwindow_part2.cpp" line="1827"/>
-        <location filename="onmainwindow_part2.cpp" line="1958"/>
+        <location filename="onmainwindow.cpp" line="820"/>
+        <location filename="onmainwindow.cpp" line="848"/>
+        <location filename="onmainwindow.cpp" line="1495"/>
+        <location filename="onmainwindow.cpp" line="1524"/>
+        <location filename="onmainwindow.cpp" line="1532"/>
+        <location filename="onmainwindow.cpp" line="1678"/>
+        <location filename="onmainwindow.cpp" line="1705"/>
+        <location filename="onmainwindow.cpp" line="1708"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
+        <location filename="onmainwindow.cpp" line="2178"/>
+        <location filename="onmainwindow.cpp" line="2192"/>
+        <location filename="onmainwindow.cpp" line="2205"/>
+        <location filename="onmainwindow.cpp" line="2239"/>
+        <location filename="onmainwindow.cpp" line="2284"/>
+        <location filename="onmainwindow_part2.cpp" line="305"/>
+        <location filename="onmainwindow_part2.cpp" line="481"/>
+        <location filename="onmainwindow_part2.cpp" line="490"/>
+        <location filename="onmainwindow_part2.cpp" line="789"/>
+        <location filename="onmainwindow_part2.cpp" line="1240"/>
+        <location filename="onmainwindow_part2.cpp" line="1301"/>
+        <location filename="onmainwindow_part2.cpp" line="1352"/>
+        <location filename="onmainwindow_part2.cpp" line="1385"/>
+        <location filename="onmainwindow_part2.cpp" line="1429"/>
+        <location filename="onmainwindow_part2.cpp" line="1830"/>
+        <location filename="onmainwindow_part2.cpp" line="1856"/>
+        <location filename="onmainwindow_part2.cpp" line="1988"/>
         <location filename="onmainwindow_part3.cpp" line="202"/>
-        <location filename="onmainwindow_part3.cpp" line="768"/>
-        <location filename="onmainwindow_part3.cpp" line="848"/>
-        <location filename="onmainwindow_part3.cpp" line="1092"/>
-        <location filename="onmainwindow_part3.cpp" line="1220"/>
-        <location filename="onmainwindow_part3.cpp" line="1273"/>
-        <location filename="onmainwindow_part3.cpp" line="1579"/>
-        <location filename="onmainwindow_part3.cpp" line="1581"/>
-        <location filename="onmainwindow_part3.cpp" line="1811"/>
-        <location filename="onmainwindow_part3.cpp" line="1859"/>
-        <location filename="onmainwindow_part3.cpp" line="1887"/>
-        <location filename="onmainwindow_part3.cpp" line="2257"/>
-        <location filename="onmainwindow_part3.cpp" line="2272"/>
-        <location filename="onmainwindow_part3.cpp" line="2326"/>
+        <location filename="onmainwindow_part3.cpp" line="773"/>
+        <location filename="onmainwindow_part3.cpp" line="854"/>
+        <location filename="onmainwindow_part3.cpp" line="1098"/>
+        <location filename="onmainwindow_part3.cpp" line="1226"/>
+        <location filename="onmainwindow_part3.cpp" line="1279"/>
+        <location filename="onmainwindow_part3.cpp" line="1585"/>
+        <location filename="onmainwindow_part3.cpp" line="1587"/>
+        <location filename="onmainwindow_part3.cpp" line="1817"/>
+        <location filename="onmainwindow_part3.cpp" line="1865"/>
+        <location filename="onmainwindow_part3.cpp" line="1893"/>
+        <location filename="onmainwindow_part3.cpp" line="2263"/>
+        <location filename="onmainwindow_part3.cpp" line="2278"/>
+        <location filename="onmainwindow_part3.cpp" line="2332"/>
         <location filename="onmainwindow_part4.cpp" line="29"/>
         <location filename="onmainwindow_part4.cpp" line="54"/>
-        <location filename="onmainwindow_part4.cpp" line="1980"/>
-        <location filename="onmainwindow_part4.cpp" line="2251"/>
+        <location filename="onmainwindow_part4.cpp" line="2214"/>
+        <location filename="onmainwindow_part4.cpp" line="2485"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1582"/>
+        <location filename="onmainwindow_part3.cpp" line="1588"/>
         <source>Please check LDAP Settings</source>
         <translation>Проверте настройки LDAP</translation>
     </message>
@@ -1198,32 +1249,32 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Удалить сессию?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2372"/>
+        <location filename="onmainwindow.cpp" line="2411"/>
         <location filename="onmainwindow_part3.cpp" line="68"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2443"/>
+        <location filename="onmainwindow.cpp" line="2485"/>
         <source> on </source>
         <translation> на </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="290"/>
-        <location filename="onmainwindow_part2.cpp" line="1286"/>
-        <location filename="onmainwindow_part2.cpp" line="1370"/>
-        <location filename="onmainwindow_part2.cpp" line="1403"/>
-        <location filename="onmainwindow_part3.cpp" line="761"/>
-        <location filename="onmainwindow_part3.cpp" line="841"/>
-        <location filename="onmainwindow_part3.cpp" line="1213"/>
-        <location filename="onmainwindow_part3.cpp" line="1266"/>
-        <location filename="onmainwindow_part3.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="298"/>
+        <location filename="onmainwindow_part2.cpp" line="1294"/>
+        <location filename="onmainwindow_part2.cpp" line="1378"/>
+        <location filename="onmainwindow_part2.cpp" line="1411"/>
+        <location filename="onmainwindow_part3.cpp" line="766"/>
+        <location filename="onmainwindow_part3.cpp" line="847"/>
+        <location filename="onmainwindow_part3.cpp" line="1219"/>
+        <location filename="onmainwindow_part3.cpp" line="1272"/>
+        <location filename="onmainwindow_part3.cpp" line="2256"/>
         <source><b>Connection failed</b>
 </source>
         <translation><b>Ошибка соединения</b><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>Неверный пароль!</b><br><br></translation>
     </message>
@@ -1232,51 +1283,51 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Не доступен ни один сервер</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1002"/>
-        <location filename="onmainwindow_part4.cpp" line="1752"/>
+        <location filename="onmainwindow_part2.cpp" line="1010"/>
+        <location filename="onmainwindow_part4.cpp" line="1986"/>
         <source>Select session:</source>
         <translation>Сессия:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1754"/>
+        <location filename="onmainwindow_part4.cpp" line="1988"/>
         <source>Resume</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="479"/>
-        <location filename="onmainwindow.cpp" line="927"/>
-        <location filename="onmainwindow_part2.cpp" line="2200"/>
-        <location filename="onmainwindow_part4.cpp" line="1761"/>
+        <location filename="onmainwindow.cpp" line="488"/>
+        <location filename="onmainwindow.cpp" line="945"/>
+        <location filename="onmainwindow_part2.cpp" line="2230"/>
+        <location filename="onmainwindow_part4.cpp" line="1995"/>
         <source>Suspend</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="482"/>
-        <location filename="onmainwindow.cpp" line="928"/>
-        <location filename="onmainwindow_part4.cpp" line="1609"/>
-        <location filename="onmainwindow_part4.cpp" line="1763"/>
+        <location filename="onmainwindow.cpp" line="491"/>
+        <location filename="onmainwindow.cpp" line="946"/>
+        <location filename="onmainwindow_part4.cpp" line="1843"/>
+        <location filename="onmainwindow_part4.cpp" line="1997"/>
         <source>Terminate</source>
         <translation>Завершить</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1766"/>
+        <location filename="onmainwindow_part4.cpp" line="2000"/>
         <source>New</source>
         <translation>Новая</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2458"/>
-        <location filename="onmainwindow_part4.cpp" line="1833"/>
-        <location filename="onmainwindow_part4.cpp" line="1855"/>
+        <location filename="onmainwindow_part2.cpp" line="2488"/>
+        <location filename="onmainwindow_part4.cpp" line="2067"/>
+        <location filename="onmainwindow_part4.cpp" line="2089"/>
         <source>Display</source>
         <translation>Дисплей</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1835"/>
+        <location filename="onmainwindow_part4.cpp" line="2069"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1841"/>
+        <location filename="onmainwindow_part4.cpp" line="2075"/>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
@@ -1285,57 +1336,57 @@ sound system connections through firewalls</source>
         <translation type="obsolete">Время создания</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1846"/>
+        <location filename="onmainwindow_part4.cpp" line="2080"/>
         <source>Client IP</source>
         <translation>IP клиента</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1848"/>
+        <location filename="onmainwindow_part4.cpp" line="2082"/>
         <source>Session ID</source>
         <translation>ID сессии</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1018"/>
-        <location filename="onmainwindow_part2.cpp" line="1112"/>
-        <location filename="onmainwindow_part2.cpp" line="2164"/>
+        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1120"/>
+        <location filename="onmainwindow_part2.cpp" line="2194"/>
         <source>running</source>
         <translation>активна</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1020"/>
-        <location filename="onmainwindow_part2.cpp" line="1305"/>
+        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1313"/>
         <source>suspended</source>
         <translation>прервана</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1153"/>
-        <location filename="onmainwindow_part2.cpp" line="1173"/>
-        <location filename="onmainwindow_part2.cpp" line="1987"/>
-        <location filename="onmainwindow_part2.cpp" line="2376"/>
+        <location filename="onmainwindow_part2.cpp" line="1161"/>
+        <location filename="onmainwindow_part2.cpp" line="1181"/>
+        <location filename="onmainwindow_part2.cpp" line="2017"/>
+        <location filename="onmainwindow_part2.cpp" line="2406"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1154"/>
-        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1182"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
         <source>24 or 32</source>
         <translation>24 или 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1163"/>
-        <location filename="onmainwindow_part2.cpp" line="1183"/>
+        <location filename="onmainwindow_part2.cpp" line="1171"/>
+        <location filename="onmainwindow_part2.cpp" line="1191"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
         <translation> бит и перезапустить X-сервер до восстановления сессии.<br>Попробовать восстановить сессию не смотря на данное предупреждение?</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1166"/>
-        <location filename="onmainwindow_part2.cpp" line="1186"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1194"/>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
@@ -1351,54 +1402,54 @@ It is now: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
+        <location filename="onmainwindow_part2.cpp" line="91"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="110"/>
+        <location filename="onmainwindow_part2.cpp" line="113"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="115"/>
+        <location filename="onmainwindow_part2.cpp" line="118"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1167"/>
-        <location filename="onmainwindow_part2.cpp" line="1187"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1175"/>
+        <location filename="onmainwindow_part2.cpp" line="1195"/>
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="130"/>
         <source>Host key verification failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
+        <source>Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="483"/>
-        <location filename="onmainwindow_part2.cpp" line="782"/>
-        <location filename="onmainwindow_part2.cpp" line="1233"/>
-        <location filename="onmainwindow_part2.cpp" line="1345"/>
+        <location filename="onmainwindow_part2.cpp" line="491"/>
+        <location filename="onmainwindow_part2.cpp" line="790"/>
+        <location filename="onmainwindow_part2.cpp" line="1241"/>
+        <location filename="onmainwindow_part2.cpp" line="1353"/>
         <source>Server not availabel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1250"/>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
         <source>suspending</source>
         <translation>прерывается</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1272"/>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
         <source>terminating</source>
         <translation>завершается</translation>
     </message>
@@ -1411,38 +1462,38 @@ Public key hash: </source>
         <translation type="obsolete">Невозможно записать файл:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1985"/>
+        <location filename="onmainwindow_part2.cpp" line="2015"/>
         <source>Unable to create SSL Tunnel:
 </source>
         <translation>Ошибка создания SSL тунеля:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="143"/>
-        <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2148"/>
+        <location filename="onmainwindow.cpp" line="147"/>
+        <location filename="onmainwindow_part2.cpp" line="189"/>
+        <location filename="onmainwindow_part2.cpp" line="2178"/>
         <source>connecting</source>
         <translation>соединение</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2156"/>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
         <source>starting</source>
         <translation>запуск</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2158"/>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
         <source>resuming</source>
         <translation>восстановление</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2220"/>
-        <location filename="onmainwindow_part2.cpp" line="2488"/>
-        <location filename="onmainwindow_part2.cpp" line="2506"/>
+        <location filename="onmainwindow_part2.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="2518"/>
+        <location filename="onmainwindow_part2.cpp" line="2536"/>
         <source>Connection timeout, aborting</source>
         <translation>Таймаут соединения, отмена</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2221"/>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
         <source>aborting</source>
         <translation>отмена</translation>
     </message>
@@ -1451,7 +1502,7 @@ Public key hash: </source>
         <translation type="obsolete"><b>ID сессии:<br>Сервер:<br>Пользователь:<br>Дисплей:<br>Время создания:<br>Статус:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1608"/>
+        <location filename="onmainwindow_part4.cpp" line="1842"/>
         <source>Abort</source>
         <translation>Отмена</translation>
     </message>
@@ -1472,87 +1523,87 @@ Public key hash: </source>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="404"/>
+        <location filename="onmainwindow_part3.cpp" line="409"/>
         <source> (can't open file)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="415"/>
-        <location filename="onmainwindow_part3.cpp" line="425"/>
-        <location filename="onmainwindow_part3.cpp" line="435"/>
+        <location filename="onmainwindow_part3.cpp" line="420"/>
+        <location filename="onmainwindow_part3.cpp" line="430"/>
+        <location filename="onmainwindow_part3.cpp" line="440"/>
         <source> (file not exists)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="459"/>
+        <location filename="onmainwindow_part3.cpp" line="464"/>
         <source> (directory not exists)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="487"/>
+        <location filename="onmainwindow_part3.cpp" line="492"/>
         <source>wrong value for argument"--link"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="505"/>
+        <location filename="onmainwindow_part3.cpp" line="510"/>
         <source>wrong value for argument"--sound"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="522"/>
-        <location filename="onmainwindow_part3.cpp" line="533"/>
+        <location filename="onmainwindow_part3.cpp" line="527"/>
+        <location filename="onmainwindow_part3.cpp" line="538"/>
         <source>wrong value for argument"--geometry"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="551"/>
+        <location filename="onmainwindow_part3.cpp" line="556"/>
         <source>wrong value for argument"--set-kbd"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="568"/>
+        <location filename="onmainwindow_part3.cpp" line="573"/>
         <source>wrong value for argument"--ldap"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="590"/>
+        <location filename="onmainwindow_part3.cpp" line="595"/>
         <source>wrong value for argument"--ldap1"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="609"/>
+        <location filename="onmainwindow_part3.cpp" line="614"/>
         <source>wrong value for argument"--ldap2"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="663"/>
+        <location filename="onmainwindow_part3.cpp" line="668"/>
         <source>wrong value for argument"--pack"</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="671"/>
-        <location filename="onmainwindow_part3.cpp" line="674"/>
+        <location filename="onmainwindow_part3.cpp" line="676"/>
+        <location filename="onmainwindow_part3.cpp" line="679"/>
         <source>wrong parameter: </source>
         <translation>wrong parameter: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="719"/>
-        <location filename="onmainwindow_part3.cpp" line="745"/>
+        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="750"/>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="724"/>
+        <location filename="onmainwindow_part3.cpp" line="729"/>
         <source>Available pack methodes:</source>
         <translation>Available pack methodes:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1511"/>
+        <location filename="onmainwindow_part3.cpp" line="1517"/>
         <source>Support</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1516"/>
+        <location filename="onmainwindow_part3.cpp" line="1522"/>
         <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
         <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
@@ -1583,7 +1634,7 @@ Public key hash: </source>
         <translation type="obsolete"></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Клиент сетевого окружения X2Go. Данный клиент предназначен для соединения с сервером (серверами) X2Go и запуска, восстановления или завершения удаленной сессии. Клиент X2Go сохраняет настройки соединений и может запрашивать информацию о пользователях из LDAP. В последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальной информации.</transl
 ation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1812"/>
+        <location filename="onmainwindow_part3.cpp" line="1818"/>
         <source>No valid card found</source>
         <translation>Формат карты неизвестен</translation>
     </message>
@@ -1592,19 +1643,19 @@ Public key hash: </source>
         <translation type="obsolete">Эта карта не сконфигурирована для использования с X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1888"/>
+        <location filename="onmainwindow_part3.cpp" line="1894"/>
         <source>Unable to create file: </source>
         <translation>Невозможно создать файл: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2053"/>
-        <location filename="onmainwindow_part3.cpp" line="2078"/>
+        <location filename="onmainwindow_part3.cpp" line="2059"/>
+        <location filename="onmainwindow_part3.cpp" line="2084"/>
         <source>Can't connect to X-Server</source>
         <translation>Невозможно присоединиться к X-серверу</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2054"/>
-        <location filename="onmainwindow_part3.cpp" line="2079"/>
+        <location filename="onmainwindow_part3.cpp" line="2060"/>
+        <location filename="onmainwindow_part3.cpp" line="2085"/>
         <source>Can't connect to X-Server
 Please check your settings</source>
         <translation>Невозможно присоединиться к X-серверу
@@ -1615,7 +1666,7 @@ Please check your settings</source>
         <translation type="obsolete">Невозможно запустить X-Сервер</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2087"/>
+        <location filename="onmainwindow_part3.cpp" line="2093"/>
         <source>Can't start X Server
 Please check your settings</source>
         <translation>Невозможно запустить X-Сервер
@@ -1634,42 +1685,42 @@ Please check your settings</source>
         <translation type="obsolete">Почтовый клиент</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="152"/>
+        <location filename="onmainwindow.cpp" line="156"/>
         <source>OpenOffice.org</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="153"/>
+        <location filename="onmainwindow.cpp" line="157"/>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="409"/>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1837"/>
+        <location filename="onmainwindow_part4.cpp" line="2071"/>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1839"/>
+        <location filename="onmainwindow_part4.cpp" line="2073"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
         <source>Desktop</source>
         <translation>Оконный менеджер</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
         <source>single application</source>
         <translation>приложение</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1030"/>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
         <source>shadow session</source>
         <translation>теневая сессия</translation>
     </message>
@@ -1678,196 +1729,201 @@ Please check your settings</source>
         <translation type="obsolete"><br>Ошибка настроек "sudo"</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2273"/>
+        <location filename="onmainwindow_part3.cpp" line="2279"/>
         <source>Unable to execute: </source>
         <translation>Невозможно выполнить: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="126"/>
+        <location filename="onmainwindow.cpp" line="130"/>
         <source>X2Go client</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="150"/>
+        <location filename="onmainwindow.cpp" line="154"/>
         <source>Internet browser</source>
         <translation>Веб-броузер</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="151"/>
+        <location filename="onmainwindow.cpp" line="155"/>
         <source>Email client</source>
         <translation>Почтовый клиент</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="658"/>
+        <location filename="onmainwindow.cpp" line="667"/>
         <source>&New session ...</source>
         <translation>&Новая сессия ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="673"/>
         <source>Session management...</source>
         <translation>Управление сессиями...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="692"/>
-        <location filename="onmainwindow.cpp" line="713"/>
+        <location filename="onmainwindow.cpp" line="711"/>
+        <location filename="onmainwindow.cpp" line="732"/>
         <source>Show toolbar</source>
         <translation>Панель инструментов</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="336"/>
-        <location filename="onmainwindow_part3.cpp" line="1536"/>
+        <location filename="onmainwindow.cpp" line="340"/>
+        <location filename="onmainwindow_part3.cpp" line="1542"/>
         <source>About X2GO client</source>
         <translation>О программе "X2GO Client"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1472"/>
-        <location filename="onmainwindow.cpp" line="1641"/>
-        <location filename="onmainwindow.cpp" line="1671"/>
+        <location filename="onmainwindow.cpp" line="1496"/>
+        <location filename="onmainwindow.cpp" line="1679"/>
+        <location filename="onmainwindow.cpp" line="1709"/>
         <source>Please check LDAP settings</source>
         <translation>Проверьте настройки LDAP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1506"/>
+        <location filename="onmainwindow.cpp" line="1531"/>
         <source>no X2Go server found in LDAP </source>
         <translation>Сервер X2Go не найден в LDAP </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2065"/>
+        <location filename="onmainwindow.cpp" line="2103"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Удалить сессию?</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="293"/>
-        <location filename="onmainwindow_part2.cpp" line="1289"/>
-        <location filename="onmainwindow_part2.cpp" line="1373"/>
+        <location filename="onmainwindow_part2.cpp" line="301"/>
+        <location filename="onmainwindow_part2.cpp" line="1297"/>
+        <location filename="onmainwindow_part2.cpp" line="1381"/>
         <location filename="onmainwindow_part3.cpp" line="199"/>
-        <location filename="onmainwindow_part3.cpp" line="764"/>
-        <location filename="onmainwindow_part3.cpp" line="844"/>
-        <location filename="onmainwindow_part3.cpp" line="1216"/>
-        <location filename="onmainwindow_part3.cpp" line="1269"/>
-        <location filename="onmainwindow_part3.cpp" line="2253"/>
+        <location filename="onmainwindow_part3.cpp" line="769"/>
+        <location filename="onmainwindow_part3.cpp" line="850"/>
+        <location filename="onmainwindow_part3.cpp" line="1222"/>
+        <location filename="onmainwindow_part3.cpp" line="1275"/>
+        <location filename="onmainwindow_part3.cpp" line="2259"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Неверный пароль!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="474"/>
+        <location filename="onmainwindow_part2.cpp" line="482"/>
         <source>No server availabel</source>
         <translation>Не доступен ни один сервер</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="923"/>
-        <location filename="onmainwindow_part2.cpp" line="2061"/>
+        <location filename="onmainwindow.cpp" line="941"/>
+        <location filename="onmainwindow_part2.cpp" line="2091"/>
         <source>Not connected</source>
         <oldsource>Active connection</oldsource>
         <translation>Соединение не установлено</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
-        <location filename="onmainwindow_part4.cpp" line="1844"/>
+        <location filename="onmainwindow_part2.cpp" line="2490"/>
+        <location filename="onmainwindow_part4.cpp" line="2078"/>
         <source>Creation time</source>
         <translation>Время создания</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1799"/>
-        <location filename="onmainwindow_part3.cpp" line="1090"/>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
+        <location filename="onmainwindow_part3.cpp" line="1096"/>
         <source>Unable to create folder:</source>
         <translation>Невозможно создать каталог:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1825"/>
+        <location filename="onmainwindow_part2.cpp" line="1854"/>
         <source>Unable to write file:</source>
         <translation>Невозможно записать файл:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1956"/>
-        <location filename="onmainwindow_part3.cpp" line="2324"/>
+        <location filename="onmainwindow_part2.cpp" line="1986"/>
+        <location filename="onmainwindow_part3.cpp" line="2330"/>
         <source>Unable to create SSL tunnel:
 </source>
         <translation>Ошибка создания SSL тунеля:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1600"/>
+        <location filename="onmainwindow_part4.cpp" line="1834"/>
         <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="476"/>
-        <location filename="onmainwindow.cpp" line="926"/>
-        <location filename="onmainwindow_part4.cpp" line="1610"/>
+        <location filename="onmainwindow.cpp" line="485"/>
+        <location filename="onmainwindow.cpp" line="944"/>
+        <location filename="onmainwindow_part4.cpp" line="1844"/>
         <source>Share folder...</source>
         <translation>Экспорт каталога...</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1612"/>
+        <location filename="onmainwindow_part4.cpp" line="1846"/>
         <source>Show details</source>
         <translation>Показать детали</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1537"/>
+        <location filename="onmainwindow_part3.cpp" line="1543"/>
         <source><b>X2Go client V. </source>
         <translation><b>X2Go Client V. </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1860"/>
+        <location filename="onmainwindow_part3.cpp" line="1866"/>
         <source>This card is unknown by X2Go system</source>
         <translation>Эта карта не сконфигурирована для использования с X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2289"/>
+        <location filename="onmainwindow_part3.cpp" line="2295"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
         <translation>Удаленный сервер не поддерживает экспорт файловой системы через SSH туннель
 Пожалуйста обновите пакет x2goserver</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="675"/>
+        <location filename="onmainwindow.cpp" line="684"/>
         <source>&Create session icon on desktop...</source>
         <translation>&Создать ярлык сессии на рабочем столе...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="684"/>
+        <location filename="onmainwindow.cpp" line="693"/>
         <source>&Set broker password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
+        <location filename="onmainwindow.cpp" line="704"/>
+        <source>&Connectivity test...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="820"/>
         <source>Operation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="811"/>
+        <location filename="onmainwindow.cpp" line="824"/>
         <source>Password changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="830"/>
+        <location filename="onmainwindow.cpp" line="848"/>
         <source>Wrong password!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="879"/>
+        <location filename="onmainwindow.cpp" line="897"/>
         <source><b>Authentication</b></source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="920"/>
+        <location filename="onmainwindow.cpp" line="938"/>
         <source>Restore</source>
         <translation>Восстановить</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="951"/>
+        <location filename="onmainwindow.cpp" line="969"/>
         <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="1805"/>
+        <location filename="onmainwindow.cpp" line="1843"/>
         <source>Create session icon on desktop</source>
         <translation>Создать ярлык сессии на рабочем столе</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1806"/>
+        <location filename="onmainwindow.cpp" line="1844"/>
         <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>
@@ -1876,44 +1932,44 @@ Use x2goclient hidden mode?</source>
 Активировать скрытый режим?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1817"/>
+        <location filename="onmainwindow.cpp" line="1855"/>
         <source>New Session</source>
         <translation>Новая сессия</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1917"/>
+        <location filename="onmainwindow.cpp" line="1955"/>
         <source>X2Go sessions not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2431"/>
+        <location filename="onmainwindow.cpp" line="2473"/>
         <source>RDP connection</source>
         <translation>RDP соединение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1867"/>
+        <location filename="onmainwindow.cpp" line="1905"/>
         <source>X2Go Link to session </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="488"/>
-        <location filename="onmainwindow_part4.cpp" line="1054"/>
+        <location filename="onmainwindow.cpp" line="497"/>
+        <location filename="onmainwindow_part4.cpp" line="1288"/>
         <source>Detach X2Go window</source>
         <translation>Отсоединить окно</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1930"/>
-        <location filename="onmainwindow_part4.cpp" line="1029"/>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part4.cpp" line="1263"/>
         <source>Attach X2Go window</source>
         <translation>Присоединить окно</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2133"/>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
         <source>Finished</source>
         <translation>завершена</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2377"/>
+        <location filename="onmainwindow_part2.cpp" line="2407"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
         <translation>Вы уверены, что хотите удалить эту сессию?
@@ -1924,7 +1980,7 @@ 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. Ð’ последнем случае клиент может использоваться как менеджер входа в систему (замена менеджера подобного xdm) для окружения "тонких клиентов" X2Go. Посетите http://x2go.org для получения более детальÐ
 ½Ð¾Ð¹ информации. </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="2101"/>
+        <location filename="onmainwindow_part3.cpp" line="2107"/>
         <location filename="onmainwindow_part4.cpp" line="422"/>
         <location filename="onmainwindow_part4.cpp" line="450"/>
         <source>Can't start X Server
@@ -1933,18 +1989,18 @@ Please check your installation</source>
 Переустановите X2Go Client</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1118"/>
+        <location filename="onmainwindow_part4.cpp" line="1352"/>
         <source>X2Go Session</source>
         <translation>Сессия X2Go</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="491"/>
-        <location filename="onmainwindow_part4.cpp" line="2064"/>
+        <location filename="onmainwindow.cpp" line="500"/>
+        <location filename="onmainwindow_part4.cpp" line="2298"/>
         <source>Minimize toolbar</source>
         <translation>Свернуть панель</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="2097"/>
+        <location filename="onmainwindow_part4.cpp" line="2331"/>
         <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>
@@ -1953,7 +2009,7 @@ Please check your installation</source>
         <translation type="obsolete">Невозможно открыть файл:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1981"/>
+        <location filename="onmainwindow_part4.cpp" line="2215"/>
         <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>
@@ -1962,65 +2018,65 @@ you can install sshd with
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2439"/>
+        <location filename="onmainwindow.cpp" line="2481"/>
         <source>Connection to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1063"/>
+        <location filename="onmainwindow_part2.cpp" line="1071"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1077"/>
-        <location filename="onmainwindow_part4.cpp" line="2165"/>
+        <location filename="onmainwindow_part2.cpp" line="1085"/>
+        <location filename="onmainwindow_part4.cpp" line="2399"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1084"/>
+        <location filename="onmainwindow_part2.cpp" line="1092"/>
         <source>Select desktop:</source>
         <translation>Выбрать десктоп:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1772"/>
+        <location filename="onmainwindow_part4.cpp" line="2006"/>
         <source>View only</source>
         <translation>Только смотреть</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1852"/>
+        <location filename="onmainwindow_part4.cpp" line="2086"/>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2435"/>
+        <location filename="onmainwindow.cpp" line="2477"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1064"/>
+        <location filename="onmainwindow_part2.cpp" line="1072"/>
         <source>No accessible desktop found</source>
         <translation>Доступный десктоп не найден</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1769"/>
+        <location filename="onmainwindow_part4.cpp" line="2003"/>
         <source>Full access</source>
         <translation>Полный доступ</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1883"/>
+        <location filename="onmainwindow_part4.cpp" line="2117"/>
         <source>Only my desktops</source>
         <translation>Только мои десктопы</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="484"/>
+        <location filename="onmainwindow.cpp" line="493"/>
         <source>Reconnect</source>
         <translation>Повторить соединение</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="834"/>
-        <location filename="onmainwindow.cpp" line="2354"/>
-        <location filename="onmainwindow_part4.cpp" line="2234"/>
+        <location filename="onmainwindow.cpp" line="852"/>
+        <location filename="onmainwindow.cpp" line="2393"/>
+        <location filename="onmainwindow_part4.cpp" line="2468"/>
         <source>Connecting to broker</source>
         <translation>Соединение с брокером</translation>
     </message>
@@ -2029,12 +2085,12 @@ 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_part3.cpp" line="1520"/>
+        <location filename="onmainwindow_part3.cpp" line="1526"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1524"/>
+        <location filename="onmainwindow_part3.cpp" line="1530"/>
         <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 authentification 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>
     </message>
@@ -2049,7 +2105,7 @@ you can install sshd with
         <translation>KOI8-R</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1300"/>
+        <location filename="onmainwindow_part4.cpp" line="1534"/>
         <source>wrong value for argument"speed"</source>
         <translation>wrong value for argument"speed"</translation>
     </message>
@@ -2283,103 +2339,112 @@ Example:
         <translation type="obsolete">Активировать звук</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="270"/>
+        <location filename="sessionbutton.cpp" line="272"/>
         <source>New Session</source>
         <translation>Новая сессия</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="383"/>
-        <location filename="sessionbutton.cpp" line="395"/>
-        <location filename="sessionbutton.cpp" line="635"/>
+        <location filename="sessionbutton.cpp" line="385"/>
+        <location filename="sessionbutton.cpp" line="402"/>
+        <location filename="sessionbutton.cpp" line="663"/>
         <source>fullscreen</source>
         <translation>Полноэкранная сессия</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="417"/>
-        <location filename="sessionbutton.cpp" line="547"/>
+        <location filename="sessionbutton.cpp" line="389"/>
+        <location filename="sessionbutton.cpp" line="412"/>
+        <location filename="sessionbutton.cpp" line="416"/>
+        <location filename="sessionbutton.cpp" line="669"/>
+        <location filename="sessionbutton.cpp" line="672"/>
+        <source>Display </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sessionbutton.cpp" line="445"/>
+        <location filename="sessionbutton.cpp" line="575"/>
         <source>Enabled</source>
         <translation>активирован</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="419"/>
-        <location filename="sessionbutton.cpp" line="549"/>
+        <location filename="sessionbutton.cpp" line="447"/>
+        <location filename="sessionbutton.cpp" line="577"/>
         <source>Disabled</source>
         <translation>деактивирован</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="390"/>
-        <location filename="sessionbutton.cpp" line="409"/>
+        <location filename="sessionbutton.cpp" line="397"/>
+        <location filename="sessionbutton.cpp" line="437"/>
         <source>window</source>
         <translation>окно</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="114"/>
+        <location filename="sessionbutton.cpp" line="116"/>
         <source>Session preferences...</source>
         <translation>Установки сессии...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="118"/>
+        <location filename="sessionbutton.cpp" line="120"/>
         <source>Create session icon on desktop...</source>
         <translation>Создать ярлык сессии на рабочем столе...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="123"/>
+        <location filename="sessionbutton.cpp" line="125"/>
         <source>Delete session</source>
         <translation>Удалить сессию</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="136"/>
+        <location filename="sessionbutton.cpp" line="138"/>
         <source>Session actions</source>
         <translation>Опции</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="137"/>
+        <location filename="sessionbutton.cpp" line="139"/>
         <source>Select type</source>
         <translation>Тип сессии</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="139"/>
+        <location filename="sessionbutton.cpp" line="141"/>
         <source>Select resolution</source>
         <translation>Выбрать разрешение</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="140"/>
+        <location filename="sessionbutton.cpp" line="142"/>
         <source>Toggle sound support</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="275"/>
+        <location filename="sessionbutton.cpp" line="277"/>
         <source>running</source>
         <translation type="unfinished">активна</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="279"/>
+        <location filename="sessionbutton.cpp" line="281"/>
         <source>suspended</source>
         <translation type="unfinished">прервана</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="312"/>
+        <location filename="sessionbutton.cpp" line="314"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="323"/>
-        <location filename="sessionbutton.cpp" line="355"/>
-        <location filename="sessionbutton.cpp" line="588"/>
+        <location filename="sessionbutton.cpp" line="325"/>
+        <location filename="sessionbutton.cpp" line="357"/>
+        <location filename="sessionbutton.cpp" line="616"/>
         <source>RDP connection</source>
         <translation>RDP соединение</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="325"/>
-        <location filename="sessionbutton.cpp" line="349"/>
-        <location filename="sessionbutton.cpp" line="582"/>
+        <location filename="sessionbutton.cpp" line="327"/>
+        <location filename="sessionbutton.cpp" line="351"/>
+        <location filename="sessionbutton.cpp" line="610"/>
         <source>Connection to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="324"/>
-        <location filename="sessionbutton.cpp" line="361"/>
-        <location filename="sessionbutton.cpp" line="594"/>
+        <location filename="sessionbutton.cpp" line="326"/>
+        <location filename="sessionbutton.cpp" line="363"/>
+        <location filename="sessionbutton.cpp" line="622"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
@@ -2482,109 +2547,114 @@ Example:
         <translation>Автоматическое соединение с SSH ключом по умолчанию или программой ssh-agent</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="111"/>
+        <location filename="sessionwidget.cpp" line="108"/>
+        <source>Kerberos 5 (GSSAPI) authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sessionwidget.cpp" line="113"/>
         <source>&Session type</source>
         <translation>&Тип сессии</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="116"/>
+        <location filename="sessionwidget.cpp" line="118"/>
         <source>Session type:</source>
         <translation>Тип сессии:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="125"/>
-        <location filename="sessionwidget.cpp" line="292"/>
+        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="296"/>
         <source>Connect to Windows terminal server</source>
         <translation>Соединение с терминальным сервером Windows</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="128"/>
+        <location filename="sessionwidget.cpp" line="130"/>
         <source>Custom desktop</source>
         <translation>Другой оконный менеджер</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="129"/>
+        <location filename="sessionwidget.cpp" line="131"/>
         <source>Single application</source>
         <translation>Приложение</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="131"/>
-        <location filename="sessionwidget.cpp" line="248"/>
+        <location filename="sessionwidget.cpp" line="133"/>
+        <location filename="sessionwidget.cpp" line="252"/>
         <source>Command:</source>
         <translation>Команда:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="132"/>
+        <location filename="sessionwidget.cpp" line="134"/>
         <source>Advanced options...</source>
         <translation>Продвинутые установки...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="143"/>
-        <location filename="sessionwidget.cpp" line="420"/>
-        <location filename="sessionwidget.cpp" line="482"/>
+        <location filename="sessionwidget.cpp" line="145"/>
+        <location filename="sessionwidget.cpp" line="429"/>
+        <location filename="sessionwidget.cpp" line="492"/>
         <source>Path to executable</source>
         <translation>Путь к исполняемому файлу</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="192"/>
+        <location filename="sessionwidget.cpp" line="196"/>
         <source>Open picture</source>
         <translation>Открыть изображение</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="194"/>
+        <location filename="sessionwidget.cpp" line="198"/>
         <source>Pictures</source>
         <translation>Изображения</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="215"/>
+        <location filename="sessionwidget.cpp" line="219"/>
         <source>Open key file</source>
         <translation>Открыть файл с ключом</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="217"/>
+        <location filename="sessionwidget.cpp" line="221"/>
         <source>All files</source>
         <translation>Все файлы</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="269"/>
-        <location filename="sessionwidget.cpp" line="384"/>
+        <location filename="sessionwidget.cpp" line="273"/>
+        <location filename="sessionwidget.cpp" line="391"/>
         <source>Server:</source>
         <translation>Сервер:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="293"/>
+        <location filename="sessionwidget.cpp" line="297"/>
         <source>rdesktop command line options:</source>
         <translation>Опции командной строки rdesktop:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="306"/>
-        <location filename="sessionwidget.cpp" line="404"/>
+        <location filename="sessionwidget.cpp" line="310"/>
+        <location filename="sessionwidget.cpp" line="411"/>
         <source>New session</source>
         <translation>Новая сессия</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="127"/>
+        <location filename="sessionwidget.cpp" line="129"/>
         <source>Connect to local desktop</source>
         <translation>Соединение с локальным десктопом</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="275"/>
-        <location filename="sessionwidget.cpp" line="392"/>
+        <location filename="sessionwidget.cpp" line="279"/>
+        <location filename="sessionwidget.cpp" line="399"/>
         <source>XDMCP server:</source>
         <translation>Сервер XDMCP:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="126"/>
+        <location filename="sessionwidget.cpp" line="128"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="227"/>
+        <location filename="sessionwidget.cpp" line="231"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="228"/>
+        <location filename="sessionwidget.cpp" line="232"/>
         <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>
     </message>
@@ -2592,112 +2662,132 @@ Example:
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="33"/>
-        <location filename="settingswidget.cpp" line="37"/>
+        <location filename="settingswidget.cpp" line="40"/>
+        <location filename="settingswidget.cpp" line="44"/>
         <source>&Display</source>
         <translation>&Дисплей</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="34"/>
-        <location filename="settingswidget.cpp" line="38"/>
+        <location filename="settingswidget.cpp" line="41"/>
+        <location filename="settingswidget.cpp" line="45"/>
         <source>&Keyboard</source>
         <translation>&Клавиатура</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="35"/>
-        <location filename="settingswidget.cpp" line="39"/>
+        <location filename="settingswidget.cpp" line="42"/>
+        <location filename="settingswidget.cpp" line="46"/>
         <source>Sound</source>
         <translation>Звук</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="50"/>
+        <location filename="settingswidget.cpp" line="57"/>
         <source>Fullscreen</source>
         <translation>Полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="52"/>
+        <location filename="settingswidget.cpp" line="59"/>
         <source>Custom</source>
         <translation>Другой</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="54"/>
+        <location filename="settingswidget.cpp" line="61"/>
         <source>Window</source>
         <translation>Окно</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="61"/>
+        <location filename="settingswidget.cpp" line="63"/>
+        <source>Use whole display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
         <translation>Установить DPI</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="79"/>
+        <location filename="settingswidget.cpp" line="76"/>
+        <source>Xinerama extension (support for two or more physical displays)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="92"/>
         <source>Width:</source>
         <translation>Ширина:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="82"/>
+        <location filename="settingswidget.cpp" line="95"/>
         <source>Height:</source>
         <translation>Высота:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="101"/>
+        <location filename="settingswidget.cpp" line="102"/>
+        <source>&Display:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="104"/>
+        <source>&Identify all displays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="142"/>
         <source>Keep current keyboard Settings</source>
         <translation>Использовать текущие установки</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
+        <location filename="settingswidget.cpp" line="152"/>
         <source>Keyboard layout:</source>
         <translation>Раскладка Клавиатуры:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="113"/>
+        <location filename="settingswidget.cpp" line="154"/>
         <source>Keyboard model:</source>
         <translation>Модель клавиатуры:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="124"/>
+        <location filename="settingswidget.cpp" line="165"/>
         <source>Enable sound support</source>
         <translation>Активировать звук</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="133"/>
+        <location filename="settingswidget.cpp" line="174"/>
         <source>Start sound daemon</source>
         <translation>Запускать звуковой сервер</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="135"/>
+        <location filename="settingswidget.cpp" line="176"/>
         <source>Use running sound daemon</source>
         <translation>Использовать запущенный звуковой сервер</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="137"/>
+        <location filename="settingswidget.cpp" line="178"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Использовать SSH туннель
 для звуковой системы</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="139"/>
+        <location filename="settingswidget.cpp" line="180"/>
         <source>Use default sound port</source>
         <translation>Использовать порт по умолчанию</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="146"/>
+        <location filename="settingswidget.cpp" line="187"/>
         <source>Sound port:</source>
         <translation>Порт:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="173"/>
+        <location filename="settingswidget.cpp" line="214"/>
         <source>Client side printing support</source>
         <translation>Печать на стороне клиента</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="440"/>
+        <location filename="settingswidget.cpp" line="554"/>
         <source>us</source>
         <translation>ru</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="441"/>
+        <location filename="settingswidget.cpp" line="555"/>
         <source>pc105/us</source>
         <translation>pc105/ru</translation>
     </message>
@@ -2786,82 +2876,82 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="100"/>
+        <location filename="sshmasterconnection.cpp" line="124"/>
         <source>Can not initialize libssh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="120"/>
+        <location filename="sshmasterconnection.cpp" line="144"/>
         <source>Can not create ssh session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="135"/>
+        <location filename="sshmasterconnection.cpp" line="159"/>
         <source>Can not connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="171"/>
+        <location filename="sshmasterconnection.cpp" line="200"/>
         <source>Authentication failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="216"/>
         <source>channel_forward_listen failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="498"/>
+        <location filename="sshmasterconnection.cpp" line="530"/>
         <source>Can not open file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="510"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not create remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="523"/>
+        <location filename="sshmasterconnection.cpp" line="555"/>
         <source>Can not write to remote file </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="573"/>
+        <location filename="sshmasterconnection.cpp" line="605"/>
         <source>can not connect to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="682"/>
+        <location filename="sshmasterconnection.cpp" line="714"/>
         <source>channel_open_forward failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_open_session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="708"/>
+        <location filename="sshmasterconnection.cpp" line="740"/>
         <source>channel_request_exec failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="773"/>
+        <location filename="sshmasterconnection.cpp" line="805"/>
         <source>error writing to socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="791"/>
+        <location filename="sshmasterconnection.cpp" line="823"/>
         <source>error reading channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="821"/>
+        <location filename="sshmasterconnection.cpp" line="853"/>
         <source>channel_write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="833"/>
+        <location filename="sshmasterconnection.cpp" line="865"/>
         <source>error reading tcp socket</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2869,12 +2959,12 @@ sound system connections through firewalls</source>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="92"/>
+        <location filename="sshprocess.cpp" line="97"/>
         <source>Error creating socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="110"/>
+        <location filename="sshprocess.cpp" line="115"/>
         <source>Error binding </source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/x2goclient_zh_tw.ts b/x2goclient_sv.ts
similarity index 67%
copy from x2goclient_zh_tw.ts
copy to x2goclient_sv.ts
index d5669c1..94fcf10 100644
--- a/x2goclient_zh_tw.ts
+++ b/x2goclient_sv.ts
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="zh_TW">
+<TS version="2.0" language="sv_SE">
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
         <location filename="brokerpassdialog.ui" line="14"/>
         <source>Dialog</source>
-        <translation>對話框</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="22"/>
         <source>Old password:</source>
-        <translation>舊密碼:</translation>
+        <translation>Gammalt lösenord:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="36"/>
         <source>New password:</source>
-        <translation>新密碼:</translation>
+        <translation>Nytt lösenord:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="50"/>
         <source>Confirm password:</source>
-        <translation>請再輸入一遍新密碼:</translation>
+        <translation>Bekräfta lösenord:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="79"/>
         <source>TextLabel</source>
-        <translation type="unfinished"></translation>
+        <translation>TextLabel</translation>
     </message>
 </context>
 <context>
@@ -34,7 +34,7 @@
     <message>
         <location filename="brokerpassdlg.cpp" line="41"/>
         <source>Passwords do not match</source>
-        <translation>密碼不相符</translation>
+        <translation>Lösenorden matchar inte</translation>
     </message>
 </context>
 <context>
@@ -42,67 +42,67 @@
     <message>
         <location filename="cupsprintwidget.ui" line="19"/>
         <source>Form</source>
-        <translation>表單</translation>
+        <translation>Formulär</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="25"/>
         <source>Name:</source>
-        <translation>姓名:</translation>
+        <translation>Namn:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="42"/>
         <source>Properties</source>
-        <translation>屬性</translation>
+        <translation>Inställningar</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="49"/>
         <source>State:</source>
-        <translation>狀態:</translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="63"/>
         <source>Accepting jobs:</source>
-        <translation>接收的工作:</translation>
+        <translation>Mottar jobb:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="77"/>
         <source>Type:</source>
-        <translation>類別:</translation>
+        <translation>Typ:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="91"/>
         <source>Location:</source>
-        <translation>位置:</translation>
+        <translation>Placering:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="105"/>
         <source>Comment:</source>
-        <translation>註解:</translation>
+        <translation>Kommentar:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.cpp" line="65"/>
         <source>Idle</source>
-        <translation>é–’ç½®</translation>
+        <translation>Vilande</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.cpp" line="68"/>
         <source>Printing</source>
-        <translation>正在列印</translation>
+        <translation>Skriver ut</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.cpp" line="71"/>
         <source>Stopped</source>
-        <translation>已停止</translation>
+        <translation>Stoppad</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.cpp" line="81"/>
         <source>Yes</source>
-        <translation>是</translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.cpp" line="81"/>
         <source>No</source>
-        <translation>否</translation>
+        <translation>Nej</translation>
     </message>
 </context>
 <context>
@@ -110,17 +110,17 @@
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="104"/>
         <source>No option selected</source>
-        <translation type="unfinished">尚未選取任何選項</translation>
+        <translation>Inget valt</translation>
     </message>
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="265"/>
         <source>This value is in conflict with other option</source>
-        <translation>此設定值與其它選項衝突</translation>
+        <translation>Detta värde är i konflikt med ett annat värde</translation>
     </message>
     <message>
         <location filename="cupsprintersettingsdialog.cpp" line="275"/>
         <source>Options conflict</source>
-        <translation>選項衝突</translation>
+        <translation>Värdekonflikt</translation>
     </message>
 </context>
 <context>
@@ -128,50 +128,51 @@
     <message>
         <location filename="contest.ui" line="14"/>
         <source>Connectivity test</source>
-        <translation>連線測式</translation>
+        <translation>Anslutningstest</translation>
     </message>
     <message>
         <location filename="contest.ui" line="24"/>
         <source>HTTPS connection:</source>
-        <translation>加密HTTP連線:</translation>
+        <translation>HTTPS-anslutning:</translation>
     </message>
     <message>
         <location filename="contest.ui" line="31"/>
         <source>SSH connection:</source>
-        <translation>SSH連線:</translation>
+        <translation>SSH-anslutning:</translation>
     </message>
     <message>
         <location filename="contest.ui" line="38"/>
         <source>Connection speed:</source>
-        <translation>連線速度:</translation>
+        <translation>Anslutningshastighet:</translation>
     </message>
     <message>
         <location filename="contest.ui" line="123"/>
         <location filename="contest.ui" line="167"/>
         <source>Failed</source>
-        <translation>失敗</translation>
+        <translation>Misslyckades</translation>
     </message>
     <message>
         <location filename="contest.ui" line="211"/>
         <source>0 Kb/s</source>
-        <translation>0 Kb/s</translation>
+        <translation>0 kB/s</translation>
     </message>
     <message>
         <location filename="contest.cpp" line="108"/>
         <location filename="contest.cpp" line="115"/>
         <source>OK</source>
-        <translation>確定</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="contest.cpp" line="150"/>
         <source>Socket operation timed out</source>
-        <translation>網路操作逾時</translation>
+        <translatorcomment>Hittade ingen bra översättning för socket</translatorcomment>
+        <translation>Socketoperation överskred tidsgräns</translation>
     </message>
     <message>
         <location filename="contest.cpp" line="162"/>
         <location filename="contest.cpp" line="168"/>
         <source>Failed: </source>
-        <translation>失敗:</translation>
+        <translation>Misslyckades: </translation>
     </message>
 </context>
 <context>
@@ -179,157 +180,157 @@
     <message>
         <location filename="configdialog.cpp" line="50"/>
         <source>General</source>
-        <translation>一般設定</translation>
+        <translation>Allmänna</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="59"/>
         <source>Display icon in system tray</source>
-        <translation>在系統狀態列中顯示圖示</translation>
+        <translation>Visa ikon i systemfältet</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="66"/>
         <source>Hide to system tray when minimized</source>
-        <translation>最小化時縮至系統狀態列</translation>
+        <translation>Dölj i systemfältet när minimerad</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="67"/>
         <source>Hide to system tray when closed</source>
-        <translation>關閉時隱藏至系統狀態列</translation>
+        <translation>Dölj i systemfältet när stängd</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="68"/>
         <source>Hide to system tray after connection is established</source>
-        <translation>連線建立後隱藏至系統狀態列</translation>
+        <translation>Dölj i systemfältet när anslutning har upprättats</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="69"/>
         <source>Restore from system tray after session is disconnected</source>
-        <translation>當工作階段斷線後從系統狀態列中還原</translation>
+        <translation>Återställ från systemfältet när session kopplats från</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="87"/>
         <source>Use LDAP</source>
-        <translation>使用LDAP</translation>
+        <translation>Använd LDAP</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="111"/>
         <source>Server URL:</source>
-        <translation type="unfinished">伺服器網址:</translation>
+        <translation>Server URL:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="112"/>
         <source>BaseDN:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bas DN:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="114"/>
         <source>Failover server 1 URL:</source>
-        <translation>備援伺服器網1 網址:</translation>
+        <translation>Redundant server 1 URL:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="116"/>
         <source>Failover server 2 URL:</source>
-        <translation>備援伺服器網2 網址:</translation>
+        <translation>Redundant server 2 URL:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="198"/>
         <location filename="configdialog.cpp" line="340"/>
         <source>X-Server settings</source>
-        <translation>X伺服器設定</translation>
+        <translation>X-server inställningar</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="207"/>
         <source>X11 application:</source>
-        <translation>X11應用程式:</translation>
+        <translation>X11-applikation:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="218"/>
         <source>X11 version:</source>
-        <translation>X11版本:</translation>
+        <translation>X11-version:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="233"/>
         <source>Find X11 application</source>
-        <translation>尋找X11應用程式</translation>
+        <translation>Hitta X11-applikation</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="250"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>檔案系統匯出時用戶端所使用的SSH連接埠:</translation>
+        <translation>SSH-port på klienten för export av filsystem:</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="260"/>
         <source>Start session embedded inside website</source>
-        <translation>將工作階段嵌入至網站內</translation>
+        <translation>Starta session inuti webbplats</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="264"/>
         <location filename="configdialog.cpp" line="567"/>
         <location filename="configdialog.cpp" line="579"/>
         <source>Advanced options</source>
-        <translation>進階選項</translation>
+        <translation>Avancerade alternativ</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="291"/>
         <source>Defaults</source>
-        <translation>預設</translation>
+        <translation>Standardinställningar</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="292"/>
         <source>&OK</source>
-        <translation>確定(&O)</translation>
+        <translation>&OK</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="293"/>
         <source>&Cancel</source>
-        <translation>取消(&C)</translation>
+        <translation>&Avbryt</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="316"/>
         <source>Settings</source>
-        <translation>設定</translation>
+        <translation>Inställningar</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="336"/>
         <source>Printing</source>
-        <translation>列印功能</translation>
+        <translation>Utskrifter</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="503"/>
         <location filename="configdialog.cpp" line="521"/>
         <location filename="configdialog.cpp" line="540"/>
         <source>Warning</source>
-        <translation>警告</translation>
+        <translation>Varning</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="504"/>
         <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>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="522"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
-        <translation>您正在使用X11(Apple X-Window 伺服器) 版本 </translation>
+        <translation>Du använder X11 (Apple X-Windows Server) version </translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="524"/>
         <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>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="541"/>
         <source>No suitable X11 application found in selected path</source>
-        <translation>在您選擇的路徑中沒有合適的X11應用程式</translation>
+        <translation>Ingen X11-applikation hittades i angiven sökväg</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="577"/>
         <source>&Connection</source>
-        <translation>連線(&C)</translation>
+        <translation>&Anslutning</translation>
     </message>
     <message>
         <location filename="configdialog.cpp" line="578"/>
         <source>&Settings</source>
-        <translation>設定(&S)</translation>
+        <translation>&Inställningar</translation>
     </message>
 </context>
 <context>
@@ -337,32 +338,32 @@
     <message>
         <location filename="connectionwidget.cpp" line="33"/>
         <source>&Connection speed</source>
-        <translation>連線速度(&C)</translation>
+        <translation>&Anslutningshastighet</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="38"/>
         <source>Connection speed:</source>
-        <translation>連線速度:</translation>
+        <translation>Anslutningshastighet:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="68"/>
         <source>C&ompression</source>
-        <translation>壓縮(&o)</translation>
+        <translation>K&omprimering</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="85"/>
         <source>Method:</source>
-        <translation>方式:</translation>
+        <translation>Metod:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="87"/>
         <source>Compression method:</source>
-        <translation>壓縮方式:</translation>
+        <translation>Komprimeringsmetod:</translation>
     </message>
     <message>
         <location filename="connectionwidget.cpp" line="89"/>
         <source>Image quality:</source>
-        <translation>影像品質:</translation>
+        <translation>Bildkvalitet:</translation>
     </message>
 </context>
 <context>
@@ -370,72 +371,72 @@
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="19"/>
         <source>Dialog</source>
-        <translation>對話框</translation>
+        <translation>Dialog</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="35"/>
         <source>General</source>
-        <translation>一般設定</translation>
+        <translation>Allmänt</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="45"/>
         <source>Page size:</source>
-        <translation>頁面尺寸:</translation>
+        <translation>Sidstorlek:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="62"/>
         <source>Paper type:</source>
-        <translation>紙張類型:</translation>
+        <translation>Papperstyp:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="72"/>
         <source>Paper source:</source>
-        <translation>紙張來源:</translation>
+        <translation>Papperskälla:</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="99"/>
         <source>Duplex Printing</source>
-        <translation>雙面列印</translation>
+        <translation>Dubbelsidig utskrift</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="105"/>
         <source>None</source>
-        <translation>ç„¡</translation>
+        <translation>Ingen</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="112"/>
         <source>Long side</source>
-        <translation>長邊翻轉</translation>
+        <translation>LÃ¥ngsida</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="119"/>
         <source>Short side</source>
-        <translation>短邊翻轉</translation>
+        <translation>Kortsida</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="143"/>
         <source>Driver settings</source>
-        <translation>驅動程式設定</translation>
+        <translation>Drivrutinsinställningar</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="175"/>
         <source>Option</source>
-        <translation>選項</translation>
+        <translation>Alternativ</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="180"/>
         <source>Value</source>
-        <translation>數值</translation>
+        <translation>Värde</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="186"/>
         <source>No option selected</source>
-        <translation>目前沒有選取任何選項</translation>
+        <translation>Inget alternativ valt</translation>
     </message>
     <message>
         <location filename="cupsprintsettingsdialog.ui" line="205"/>
         <source>text</source>
-        <translation>文字</translation>
+        <translation>text</translation>
     </message>
 </context>
 <context>
@@ -443,42 +444,42 @@
     <message>
         <location filename="editconnectiondialog.cpp" line="52"/>
         <source>&Session</source>
-        <translation>工作階段(&S)</translation>
+        <translation>&Session</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="53"/>
         <source>&Connection</source>
-        <translation>連線(&C)</translation>
+        <translation>&Anslutning</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="54"/>
         <source>&Settings</source>
-        <translation>設定(&S)</translation>
+        <translation>&Inställningar</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="55"/>
         <source>&Shared folders</source>
-        <translation>共享資料夾(&S)</translation>
+        <translation>&Delade mappar</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="57"/>
         <source>&OK</source>
-        <translation>確定(&O)</translation>
+        <translation>&OK</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="58"/>
         <source>&Cancel</source>
-        <translation>取消(&C)</translation>
+        <translation>&Avbryt</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="59"/>
         <source>Defaults</source>
-        <translation>預設值</translation>
+        <translation>Standardinställningar</translation>
     </message>
     <message>
         <location filename="editconnectiondialog.cpp" line="109"/>
         <source>Session preferences - </source>
-        <translation>工作階段偏好設定 - </translation>
+        <translation>Sessionspreferenser - </translation>
     </message>
 </context>
 <context>
@@ -486,38 +487,39 @@
     <message>
         <location filename="exportdialog.cpp" line="38"/>
         <source>&Cancel</source>
-        <translation>取消(&C)</translation>
+        <translation>&Avbryt</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="44"/>
         <source>&share</source>
-        <translation>分享(&s)</translation>
+        <translation>&Dela</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="45"/>
         <source>&Preferences ...</source>
-        <translation>偏好設定(&P) ...</translation>
+        <translatorcomment>Kanske skulle "Egna inställningar" vara bättre.</translatorcomment>
+        <translation>&Preferenser...</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="46"/>
         <source>&Custom folder ...</source>
-        <translation>自訂資料夾(&C) ...</translation>
+        <translation>&Anpassad mapp...</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="56"/>
         <source>Delete</source>
         <comment>Delete</comment>
-        <translation>刪除</translation>
+        <translation>Radera</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="73"/>
         <source>share folders</source>
-        <translation>共享資料夾</translation>
+        <translation>dela mappar</translation>
     </message>
     <message>
         <location filename="exportdialog.cpp" line="139"/>
         <source>Select folder</source>
-        <translation>選擇資料夾</translation>
+        <translation>Välj mapp</translation>
     </message>
 </context>
 <context>
@@ -525,121 +527,126 @@
     <message>
         <location filename="httpbrokerclient.cpp" line="178"/>
         <source>us</source>
-        <translation>us</translation>
+        <translatorcomment>Språkkod för svenska i X.org</translatorcomment>
+        <translation>se</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
-        <translation>pc105/us</translation>
+        <translatorcomment>Svenskt tangentbord</translatorcomment>
+        <translation>pc105/se</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="308"/>
         <location filename="httpbrokerclient.cpp" line="328"/>
         <location filename="httpbrokerclient.cpp" line="365"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Fel</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="329"/>
         <source>Login failed!<br>Please try again</source>
-        <translation>登入失敗! <br>請再試一次</translation>
+        <translation>Inloggning misslyckades!<br>Var god försök igen</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="366"/>
         <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>您的工作階段已中斷連線。請返回登入畫面或是在瀏覽器中重新載入頁面以重新連回之前的工作階段。</translation>
+        <translation>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="454"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
-        <translation><br><b>伺服使器使用了不合法的安全憑證</b><br><br></translation>
+        <translation><br><b>Servern använder ett ogiltigt certifikat.</b><br><br></translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="457"/>
         <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>
+        <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="462"/>
         <source>Secure connection failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Säker anslutning misslyckades</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="467"/>
         <source>Issued to:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Utgivet till:
+</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="468"/>
         <location filename="httpbrokerclient.cpp" line="480"/>
         <source>Common Name(CN)	</source>
-        <translation type="unfinished"></translation>
+        <translation>Common Name(CN)	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="471"/>
         <location filename="httpbrokerclient.cpp" line="483"/>
         <source>Organization(O)	</source>
-        <translation type="unfinished"></translation>
+        <translation>Organization(O)	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="474"/>
         <location filename="httpbrokerclient.cpp" line="486"/>
         <source>Organizational Unit(OU)	</source>
-        <translation type="unfinished"></translation>
+        <translation>Organizational Unit(OU)	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="477"/>
         <source>Serial Number	</source>
-        <translation type="unfinished"></translation>
+        <translation>Serienummer	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="479"/>
         <source>Issued by:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Utgivare:</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="490"/>
         <source>Validity:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Giltighetstid:
+</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="491"/>
         <source>Issued on	</source>
-        <translation type="unfinished"></translation>
+        <translation>Utgivningsdatum	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="492"/>
         <source>expires on	</source>
-        <translation type="unfinished"></translation>
+        <translation>giltigt till	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="493"/>
         <source>Fingerprints:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Fingeravtryck:
+</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="494"/>
         <source>SHA1	</source>
-        <translation type="unfinished"></translation>
+        <translation>SHA1	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="496"/>
         <source>MD5	</source>
-        <translation type="unfinished"></translation>
+        <translation>MD5	</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="502"/>
         <source>Exit X2Go Client</source>
-        <translation type="unfinished"></translation>
+        <translation>Avsluta X2Go-klienten</translation>
     </message>
     <message>
         <location filename="httpbrokerclient.cpp" line="504"/>
         <source>Add exception</source>
-        <translation type="unfinished"></translation>
+        <translation>Lägg till undantag</translation>
     </message>
 </context>
 <context>
@@ -648,75 +655,75 @@
         <location filename="onmainwindow.cpp" line="84"/>
         <location filename="onmainwindow_part3.cpp" line="312"/>
         <source>us</source>
-        <translation>us</translation>
+        <translation>se</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="85"/>
         <source>pc105/us</source>
-        <translation>pc105/us</translation>
+        <translation>pc105/se</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="130"/>
         <source>X2Go client</source>
-        <translation>X2Go用戶端</translation>
+        <translation>X2Go-klient</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="147"/>
-        <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2152"/>
+        <location filename="onmainwindow_part2.cpp" line="189"/>
+        <location filename="onmainwindow_part2.cpp" line="2178"/>
         <source>connecting</source>
-        <translation>正在連線</translation>
+        <translation>ansluter</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="154"/>
         <source>Internet browser</source>
-        <translation>網頁瀏覽器</translation>
+        <translation>Webbläsare</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="155"/>
         <source>Email client</source>
-        <translation>電子郵件軟體</translation>
+        <translation>E-postklient</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="156"/>
         <source>OpenOffice.org</source>
-        <translation type="unfinished"></translation>
+        <translation>OpenOffice.org</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="157"/>
         <source>Terminal</source>
-        <translation>終端機</translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="329"/>
         <source>&Settings ...</source>
-        <translation>設定(&S) ...</translation>
+        <translation>&Inställningar...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="333"/>
         <source>Support ...</source>
-        <translation>支援 ...</translation>
+        <translation>Hjälp ...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="340"/>
         <location filename="onmainwindow_part3.cpp" line="1542"/>
         <source>About X2GO client</source>
-        <translation>關於X2GO用戶端</translation>
+        <translation>Om X2Go-klient</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="485"/>
         <location filename="onmainwindow.cpp" line="944"/>
         <location filename="onmainwindow_part4.cpp" line="1844"/>
         <source>Share folder...</source>
-        <translation>共享資料夾...</translation>
+        <translation>Dela mapp ...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="488"/>
         <location filename="onmainwindow.cpp" line="945"/>
-        <location filename="onmainwindow_part2.cpp" line="2204"/>
+        <location filename="onmainwindow_part2.cpp" line="2230"/>
         <location filename="onmainwindow_part4.cpp" line="1995"/>
         <source>Suspend</source>
-        <translation>暫停</translation>
+        <translation>Vila</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="491"/>
@@ -724,114 +731,114 @@
         <location filename="onmainwindow_part4.cpp" line="1843"/>
         <location filename="onmainwindow_part4.cpp" line="1997"/>
         <source>Terminate</source>
-        <translation>終止</translation>
+        <translation>Avsluta</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="493"/>
         <source>Reconnect</source>
-        <translation>重新連線</translation>
+        <translation>Ã…teranslut</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="497"/>
         <location filename="onmainwindow_part4.cpp" line="1288"/>
         <source>Detach X2Go window</source>
-        <translation>脫離X2Go視窗</translation>
+        <translation>Koppla lös X2Go-fönster</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="500"/>
         <location filename="onmainwindow_part4.cpp" line="2298"/>
         <source>Minimize toolbar</source>
-        <translation>將工具列最小化</translation>
+        <translation>Minimera verktygsrad</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="610"/>
         <location filename="onmainwindow.cpp" line="1820"/>
         <location filename="onmainwindow_part3.cpp" line="1642"/>
         <source>Session:</source>
-        <translation>工作階段:</translation>
+        <translation>Session:</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
-        <translation>離開(&Q)</translation>
+        <translation>&Avsluta</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="664"/>
         <location filename="onmainwindow.cpp" line="958"/>
         <source>Quit</source>
-        <translation>離開</translation>
+        <translation>Avsluta</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="667"/>
         <source>&New session ...</source>
-        <translation>新增工作階段(&N) ...</translation>
+        <translation>&Ny session...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="668"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="673"/>
         <source>Session management...</source>
-        <translation>工作階段管理員...</translation>
+        <translation>S&essionshantering...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="674"/>
         <source>Ctrl+E</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="684"/>
         <source>&Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示(&C)...</translation>
+        <translation>S&kapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="693"/>
         <source>&Set broker password...</source>
-        <translation>設定代理伺服器密碼(&S)...</translation>
+        <translation>&Ange agentlösenord...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="704"/>
         <source>&Connectivity test...</source>
-        <translation>連線能力測試(&C)...</translation>
+        <translation>&Testa anslutning...</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="711"/>
         <location filename="onmainwindow.cpp" line="732"/>
         <source>Show toolbar</source>
-        <translation>顯示工具列</translation>
+        <translation>Visa verktygsrad</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
-        <translation>關於Qt</translation>
+        <translation>Om Qt</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="734"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
-        <translation>工作階段(&S)</translation>
+        <translation>&Session</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
-        <translation>選項(&O)</translation>
+        <translation>&Alternativ</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
-        <translation>幫助(&H)</translation>
+        <translation>&Hjälp</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="799"/>
@@ -839,7 +846,7 @@
         <location filename="onmainwindow_part3.cpp" line="1635"/>
         <location filename="onmainwindow_part4.cpp" line="1656"/>
         <source>Login:</source>
-        <translation>登入:</translation>
+        <translation>Användare:</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="820"/>
@@ -856,18 +863,18 @@
         <location filename="onmainwindow.cpp" line="2205"/>
         <location filename="onmainwindow.cpp" line="2239"/>
         <location filename="onmainwindow.cpp" line="2284"/>
-        <location filename="onmainwindow_part2.cpp" line="300"/>
-        <location filename="onmainwindow_part2.cpp" line="476"/>
-        <location filename="onmainwindow_part2.cpp" line="485"/>
-        <location filename="onmainwindow_part2.cpp" line="784"/>
-        <location filename="onmainwindow_part2.cpp" line="1235"/>
-        <location filename="onmainwindow_part2.cpp" line="1296"/>
-        <location filename="onmainwindow_part2.cpp" line="1347"/>
-        <location filename="onmainwindow_part2.cpp" line="1380"/>
-        <location filename="onmainwindow_part2.cpp" line="1424"/>
-        <location filename="onmainwindow_part2.cpp" line="1804"/>
+        <location filename="onmainwindow_part2.cpp" line="305"/>
+        <location filename="onmainwindow_part2.cpp" line="481"/>
+        <location filename="onmainwindow_part2.cpp" line="490"/>
+        <location filename="onmainwindow_part2.cpp" line="789"/>
+        <location filename="onmainwindow_part2.cpp" line="1240"/>
+        <location filename="onmainwindow_part2.cpp" line="1301"/>
+        <location filename="onmainwindow_part2.cpp" line="1352"/>
+        <location filename="onmainwindow_part2.cpp" line="1385"/>
+        <location filename="onmainwindow_part2.cpp" line="1429"/>
         <location filename="onmainwindow_part2.cpp" line="1830"/>
-        <location filename="onmainwindow_part2.cpp" line="1962"/>
+        <location filename="onmainwindow_part2.cpp" line="1856"/>
+        <location filename="onmainwindow_part2.cpp" line="1988"/>
         <location filename="onmainwindow_part3.cpp" line="202"/>
         <location filename="onmainwindow_part3.cpp" line="773"/>
         <location filename="onmainwindow_part3.cpp" line="854"/>
@@ -887,182 +894,182 @@
         <location filename="onmainwindow_part4.cpp" line="2214"/>
         <location filename="onmainwindow_part4.cpp" line="2485"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Fel</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="820"/>
         <source>Operation failed</source>
-        <translation>更改密碼失敗</translation>
+        <translation>Operation misslyckades</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="824"/>
         <source>Password changed</source>
-        <translation>密碼已更改成功</translation>
+        <translation>Lösenord ändrat</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="848"/>
         <source>Wrong password!</source>
-        <translation>輸入了錯誤的密碼!</translation>
+        <translation>Fel lösenord!</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="852"/>
         <location filename="onmainwindow.cpp" line="2393"/>
         <location filename="onmainwindow_part4.cpp" line="2468"/>
         <source>Connecting to broker</source>
-        <translation>連線至連線代理伺服器</translation>
+        <translation>Ansluter till agent</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="897"/>
         <source><b>Authentication</b></source>
-        <translation><b>身份驗證</b></translation>
+        <translation><b>Autentisering</b></translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="938"/>
         <source>Restore</source>
-        <translation>還原</translation>
+        <translation>Återställ</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="941"/>
-        <location filename="onmainwindow_part2.cpp" line="2065"/>
+        <location filename="onmainwindow_part2.cpp" line="2091"/>
         <source>Not connected</source>
-        <translation>尚未連線</translation>
+        <translation>Ej ansluten</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="969"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <translation>按滑鼠左鍵以隱藏或還原視窗, 右鍵顯示選單</translation>
+        <translation>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="1496"/>
         <location filename="onmainwindow.cpp" line="1679"/>
         <location filename="onmainwindow.cpp" line="1709"/>
         <source>Please check LDAP settings</source>
-        <translation>請確認LDAP的設定</translation>
+        <translation>Kontrollera LDAP-inställningar</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="1531"/>
         <source>no X2Go server found in LDAP </source>
-        <translation>在LDAP環境中沒有找到X2Go伺服器</translation>
+        <translation>ingen X2Go-server hittades i LDAP</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="1843"/>
         <source>Create session icon on desktop</source>
-        <translation>在桌面上建立工作階段圖示</translation>
+        <translation>Skapa sessionsgenväg på Skrivbordet</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="1844"/>
         <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>桌面圖示可以被設定為不顯示X2Go用戶端的模式(隱藏模式)。如果您想要使用隱藏模式,您必需要將登入方式設定成使用GPG金匙或是GPG IC智慧卡。
+        <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, GPG-smartkort eller SSH-nyckel.
 
-是否要使用X2Go用戶端的隱藏模式?</translation>
+Använd dolt läge?</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="1855"/>
         <source>New Session</source>
-        <translation>新的工作階段</translation>
+        <translation>Ny session</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="1905"/>
         <source>X2Go Link to session </source>
-        <translation>X2Go工作階段的連結</translation>
+        <translation>X2Go Länk till session</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="1955"/>
         <source>X2Go sessions not found</source>
-        <translation>無法找到X2Go的工作</translation>
+        <translation>X2Go-sessioner hittades inte</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="2103"/>
         <source>Are you sure you want to delete this session?</source>
-        <translation>您確定要刪除此工作階段嗎?</translation>
+        <translation>Är du säker på att du vill radera denna session?</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="2411"/>
         <location filename="onmainwindow_part3.cpp" line="68"/>
         <source>KDE</source>
-        <translation type="unfinished"></translation>
+        <translation>KDE</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="2473"/>
         <source>RDP connection</source>
-        <translation>RDP連線</translation>
+        <translation>RDP-anslutning</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="2477"/>
         <source>XDMCP</source>
-        <translation type="unfinished"></translation>
+        <translation>XDMCP</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="2481"/>
         <source>Connection to local desktop</source>
-        <translation>連線至本地桌面</translation>
+        <translation>Anslutning till lokalt Skrivbord</translation>
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="2485"/>
         <source> on </source>
-        <translation> æ–¼ </translation>
+        <translation> på </translation>
     </message>
     <message>
         <location filename="onmainwindow_part2.cpp" line="79"/>
         <source>Host key for server changed.
 It is now: </source>
-        <translation>主機的SSH密鑰已經更換。
-現在的密鑰為: </translation>
+        <translation>Nyckel för server har ändrats.
+Den är nu: </translation>
     </message>
     <message>
         <location filename="onmainwindow_part2.cpp" line="80"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation>由於安全性的考量,目前的連線已被中止</translation>
+        <translation>Anslutningen avbryts av säkerhetsskäl</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
+        <location filename="onmainwindow_part2.cpp" line="91"/>
         <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>Servern svarade inte med förväntad nyckeltyp. Det kan innebära att servern är komprommeterad</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="110"/>
+        <location filename="onmainwindow_part2.cpp" line="113"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
-        <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰,這個檔案將會自動被建立。</translation>
+        <translation>Hittar ej fil för kända servrar. Om du accepterar serverns nyckel så kommer filen att skapas automatiskt</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="115"/>
+        <location filename="onmainwindow_part2.cpp" line="118"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
-        <translation>此為未知的伺服器,您要選擇信任此主機密鑰嗎?
-此公開密鑰的雜湊值為:</translation>
+        <translation>Okänd server. Litar du på denna nyckel?
+Publik nyckel: </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="130"/>
         <source>Host key verification failed</source>
-        <translation>主機密鑰驗證任失敗</translation>
+        <translation>Verifiering av serverns nyckel misslyckades</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1169"/>
-        <location filename="onmainwindow_part2.cpp" line="1189"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1194"/>
         <source>Yes</source>
-        <translation>是</translation>
+        <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1170"/>
-        <location filename="onmainwindow_part2.cpp" line="1190"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1175"/>
+        <location filename="onmainwindow_part2.cpp" line="1195"/>
         <source>No</source>
-        <translation>否</translation>
+        <translation>Nej</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
-        <translation>認證失敗</translation>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
+        <source>Authentication failed</source>
+        <translation>Autentisering misslyckades</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="293"/>
-        <location filename="onmainwindow_part2.cpp" line="1289"/>
-        <location filename="onmainwindow_part2.cpp" line="1373"/>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="298"/>
+        <location filename="onmainwindow_part2.cpp" line="1294"/>
+        <location filename="onmainwindow_part2.cpp" line="1378"/>
+        <location filename="onmainwindow_part2.cpp" line="1411"/>
         <location filename="onmainwindow_part3.cpp" line="766"/>
         <location filename="onmainwindow_part3.cpp" line="847"/>
         <location filename="onmainwindow_part3.cpp" line="1219"/>
@@ -1070,13 +1077,13 @@ Public key hash: </source>
         <location filename="onmainwindow_part3.cpp" line="2256"/>
         <source><b>Connection failed</b>
 </source>
-        <translation><b>連線失敗</b>
+        <translation><b>Anslutning misslyckades</b>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="296"/>
-        <location filename="onmainwindow_part2.cpp" line="1292"/>
-        <location filename="onmainwindow_part2.cpp" line="1376"/>
+        <location filename="onmainwindow_part2.cpp" line="301"/>
+        <location filename="onmainwindow_part2.cpp" line="1297"/>
+        <location filename="onmainwindow_part2.cpp" line="1381"/>
         <location filename="onmainwindow_part3.cpp" line="199"/>
         <location filename="onmainwindow_part3.cpp" line="769"/>
         <location filename="onmainwindow_part3.cpp" line="850"/>
@@ -1084,352 +1091,354 @@ Public key hash: </source>
         <location filename="onmainwindow_part3.cpp" line="1275"/>
         <location filename="onmainwindow_part3.cpp" line="2259"/>
         <source><b>Wrong password!</b><br><br></source>
-        <translation><b>不正確的密碼!</b><br><br></translation>
+        <translation><b>Fel lösenord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="412"/>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
         <source>unknown</source>
-        <translation>未知</translation>
+        <translation>okänd</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="477"/>
+        <location filename="onmainwindow_part2.cpp" line="482"/>
         <source>No server availabel</source>
-        <translation>伺服器不存在l</translation>
+        <translation>Ingen server tillgänglig</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="486"/>
-        <location filename="onmainwindow_part2.cpp" line="785"/>
-        <location filename="onmainwindow_part2.cpp" line="1236"/>
-        <location filename="onmainwindow_part2.cpp" line="1348"/>
+        <location filename="onmainwindow_part2.cpp" line="491"/>
+        <location filename="onmainwindow_part2.cpp" line="790"/>
+        <location filename="onmainwindow_part2.cpp" line="1241"/>
+        <location filename="onmainwindow_part2.cpp" line="1353"/>
         <source>Server not availabel</source>
-        <translation>伺服器不存在|</translation>
+        <translation>Server ej tillgänglig</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1005"/>
+        <location filename="onmainwindow_part2.cpp" line="1010"/>
         <location filename="onmainwindow_part4.cpp" line="1986"/>
         <source>Select session:</source>
-        <translation>請選擇工作階段:</translation>
+        <translation>Välj session:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1021"/>
-        <location filename="onmainwindow_part2.cpp" line="1115"/>
-        <location filename="onmainwindow_part2.cpp" line="2168"/>
+        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1120"/>
+        <location filename="onmainwindow_part2.cpp" line="2194"/>
         <source>running</source>
-        <translation>正在執行中</translation>
+        <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1023"/>
-        <location filename="onmainwindow_part2.cpp" line="1308"/>
+        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1313"/>
         <source>suspended</source>
-        <translation>已暫停</translation>
+        <translation>vilande</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1029"/>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
         <source>Desktop</source>
-        <translation>桌面</translation>
+        <translation>Skrivbord</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1031"/>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
         <source>single application</source>
-        <translation>單一的應用程式</translation>
+        <translation>Applikation</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1033"/>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
         <source>shadow session</source>
-        <translation type="unfinished"></translation>
+        <translation>Skuggsession</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1066"/>
+        <location filename="onmainwindow_part2.cpp" line="1071"/>
         <source>Information</source>
-        <translation>資訊</translation>
+        <translation>Information</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1067"/>
+        <location filename="onmainwindow_part2.cpp" line="1072"/>
         <source>No accessible desktop found</source>
-        <translation>目前沒有找到可訪問的工作桌面</translation>
+        <translation>Inget tillgängligt Skrivbord hittades</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1080"/>
+        <location filename="onmainwindow_part2.cpp" line="1085"/>
         <location filename="onmainwindow_part4.cpp" line="2399"/>
         <source>Filter</source>
-        <translation>篩選器</translation>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1087"/>
+        <location filename="onmainwindow_part2.cpp" line="1092"/>
         <source>Select desktop:</source>
-        <translation>請選擇工作桌面:</translation>
+        <translation>Välj Skrivbord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1156"/>
-        <location filename="onmainwindow_part2.cpp" line="1176"/>
-        <location filename="onmainwindow_part2.cpp" line="1991"/>
-        <location filename="onmainwindow_part2.cpp" line="2380"/>
+        <location filename="onmainwindow_part2.cpp" line="1161"/>
+        <location filename="onmainwindow_part2.cpp" line="1181"/>
+        <location filename="onmainwindow_part2.cpp" line="2017"/>
+        <location filename="onmainwindow_part2.cpp" line="2406"/>
         <source>Warning</source>
-        <translation>警告</translation>
+        <translation>Varning</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1157"/>
-        <location filename="onmainwindow_part2.cpp" line="1177"/>
+        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1182"/>
         <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>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_part2.cpp" line="1165"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
         <source>24 or 32</source>
-        <translation>24或32</translation>
+        <translation>24- eller 32-</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1166"/>
-        <location filename="onmainwindow_part2.cpp" line="1186"/>
+        <location filename="onmainwindow_part2.cpp" line="1171"/>
+        <location filename="onmainwindow_part2.cpp" line="1191"/>
         <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>bitar och startar om X-servern innan du återansluter till denna X2Go-session.<br>Återanslut session ändå?</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1253"/>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
         <source>suspending</source>
-        <translation>正在暫停工作中</translation>
+        <translation>försätter i vila</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1275"/>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
         <source>terminating</source>
-        <translation>正在中止工作中</translation>
+        <translation>avslutar</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1409"/>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
         <source><b>Wrong Password!</b><br><br></source>
-        <translation><b>不正確的密碼!</b><br><br></translation>
+        <translation><b>Fel lösenord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1802"/>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
         <location filename="onmainwindow_part3.cpp" line="1096"/>
         <source>Unable to create folder:</source>
-        <translation>無法創建資料夾:</translation>
+        <translation>Kunde inte skapa mapp:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1828"/>
+        <location filename="onmainwindow_part2.cpp" line="1854"/>
         <source>Unable to write file:</source>
-        <translation>檔案無法寫入:</translation>
+        <translation>Kunde ej skriva till fil:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1934"/>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
         <location filename="onmainwindow_part4.cpp" line="1263"/>
         <source>Attach X2Go window</source>
-        <translation>連接X2Go視窗</translation>
+        <translation>Koppla X2Go-fönster</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part2.cpp" line="1986"/>
         <location filename="onmainwindow_part3.cpp" line="2330"/>
         <source>Unable to create SSL tunnel:
 </source>
-        <translation>無法建立SSL通道:</translation>
+        <translation>Kunde ej skapa SSL-tunnel:
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1989"/>
+        <location filename="onmainwindow_part2.cpp" line="2015"/>
         <source>Unable to create SSL Tunnel:
 </source>
-        <translation>無法建立SSL通道:
+        <translation>Kunde ej skapa SSL-tunnel:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2137"/>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
         <source>Finished</source>
-        <translation>已完成</translation>
+        <translation>avslutad</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2160"/>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
         <source>starting</source>
-        <translation>正在開始</translation>
+        <translation>startar</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2162"/>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
         <source>resuming</source>
-        <translation>正在還原</translation>
+        <translation>Ã¥teransluter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2224"/>
-        <location filename="onmainwindow_part2.cpp" line="2492"/>
-        <location filename="onmainwindow_part2.cpp" line="2510"/>
+        <location filename="onmainwindow_part2.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="2518"/>
+        <location filename="onmainwindow_part2.cpp" line="2536"/>
         <source>Connection timeout, aborting</source>
-        <translation>連線超時,中止中</translation>
+        <translation>Anslutning passerade tidsgränsen, avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2225"/>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
         <source>aborting</source>
-        <translation>中止中</translation>
+        <translation>avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2381"/>
+        <location filename="onmainwindow_part2.cpp" line="2407"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
-        <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation>
+        <translation>Är du säker på att du vill avsluta sessionen?
+Data som ej sparats kommer att förloras</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
         <source>Session</source>
-        <translation>工作階段</translation>
+        <translation>Session</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2462"/>
+        <location filename="onmainwindow_part2.cpp" line="2488"/>
         <location filename="onmainwindow_part4.cpp" line="2067"/>
         <location filename="onmainwindow_part4.cpp" line="2089"/>
         <source>Display</source>
-        <translation>顯示</translation>
+        <translation>Display</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2464"/>
+        <location filename="onmainwindow_part2.cpp" line="2490"/>
         <location filename="onmainwindow_part4.cpp" line="2078"/>
         <source>Creation time</source>
-        <translation>創建時間</translation>
+        <translation>Skapad</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="196"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>連線失敗</b>
+        <translation><b>Anslutning misslyckades</b>
 :
 </translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="409"/>
         <source> (can't open file)</source>
-        <translation> (無法開啟檔案)</translation>
+        <translation> (kan inte öppna fil)</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="420"/>
         <location filename="onmainwindow_part3.cpp" line="430"/>
         <location filename="onmainwindow_part3.cpp" line="440"/>
         <source> (file not exists)</source>
-        <translation> (檔案不存在)</translation>
+        <translation> (filen finns inte)</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="464"/>
         <source> (directory not exists)</source>
-        <translation> (目錄不存在)</translation>
+        <translation> (mapp finns inte)</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="492"/>
         <source>wrong value for argument"--link"</source>
-        <translation>"--link"參數的值錯誤</translation>
+        <translation>fel värde för "--link"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="510"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>"--sound"參數的值錯誤</translation>
+        <translation>fel värde för "--sound"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="527"/>
         <location filename="onmainwindow_part3.cpp" line="538"/>
         <source>wrong value for argument"--geometry"</source>
-        <translation>"--geometry"參數的值錯誤</translation>
+        <translation>fel värde för "--geometry"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="556"/>
         <source>wrong value for argument"--set-kbd"</source>
-        <translation>"--set-kbd"參數的值錯誤</translation>
+        <translation>fel värde för "--set-kbd"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="573"/>
         <source>wrong value for argument"--ldap"</source>
-        <translation>"--ldap"參數的值錯誤</translation>
+        <translation>fel värde för "--ldap"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="595"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>"--ldap1"參數的值錯誤</translation>
+        <translation>fel värde för "--ldap1"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="614"/>
         <source>wrong value for argument"--ldap2"</source>
-        <translation>"--ldap2"參數的值錯誤</translation>
+        <translation>fel värde för "--ldap2"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="668"/>
         <source>wrong value for argument"--pack"</source>
-        <translation>"--pack"參數的值錯誤</translation>
+        <translation>fel värde för "--pack"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="676"/>
         <location filename="onmainwindow_part3.cpp" line="679"/>
         <source>wrong parameter: </source>
-        <translation>錯誤的參數:</translation>
+        <translation>felaktig parameter:</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="724"/>
         <location filename="onmainwindow_part3.cpp" line="750"/>
         <source>Options</source>
-        <translation>選項</translation>
+        <translation>Alternativ</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="729"/>
         <source>Available pack methodes:</source>
-        <translation>可用的包裝方法:</translation>
+        <translation>Tillgängliga kompressionsmetoder:</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="1517"/>
         <source>Support</source>
-        <translation>支援</translation>
+        <translation>Hjälp</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="1522"/>
         <source></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
-        <translation type="unfinished"></translation>
+        <translation></b><br> (C. 2006-2011 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="1526"/>
         <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>
+        <translation><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_part3.cpp" line="1530"/>
         <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 authentification 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><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_part3.cpp" line="1543"/>
         <source><b>X2Go client V. </source>
-        <translation><b>X2Go 客戶端 V. </translation>
+        <translation><b>X2Go-klient V. </translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="1588"/>
         <source>Please check LDAP Settings</source>
-        <translation>請檢查LDAP的設定</translation>
+        <translation>Kontrollera LDAP-inställningar</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="1818"/>
         <source>No valid card found</source>
-        <translation>沒有發現合法的卡片</translation>
+        <translation>Inget giltigt kort hittades</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="1866"/>
         <source>This card is unknown by X2Go system</source>
-        <translation>X2Go系統無法辨識此張卡片</translation>
+        <translation>Kortet är okänt</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="1894"/>
         <source>Unable to create file: </source>
-        <translation>檔案無法創建:</translation>
+        <translation>Kunde ej skapa filen: </translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="2059"/>
         <location filename="onmainwindow_part3.cpp" line="2084"/>
         <source>Can't connect to X-Server</source>
-        <translation>無法連接至X伺服器</translation>
+        <translation>Kan ej ansluta till X-server</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="2060"/>
         <location filename="onmainwindow_part3.cpp" line="2085"/>
         <source>Can't connect to X-Server
 Please check your settings</source>
-        <translation>無法連接至X伺服器
-請檢查您的設定值</translation>
+        <translation>Kan ej ansluta till X-server
+Kontrollera dina inställningar</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="2093"/>
         <source>Can't start X Server
 Please check your settings</source>
-        <translation>無法啟動X伺服器
-請檢查您的設定值</translation>
+        <translation>Kan ej starta X-server
+Kontrollera dina inställningar</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="2107"/>
@@ -1437,174 +1446,176 @@ Please check your settings</source>
         <location filename="onmainwindow_part4.cpp" line="450"/>
         <source>Can't start X Server
 Please check your installation</source>
-        <translation>無法啟動X伺服器
-請檢查X伺服器安是否有安裝正確</translation>
+        <translation>Kan ej starta X-server
+Kontrollera installation</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="2279"/>
         <source>Unable to execute: </source>
-        <translation>無法執行:</translation>
+        <translation>Kunde ej exekvera: </translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="2295"/>
         <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>Servern stöder ej filsystemsexport via SSH-tunnel
+Uppdatera till en nyare version av x2goserver</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="28"/>
         <source>Unable to read :
 </source>
-        <translation>無法讀取:
+        <translation>Kunde ej läsa :
 </translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="53"/>
         <source>Unable to write :
 </source>
-        <translation>無法寫入:
+        <translation>Kunde ej skriva till :
 </translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="141"/>
         <source>WINDOWS-1252</source>
-        <translation type="unfinished"></translation>
+        <translation>WINDOWS-1252</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="153"/>
         <source>ISO8859-1</source>
-        <translation type="unfinished"></translation>
+        <translation>ISO8859-1</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1352"/>
         <source>X2Go Session</source>
-        <translation>X2Go工作階段</translation>
+        <translation>X2Go-session</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1534"/>
         <source>wrong value for argument"speed"</source>
-        <translation>錯誤的"speed"參數值</translation>
+        <translation>fel värde för "speed"</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1657"/>
         <source>Password:</source>
-        <translation>密碼:</translation>
+        <translation>Lösenord:</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1658"/>
         <source>Keyboard layout:</source>
-        <translation>鑑盤佈局:</translation>
+        <translatorcomment>Verkar vara vanligt förekommande "svengelskt" ord</translatorcomment>
+        <translation>Tangentbordslayout:</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1699"/>
         <source>Ok</source>
-        <translation>確定</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1701"/>
         <location filename="onmainwindow_part4.cpp" line="1990"/>
         <location filename="onmainwindow_part4.cpp" line="1992"/>
         <source>Cancel</source>
-        <translation>取消</translation>
+        <translation>Avbryt</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1834"/>
         <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>
+        <translation><b>Sessions-ID:<br>Server:<br>Användare:<br>Display:<br>Skapad:<br>Status:</b></translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1842"/>
         <source>Abort</source>
-        <translation>退出</translation>
+        <translation>Avbryt</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1846"/>
         <source>Show details</source>
-        <translation>顯示細節</translation>
+        <translation>Visa detaljer</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="1988"/>
         <source>Resume</source>
-        <translation>恢復</translation>
+        <translation>Ã…teranslut</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2000"/>
         <source>New</source>
-        <translation>新增</translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2003"/>
         <source>Full access</source>
-        <translation>完全存取</translation>
+        <translation>Fullständig åtkomst</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2006"/>
         <source>View only</source>
-        <translation>僅查看</translation>
+        <translation>Endast visa</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2069"/>
         <source>Status</source>
-        <translation>狀態</translation>
+        <translation>Status</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2071"/>
         <source>Command</source>
-        <translation>指令</translation>
+        <translation>Kommando</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2073"/>
         <source>Type</source>
-        <translation>åž‹æ…‹</translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2075"/>
         <source>Server</source>
-        <translation>伺服器</translation>
+        <translation>Server</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2080"/>
         <source>Client IP</source>
-        <translation>客戶端IP</translation>
+        <translation>Klient-IP</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2082"/>
         <source>Session ID</source>
-        <translation>工作階段識別碼</translation>
+        <translation>Sessions-ID</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2086"/>
         <source>User</source>
-        <translation>使用者</translation>
+        <translation>Användare</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2117"/>
         <source>Only my desktops</source>
-        <translation>只選擇我的桌面</translation>
+        <translation>Bara mina Skrivbord</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2215"/>
         <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>SSH伺服器沒有執行起來,遠端列印與檔案共享功能需要先安裝SSH伺服器
-您可以使用下列指令來安裝SSH伺服器:
+        <translation>sshd ej startad, du behöver sshd för utskrifter och fildelning
+du kan installera sshd med (Debian/Ubuntu)
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2286"/>
         <source>Restore toolbar</source>
-        <translation>還原工具列</translation>
+        <translation>Återställ verktygsrad</translation>
     </message>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2331"/>
         <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>
+        <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>
     <message>
         <location filename="onmainwindow_part4.cpp" line="2486"/>
         <source>Invalid reply from broker</source>
-        <translation>代理伺服器的回應不合法</translation>
+        <translation>Ogiltigt svar från agent</translation>
     </message>
 </context>
 <context>
@@ -1612,22 +1623,22 @@ you can install sshd with
     <message>
         <location filename="printdialog.ui" line="16"/>
         <source>Print - X2Go client</source>
-        <translation>列印 - X2Go用戶端</translation>
+        <translation>Utskrift - X2Go-klient</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="25"/>
         <source>Print</source>
-        <translation>列印</translation>
+        <translation>Utskrift</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="54"/>
         <source>You've deactivated the x2go client printing dialog.</source>
-        <translation>您已經停用X2Go用戶端的列印對話框</translation>
+        <translation>Du har inaktiverat utskriftsdialogen i X2Go.</translation>
     </message>
     <message>
         <location filename="printdialog.cpp" line="56"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translation>您可能需要於X2Go用戶端的設定對話框中(選單 -> 選項 -> 設定)重新啟用這個對話框</translation>
+        <translation>Du kan återaktivera denna dialog via X2Go-klientens inställningar (Meny -> Alternativ -> Inställningar)</translation>
     </message>
 </context>
 <context>
@@ -1635,25 +1646,26 @@ you can install sshd with
     <message>
         <location filename="printprocess.cpp" line="155"/>
         <source>Save File</source>
-        <translation>儲存檔案</translation>
+        <translation>Spara fil</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="157"/>
         <source>PDF Document (*.pdf)</source>
-        <translation>PDF文件 (*.pdf)</translation>
+        <translation>PDF-dokument (*.pdf)</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="251"/>
         <location filename="printprocess.cpp" line="274"/>
         <source>Failed to execute command:
 </source>
-        <translation>執行命令失敗:</translation>
+        <translation>Kunde ej exekverka kommando:
+</translation>
     </message>
     <message>
         <location filename="printprocess.cpp" line="266"/>
         <location filename="printprocess.cpp" line="273"/>
         <source>Printing error</source>
-        <translation>列印錯誤</translation>
+        <translation>Utskriftsfel</translation>
     </message>
 </context>
 <context>
@@ -1661,73 +1673,74 @@ you can install sshd with
     <message>
         <location filename="printwidget.ui" line="13"/>
         <source>Form</source>
-        <translation>表單</translation>
+        <translation>Formulär</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="23"/>
         <source>Print</source>
-        <translation>列印</translation>
+        <translation>Skriv ut</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="33"/>
         <source>View as PDF</source>
-        <translation>以PDF格式查看</translation>
+        <translation>Visa som PDF</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="63"/>
         <source>Print settings</source>
-        <translation>列印設定</translation>
+        <translation>Utskriftsinställningar</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="69"/>
         <source>Printer:</source>
-        <translation>印表機:</translation>
+        <translation>Skrivare:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="79"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
-        <translation>以預設的Windows PDF閱讀器列印(必需要安裝閱讀器)</translation>
+        <translation>Skriv ut via Windows standard PDF-visare
+(PDF-visare måste installeras)</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="94"/>
         <source>Printer command:</source>
-        <translation>印表機指令:</translation>
+        <translation>Utskriftskommando:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="116"/>
         <source>...</source>
-        <translation></translation>
+        <translation>...</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="147"/>
         <source>Viewer settings</source>
-        <translation>閱讀器設定</translation>
+        <translation>Inställningar för visning</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="153"/>
         <source>Open in viewer application</source>
-        <translation>在閱讀器程式裡開啟</translation>
+        <translation>Öppna i applikation</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="165"/>
         <source>Command:</source>
-        <translation>指令:</translation>
+        <translation>Kommando:</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="177"/>
         <source>Save to disk</source>
-        <translation>儲存到磁碟裡</translation>
+        <translation>Spara till disk</translation>
     </message>
     <message>
         <location filename="printwidget.ui" line="207"/>
         <source>Show this dialog before start printing</source>
-        <translation>開始列印前先顯示此對話框</translation>
+        <translation>Visa denna dialog innan utskrift</translation>
     </message>
     <message>
         <location filename="printwidget.cpp" line="53"/>
         <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>請設定您的客戶端列印設定<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>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>
     </message>
 </context>
 <context>
@@ -1735,12 +1748,12 @@ you can install sshd with
     <message>
         <location filename="printercmddialog.ui" line="13"/>
         <source>Printer command</source>
-        <translation>印表機指令</translation>
+        <translation>Utskriftskommando</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="19"/>
         <source>Command</source>
-        <translation>指令</translation>
+        <translation>Kommando</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="25"/>
@@ -1748,64 +1761,62 @@ you can install sshd with
 Examples:
 kprinter
 lpr -P hp_laserjet</source>
-        <translation>請輸入您自定的列印指令。
-例如:
+        <translation>Ange anpassat utskriftskommando, exempel:
 kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="44"/>
         <source>Output format</source>
-        <translation>輸出格式</translation>
+        <translation>Utskriftsformat</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="50"/>
         <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>
+        <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="66"/>
         <source>PDF</source>
-        <translation></translation>
+        <translation>PDF</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="73"/>
         <source>PS</source>
-        <translation></translation>
+        <translation>PS</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="86"/>
         <source>Data structure</source>
-        <translation>數據結構</translation>
+        <translation>Datastruktur</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="92"/>
         <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>
+        <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="108"/>
         <source>standard input (STDIN)</source>
-        <translation>標準輸入 (STDIN)</translation>
+        <translation>Indata (STDIN)</translation>
     </message>
     <message>
         <location filename="printercmddialog.ui" line="115"/>
         <source>Specify path as program parameter</source>
-        <translation>指定一個路徑做為程式的參數</translation>
+        <translation>Ange sökväg som programparameter</translation>
     </message>
     <message>
         <location filename="printercmddialog.cpp" line="37"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
-        <translation>請輸入您自定的列印指令
-範例:
+        <translation>Ange anpassat utskriftskommando, exempel:
 </translation>
     </message>
     <message>
         <location filename="printercmddialog.cpp" line="45"/>
         <source><Path to gsprint.exe> -query -color</source>
-        <translation><Path to gsprint.exe> -query -color</translation>
+        <translation><Sökväg till gsprint.exe> -query -color</translation>
     </message>
 </context>
 <context>
@@ -1813,85 +1824,85 @@ Example:
     <message>
         <location filename="sessionbutton.cpp" line="116"/>
         <source>Session preferences...</source>
-        <translation>工作階段偏好設定...</translation>
+        <translation>Sessionspreferenser...</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="120"/>
         <source>Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示</translation>
+        <translation>Skapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="125"/>
         <source>Delete session</source>
-        <translation>刪除工作階段</translation>
+        <translation>Radera session</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="138"/>
         <source>Session actions</source>
-        <translation>工作階段動作</translation>
+        <translation>Sessionshantering</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="139"/>
         <source>Select type</source>
-        <translation>選擇類型</translation>
+        <translation>Välj typ</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="141"/>
         <source>Select resolution</source>
-        <translation>選擇解析度</translation>
+        <translation>Välj upplösning</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="142"/>
         <source>Toggle sound support</source>
-        <translation>切換聲音支援</translation>
+        <translation>Växla ljudstöd</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="272"/>
         <source>New Session</source>
-        <translation>新工作階段</translation>
+        <translation>Ny session</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="277"/>
         <source>running</source>
-        <translation>執行中</translation>
+        <translation>aktiv</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="281"/>
         <source>suspended</source>
-        <translation>已暫停</translation>
+        <translation>vilande</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="314"/>
         <source>KDE</source>
-        <translation type="unfinished"></translation>
+        <translation>KDE</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="325"/>
         <location filename="sessionbutton.cpp" line="357"/>
         <location filename="sessionbutton.cpp" line="616"/>
         <source>RDP connection</source>
-        <translation>RDP連線</translation>
+        <translation>RDP-anslutning</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="326"/>
         <location filename="sessionbutton.cpp" line="363"/>
         <location filename="sessionbutton.cpp" line="622"/>
         <source>XDMCP</source>
-        <translation type="unfinished"></translation>
+        <translation>XDMCP</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="327"/>
         <location filename="sessionbutton.cpp" line="351"/>
         <location filename="sessionbutton.cpp" line="610"/>
         <source>Connection to local desktop</source>
-        <translation>連線至本地桌面</translation>
+        <translation>Anslutning till lokalt Skrivbord</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="385"/>
         <location filename="sessionbutton.cpp" line="402"/>
         <location filename="sessionbutton.cpp" line="663"/>
         <source>fullscreen</source>
-        <translation>全螢幕</translation>
+        <translation>fullskärm</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="389"/>
@@ -1900,25 +1911,25 @@ Example:
         <location filename="sessionbutton.cpp" line="669"/>
         <location filename="sessionbutton.cpp" line="672"/>
         <source>Display </source>
-        <translation>顯示</translation>
+        <translation>Display </translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="397"/>
         <location filename="sessionbutton.cpp" line="437"/>
         <source>window</source>
-        <translation>視窗</translation>
+        <translation>fönster</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="445"/>
         <location filename="sessionbutton.cpp" line="575"/>
         <source>Enabled</source>
-        <translation>啟用</translation>
+        <translation>PÃ¥</translation>
     </message>
     <message>
         <location filename="sessionbutton.cpp" line="447"/>
         <location filename="sessionbutton.cpp" line="577"/>
         <source>Disabled</source>
-        <translation>停用</translation>
+        <translation>Av</translation>
     </message>
 </context>
 <context>
@@ -1926,38 +1937,38 @@ Example:
     <message>
         <location filename="sessionmanagedialog.cpp" line="35"/>
         <source>E&xit</source>
-        <translation>離開(&x)</translation>
+        <translation>&Avsluta</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="41"/>
         <source>&New session</source>
-        <translation>建立新的工作階段(&N)</translation>
+        <translation>&Ny session</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="42"/>
         <source>&Session preferences</source>
-        <translation>工作階段偏好設定(&S)</translation>
+        <translation>&Sessionspreferenser</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="43"/>
         <source>&Delete session</source>
-        <translation>刪除工作階段(&D)</translation>
+        <translation>&Radera session</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="47"/>
         <source>&Create session icon on desktop...</source>
-        <translation>在桌面上建立工作階段圖示(&C)...</translation>
+        <translation>S&kapa sessionsgenväg på Skrivbordet...</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="81"/>
         <source>Delete</source>
         <comment>Delete</comment>
-        <translation>刪除</translation>
+        <translation>Radera</translation>
     </message>
     <message>
         <location filename="sessionmanagedialog.cpp" line="109"/>
         <source>Session management</source>
-        <translation>管理工作階段</translation>
+        <translation>Sessionshantering</translation>
     </message>
 </context>
 <context>
@@ -1965,154 +1976,154 @@ Example:
     <message>
         <location filename="sessionwidget.cpp" line="52"/>
         <source>Session name:</source>
-        <translation>工作階段名稱:</translation>
+        <translation>Sessionsnamn:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="57"/>
         <source><< change icon</source>
-        <translation><< 更換圖示</translation>
+        <translation><< ändra ikon</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="60"/>
         <source>&Server</source>
-        <translation>伺服器(&S)</translation>
+        <translation>&Server</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="87"/>
         <source>Host:</source>
-        <translation>主機:</translation>
+        <translation>Servernamn:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="88"/>
         <source>Login:</source>
-        <translation>登入帳號:</translation>
+        <translation>Användare:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="89"/>
         <source>SSH port:</source>
-        <translation>SSH連接埠:</translation>
+        <translation>SSH-port:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="101"/>
         <source>Use RSA/DSA key for ssh connection:</source>
-        <translation>使用RSA/DSA密鑰於SSH連線:</translation>
+        <translation>Använd denna RSA/DSA-nyckel för SSH-anslutning:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="107"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
-        <translation>嘗試自動登入 (ssh代理或預設SSH密鑰)</translation>
+        <translation>Prova automatisk inloggning (ssh-agent eller standard SSH-nyckel)</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="108"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
-        <translation>Kerberos 5 (GSSAPI) 認證</translation>
+        <translation>Kerberos 5 (GSSAPI)-autentisering</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="113"/>
         <source>&Session type</source>
-        <translation>工作階段類型(&S)</translation>
+        <translation>&Sessionstyp</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="118"/>
         <source>Session type:</source>
-        <translation>工作階段類型:</translation>
+        <translation>Sessionstyp:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="127"/>
         <location filename="sessionwidget.cpp" line="296"/>
         <source>Connect to Windows terminal server</source>
-        <translation>連線至微軟終端伺服器</translation>
+        <translation>Anslut till Windows Terminal Server (RDP)</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="128"/>
         <source>XDMCP</source>
-        <translation type="unfinished"></translation>
+        <translation>XDMCP</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="129"/>
         <source>Connect to local desktop</source>
-        <translation>連線至本地桌面</translation>
+        <translation>Anslut till lokalt Skrivbord</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="130"/>
         <source>Custom desktop</source>
-        <translation>自訂桌面類型</translation>
+        <translation>Anpassat Skrivbord</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="131"/>
         <source>Single application</source>
-        <translation>單一應用程式</translation>
+        <translation>Applikation</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="133"/>
         <location filename="sessionwidget.cpp" line="252"/>
         <source>Command:</source>
-        <translation>指令:</translation>
+        <translation>Kommando:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="134"/>
         <source>Advanced options...</source>
-        <translation>進階設定...</translation>
+        <translation>Avancerade alternativ...</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="145"/>
         <location filename="sessionwidget.cpp" line="429"/>
         <location filename="sessionwidget.cpp" line="492"/>
         <source>Path to executable</source>
-        <translation>執行路徑</translation>
+        <translation>Sökväg till exekverbar fil</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="196"/>
         <source>Open picture</source>
-        <translation>開啟圖片</translation>
+        <translation>Öppna bild</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="198"/>
         <source>Pictures</source>
-        <translation>圖片</translation>
+        <translation>Bilder</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="219"/>
         <source>Open key file</source>
-        <translation>開啟密鑰檔案</translation>
+        <translation>Öppna nyckelfil</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="221"/>
         <source>All files</source>
-        <translation>所有檔案</translation>
+        <translation>Alla filer</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="231"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Fel</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="232"/>
         <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>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="273"/>
         <location filename="sessionwidget.cpp" line="391"/>
         <source>Server:</source>
-        <translation>伺服器:</translation>
+        <translation>Server:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="279"/>
         <location filename="sessionwidget.cpp" line="399"/>
         <source>XDMCP server:</source>
-        <translation>XDMCP 伺服器:</translation>
+        <translation>XDMCP-server:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="297"/>
         <source>rdesktop command line options:</source>
-        <translation>rdesktop 指令選項:</translation>
+        <translation>rdesktop kommandoradsalternativ:</translation>
     </message>
     <message>
         <location filename="sessionwidget.cpp" line="310"/>
         <location filename="sessionwidget.cpp" line="411"/>
         <source>New session</source>
-        <translation>新的工作階段</translation>
+        <translation>Ny session</translation>
     </message>
 </context>
 <context>
@@ -2121,131 +2132,132 @@ Example:
         <location filename="settingswidget.cpp" line="40"/>
         <location filename="settingswidget.cpp" line="44"/>
         <source>&Display</source>
-        <translation>顯示(&D)</translation>
+        <translation>&Skärm</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="41"/>
         <location filename="settingswidget.cpp" line="45"/>
         <source>&Keyboard</source>
-        <translation>鍵盤(&K)</translation>
+        <translation>&Tangentbord</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="42"/>
         <location filename="settingswidget.cpp" line="46"/>
         <source>Sound</source>
-        <translation>聲音</translation>
+        <translation>Ljud</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="57"/>
         <source>Fullscreen</source>
-        <translation>全螢幕</translation>
+        <translation>Fullskärm</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="59"/>
         <source>Custom</source>
-        <translation>自定</translation>
+        <translation>Anpassad</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="61"/>
         <source>Window</source>
-        <translation>視窗</translation>
+        <translation>Fönster</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="63"/>
         <source>Use whole display</source>
-        <translation>使用整個顯示器</translation>
+        <translation>Använd hela skärmen</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
-        <translation>設定顯示DPI</translation>
+        <translation>Ange skärmupplösning (DPI)</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="76"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
-        <translation>Xinerama延伸功能(支援兩個以上的螢幕)</translation>
+        <translation>Xinerama (stöd för två eller fler skärmar)</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="92"/>
         <source>Width:</source>
-        <translation>寬度:</translation>
+        <translation>Bredd:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="95"/>
         <source>Height:</source>
-        <translation>高度:</translation>
+        <translation>Höjd:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="102"/>
         <source>&Display:</source>
-        <translation>顯示器(&D):</translation>
+        <translation>&Skärm:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="104"/>
         <source>&Identify all displays</source>
-        <translation>辨認所有顯示器(&I)</translation>
+        <translation>&Identifiera alla skärmar</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="142"/>
         <source>Keep current keyboard Settings</source>
-        <translation>保持目前的鍵盤設定</translation>
+        <translation>Behåll aktuella tangentbordsinställningar</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="152"/>
         <source>Keyboard layout:</source>
-        <translation>鍵盤佈局:</translation>
+        <translation>Tangentbordslayout:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="154"/>
         <source>Keyboard model:</source>
-        <translation>鍵盤型號:</translation>
+        <translation>Tangentbordsmodell:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="165"/>
         <source>Enable sound support</source>
-        <translation>啟用音效支援</translation>
+        <translation>Aktivera ljudstöd</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="174"/>
         <source>Start sound daemon</source>
-        <translation>開啟聲音背景程式</translation>
+        <translation>Starta ljudserver</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="176"/>
         <source>Use running sound daemon</source>
-        <translation>使用目前的音效背景程式</translation>
+        <translation>Använd aktiv ljudserver</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="178"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
-        <translation>使用SSH連接埠轉送來建立
-可通過防火牆的聲音通道</translation>
+        <translatorcomment>Hittade ingen bra översättning för "port forwarding"</translatorcomment>
+        <translation>Använd SSH port forwarding för att tunnla
+ljudström genom brandväggar</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="180"/>
         <source>Use default sound port</source>
-        <translation>使用預設的聲音連接埠</translation>
+        <translation>Använd standardport för ljud</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="187"/>
         <source>Sound port:</source>
-        <translation>聲音連接埠:</translation>
+        <translation>Ljudport:</translation>
     </message>
     <message>
         <location filename="settingswidget.cpp" line="214"/>
         <source>Client side printing support</source>
-        <translation>用戶端列印支援</translation>
+        <translation>Stöd för utskrifter via klienten</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="557"/>
+        <location filename="settingswidget.cpp" line="554"/>
         <source>us</source>
-        <translation>us</translation>
+        <translation>se</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="558"/>
+        <location filename="settingswidget.cpp" line="555"/>
         <source>pc105/us</source>
-        <translation>pc105/us</translation>
+        <translation>pc105/se</translation>
     </message>
 </context>
 <context>
@@ -2253,176 +2265,176 @@ sound system connections through firewalls</source>
     <message>
         <location filename="sharewidget.cpp" line="37"/>
         <source>&Folders</source>
-        <translation>資料夾(&F)</translation>
+        <translation>&Mappar</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="47"/>
         <source>Path</source>
-        <translation>路徑</translation>
+        <translation>Sökväg</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="49"/>
         <location filename="sharewidget.cpp" line="131"/>
         <source>Automount</source>
-        <translation>自動掛載</translation>
+        <translation>Montera automatiskt</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="58"/>
         <source>Add</source>
-        <translation>新增</translation>
+        <translation>Lägg till</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="59"/>
         <source>Delete</source>
-        <translation>刪除</translation>
+        <translation>Radera</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="69"/>
         <source>Path:</source>
-        <translation>路徑:</translation>
+        <translation>Sökväg:</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="76"/>
         <source>Filename encoding</source>
-        <translation>檔案編碼方式</translation>
+        <translation>Kodtabell för filnamn</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="82"/>
         <source>local:</source>
-        <translation>本地端:</translation>
+        <translation>lokal:</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="83"/>
         <source>remote:</source>
-        <translation>遠端:</translation>
+        <translation>fjärr:</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="95"/>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
-        <translation>使用SSH連接埠轉送來建立可通過防火牆的檔案系統通道</translation>
+        <translation>Använd SSH port forwarding för att tunnla filsystemsanslutningar genom brandväggar</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="158"/>
         <source>Select folder</source>
-        <translation>選擇資料夾</translation>
+        <translation>Välj mapp</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="169"/>
         <source>Error</source>
-        <translation>錯誤</translation>
+        <translation>Fel</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="170"/>
         <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>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="229"/>
         <location filename="sharewidget.cpp" line="280"/>
         <source>WINDOWS-1252</source>
-        <translation type="unfinished"></translation>
+        <translation>WINDOWS-1252</translation>
     </message>
     <message>
         <location filename="sharewidget.cpp" line="239"/>
         <location filename="sharewidget.cpp" line="286"/>
         <source>ISO8859-1</source>
-        <translation type="unfinished"></translation>
+        <translation>ISO8859-1</translation>
     </message>
 </context>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="111"/>
+        <location filename="sshmasterconnection.cpp" line="124"/>
         <source>Can not initialize libssh</source>
-        <translation>libssh無法初始化</translation>
+        <translation>Kan ej initialisera libssh</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="131"/>
+        <location filename="sshmasterconnection.cpp" line="144"/>
         <source>Can not create ssh session</source>
-        <translation>無法建立SSH工作階段</translation>
+        <translation>Kan ej skapa SSH-session</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="146"/>
+        <location filename="sshmasterconnection.cpp" line="159"/>
         <source>Can not connect to </source>
-        <translation>無法連線至 </translation>
+        <translation>Kan inte ansluta till </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="200"/>
         <source>Authentication failed</source>
-        <translation>驗證失敗</translation>
+        <translation>Autentisering misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="203"/>
+        <location filename="sshmasterconnection.cpp" line="216"/>
         <source>channel_forward_listen failed</source>
-        <translation>channel_forward_listen失敗</translation>
+        <translation>channel_forward_listen misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="517"/>
+        <location filename="sshmasterconnection.cpp" line="530"/>
         <source>Can not open file </source>
-        <translation>無法開啟檔案</translation>
+        <translation>Kan inte öppna fil </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="529"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not create remote file </source>
-        <translation>無法創建遠端檔案</translation>
+        <translation>Kan inte skapa fjärrfil </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="542"/>
+        <location filename="sshmasterconnection.cpp" line="555"/>
         <source>Can not write to remote file </source>
-        <translation>無法寫入資料至遠端檔案</translation>
+        <translation>Kan inte skriva till fjärrfil </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="592"/>
+        <location filename="sshmasterconnection.cpp" line="605"/>
         <source>can not connect to </source>
-        <translation>無法連線至 </translation>
+        <translation>kan inte ansluta till </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="714"/>
         <source>channel_open_forward failed</source>
-        <translation>channel_open_forward失敗</translation>
+        <translation>channel_open_forward misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="720"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_open_session failed</source>
-        <translation>channel_open_session失敗</translation>
+        <translation>channel_open_session misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="727"/>
+        <location filename="sshmasterconnection.cpp" line="740"/>
         <source>channel_request_exec failed</source>
-        <translation>channel_request_exec失敗</translation>
+        <translation>channel_request_exec misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="792"/>
+        <location filename="sshmasterconnection.cpp" line="805"/>
         <source>error writing to socket</source>
-        <translation type="unfinished"></translation>
+        <translation>ett fel uppstod vid skrivning till socket</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="810"/>
+        <location filename="sshmasterconnection.cpp" line="823"/>
         <source>error reading channel</source>
-        <translation type="unfinished"></translation>
+        <translation>ett fel uppstod när kanal skulle läsas</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="840"/>
+        <location filename="sshmasterconnection.cpp" line="853"/>
         <source>channel_write failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_write misslyckades</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="852"/>
+        <location filename="sshmasterconnection.cpp" line="865"/>
         <source>error reading tcp socket</source>
-        <translation type="unfinished"></translation>
+        <translation>ett fel uppstod när tcp socket skulle läsas</translation>
     </message>
 </context>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="92"/>
+        <location filename="sshprocess.cpp" line="97"/>
         <source>Error creating socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Ett fel uppstod när socket skulle skapas</translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="110"/>
+        <location filename="sshprocess.cpp" line="115"/>
         <source>Error binding </source>
-        <translation type="unfinished"></translation>
+        <translation>Ett fel uppstod vid anslutning till socket </translation>
     </message>
 </context>
 <context>
@@ -2430,12 +2442,12 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingswidget.cpp" line="50"/>
         <source>Open File</source>
-        <translation>開啟檔案</translation>
+        <translation>Öppna fil</translation>
     </message>
     <message>
         <location filename="xsettingswidget.cpp" line="52"/>
         <source>Executable (*.exe)</source>
-        <translation>執行檔 (*.exe)</translation>
+        <translation>Exekverbar (*.exe)</translation>
     </message>
 </context>
 <context>
@@ -2443,62 +2455,62 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingsui.ui" line="14"/>
         <source>Form</source>
-        <translation>表單</translation>
+        <translation>Formulär</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
-        <source>You must restart the X2go Client for the changes to take effect</source>
-        <translation>您必需重新啟動X2go用戶端以讓設定變更生效</translation>
+        <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="50"/>
         <source>use integrated X-Server</source>
-        <translation>使用內建的X伺服器</translation>
+        <translation>Använd integrerad X-server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="60"/>
         <source>use custom X-Server</source>
-        <translation>使用自定的X伺服器</translation>
+        <translation>Använd anpassad X-server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="70"/>
         <source>custom X-Server</source>
-        <translation>自定X伺服器</translation>
+        <translation>Anpassad X-server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="78"/>
         <source>executable:</source>
-        <translation>執行路徑:</translation>
+        <translation>Binär:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="101"/>
         <source>start X-Server on X2Go client start</source>
-        <translation>當X2Go用戶端啟動時啟動X伺服器</translation>
+        <translation>Starta X-server när X2Go-klienten startas</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="113"/>
         <source>command line options:</source>
-        <translation>指令列選項:</translation>
+        <translation>Kommandoradsalternativ:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="125"/>
         <source>X-Server command line options</source>
-        <translation>X伺服器指令列選項</translation>
+        <translation>Kommandoradsalternativ för X-server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="131"/>
         <source>window mode:</source>
-        <translation>視窗模式:</translation>
+        <translation>Fönsterläge:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="141"/>
         <source>fullscreen mode:</source>
-        <translation>全螢幕模式:</translation>
+        <translation>Fullskärmsläge:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="151"/>
         <source>single application:</source>
-        <translation>單一應用程式:</translation>
+        <translation>Applikation:</translation>
     </message>
 </context>
 </TS>
diff --git a/x2goclient_zh_tw.qm b/x2goclient_zh_tw.qm
deleted file mode 100644
index 89a9d60..0000000
Binary files a/x2goclient_zh_tw.qm and /dev/null differ
diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts
index d5669c1..142418c 100644
--- a/x2goclient_zh_tw.ts
+++ b/x2goclient_zh_tw.ts
@@ -662,8 +662,8 @@
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="147"/>
-        <location filename="onmainwindow_part2.cpp" line="184"/>
-        <location filename="onmainwindow_part2.cpp" line="2152"/>
+        <location filename="onmainwindow_part2.cpp" line="189"/>
+        <location filename="onmainwindow_part2.cpp" line="2178"/>
         <source>connecting</source>
         <translation>正在連線</translation>
     </message>
@@ -713,7 +713,7 @@
     <message>
         <location filename="onmainwindow.cpp" line="488"/>
         <location filename="onmainwindow.cpp" line="945"/>
-        <location filename="onmainwindow_part2.cpp" line="2204"/>
+        <location filename="onmainwindow_part2.cpp" line="2230"/>
         <location filename="onmainwindow_part4.cpp" line="1995"/>
         <source>Suspend</source>
         <translation>暫停</translation>
@@ -856,18 +856,18 @@
         <location filename="onmainwindow.cpp" line="2205"/>
         <location filename="onmainwindow.cpp" line="2239"/>
         <location filename="onmainwindow.cpp" line="2284"/>
-        <location filename="onmainwindow_part2.cpp" line="300"/>
-        <location filename="onmainwindow_part2.cpp" line="476"/>
-        <location filename="onmainwindow_part2.cpp" line="485"/>
-        <location filename="onmainwindow_part2.cpp" line="784"/>
-        <location filename="onmainwindow_part2.cpp" line="1235"/>
-        <location filename="onmainwindow_part2.cpp" line="1296"/>
-        <location filename="onmainwindow_part2.cpp" line="1347"/>
-        <location filename="onmainwindow_part2.cpp" line="1380"/>
-        <location filename="onmainwindow_part2.cpp" line="1424"/>
-        <location filename="onmainwindow_part2.cpp" line="1804"/>
+        <location filename="onmainwindow_part2.cpp" line="305"/>
+        <location filename="onmainwindow_part2.cpp" line="481"/>
+        <location filename="onmainwindow_part2.cpp" line="490"/>
+        <location filename="onmainwindow_part2.cpp" line="789"/>
+        <location filename="onmainwindow_part2.cpp" line="1240"/>
+        <location filename="onmainwindow_part2.cpp" line="1301"/>
+        <location filename="onmainwindow_part2.cpp" line="1352"/>
+        <location filename="onmainwindow_part2.cpp" line="1385"/>
+        <location filename="onmainwindow_part2.cpp" line="1429"/>
         <location filename="onmainwindow_part2.cpp" line="1830"/>
-        <location filename="onmainwindow_part2.cpp" line="1962"/>
+        <location filename="onmainwindow_part2.cpp" line="1856"/>
+        <location filename="onmainwindow_part2.cpp" line="1988"/>
         <location filename="onmainwindow_part3.cpp" line="202"/>
         <location filename="onmainwindow_part3.cpp" line="773"/>
         <location filename="onmainwindow_part3.cpp" line="854"/>
@@ -923,7 +923,7 @@
     </message>
     <message>
         <location filename="onmainwindow.cpp" line="941"/>
-        <location filename="onmainwindow_part2.cpp" line="2065"/>
+        <location filename="onmainwindow_part2.cpp" line="2091"/>
         <source>Not connected</source>
         <translation>尚未連線</translation>
     </message>
@@ -1017,52 +1017,52 @@ It is now: </source>
         <translation>由於安全性的考量,目前的連線已被中止</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="90"/>
+        <location filename="onmainwindow_part2.cpp" line="91"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="110"/>
+        <location filename="onmainwindow_part2.cpp" line="113"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
         <translation>目前沒有發現已知的主機檔案。如果您接受目前的主機密鑰,這個檔案將會自動被建立。</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="115"/>
+        <location filename="onmainwindow_part2.cpp" line="118"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>此為未知的伺服器,您要選擇信任此主機密鑰嗎?
 此公開密鑰的雜湊值為:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="126"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="130"/>
         <source>Host key verification failed</source>
         <translation>主機密鑰驗證任失敗</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1169"/>
-        <location filename="onmainwindow_part2.cpp" line="1189"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1174"/>
+        <location filename="onmainwindow_part2.cpp" line="1194"/>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="119"/>
-        <location filename="onmainwindow_part2.cpp" line="1170"/>
-        <location filename="onmainwindow_part2.cpp" line="1190"/>
+        <location filename="onmainwindow_part2.cpp" line="122"/>
+        <location filename="onmainwindow_part2.cpp" line="1175"/>
+        <location filename="onmainwindow_part2.cpp" line="1195"/>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
-        <source>Authentification failed</source>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
+        <source>Authentication failed</source>
         <translation>認證失敗</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="293"/>
-        <location filename="onmainwindow_part2.cpp" line="1289"/>
-        <location filename="onmainwindow_part2.cpp" line="1373"/>
-        <location filename="onmainwindow_part2.cpp" line="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="298"/>
+        <location filename="onmainwindow_part2.cpp" line="1294"/>
+        <location filename="onmainwindow_part2.cpp" line="1378"/>
+        <location filename="onmainwindow_part2.cpp" line="1411"/>
         <location filename="onmainwindow_part3.cpp" line="766"/>
         <location filename="onmainwindow_part3.cpp" line="847"/>
         <location filename="onmainwindow_part3.cpp" line="1219"/>
@@ -1074,9 +1074,9 @@ Public key hash: </source>
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="296"/>
-        <location filename="onmainwindow_part2.cpp" line="1292"/>
-        <location filename="onmainwindow_part2.cpp" line="1376"/>
+        <location filename="onmainwindow_part2.cpp" line="301"/>
+        <location filename="onmainwindow_part2.cpp" line="1297"/>
+        <location filename="onmainwindow_part2.cpp" line="1381"/>
         <location filename="onmainwindow_part3.cpp" line="199"/>
         <location filename="onmainwindow_part3.cpp" line="769"/>
         <location filename="onmainwindow_part3.cpp" line="850"/>
@@ -1087,196 +1087,196 @@ Public key hash: </source>
         <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="412"/>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="477"/>
+        <location filename="onmainwindow_part2.cpp" line="482"/>
         <source>No server availabel</source>
         <translation>伺服器不存在l</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="486"/>
-        <location filename="onmainwindow_part2.cpp" line="785"/>
-        <location filename="onmainwindow_part2.cpp" line="1236"/>
-        <location filename="onmainwindow_part2.cpp" line="1348"/>
+        <location filename="onmainwindow_part2.cpp" line="491"/>
+        <location filename="onmainwindow_part2.cpp" line="790"/>
+        <location filename="onmainwindow_part2.cpp" line="1241"/>
+        <location filename="onmainwindow_part2.cpp" line="1353"/>
         <source>Server not availabel</source>
         <translation>伺服器不存在|</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1005"/>
+        <location filename="onmainwindow_part2.cpp" line="1010"/>
         <location filename="onmainwindow_part4.cpp" line="1986"/>
         <source>Select session:</source>
         <translation>請選擇工作階段:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1021"/>
-        <location filename="onmainwindow_part2.cpp" line="1115"/>
-        <location filename="onmainwindow_part2.cpp" line="2168"/>
+        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1120"/>
+        <location filename="onmainwindow_part2.cpp" line="2194"/>
         <source>running</source>
         <translation>正在執行中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1023"/>
-        <location filename="onmainwindow_part2.cpp" line="1308"/>
+        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1313"/>
         <source>suspended</source>
         <translation>已暫停</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1029"/>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
         <source>Desktop</source>
         <translation>桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1031"/>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
         <source>single application</source>
         <translation>單一的應用程式</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1033"/>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
         <source>shadow session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1066"/>
+        <location filename="onmainwindow_part2.cpp" line="1071"/>
         <source>Information</source>
         <translation>資訊</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1067"/>
+        <location filename="onmainwindow_part2.cpp" line="1072"/>
         <source>No accessible desktop found</source>
         <translation>目前沒有找到可訪問的工作桌面</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1080"/>
+        <location filename="onmainwindow_part2.cpp" line="1085"/>
         <location filename="onmainwindow_part4.cpp" line="2399"/>
         <source>Filter</source>
         <translation>篩選器</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1087"/>
+        <location filename="onmainwindow_part2.cpp" line="1092"/>
         <source>Select desktop:</source>
         <translation>請選擇工作桌面:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1156"/>
-        <location filename="onmainwindow_part2.cpp" line="1176"/>
-        <location filename="onmainwindow_part2.cpp" line="1991"/>
-        <location filename="onmainwindow_part2.cpp" line="2380"/>
+        <location filename="onmainwindow_part2.cpp" line="1161"/>
+        <location filename="onmainwindow_part2.cpp" line="1181"/>
+        <location filename="onmainwindow_part2.cpp" line="2017"/>
+        <location filename="onmainwindow_part2.cpp" line="2406"/>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1157"/>
-        <location filename="onmainwindow_part2.cpp" line="1177"/>
+        <location filename="onmainwindow_part2.cpp" line="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1182"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1165"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
         <source>24 or 32</source>
         <translation>24或32</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1166"/>
-        <location filename="onmainwindow_part2.cpp" line="1186"/>
+        <location filename="onmainwindow_part2.cpp" line="1171"/>
+        <location filename="onmainwindow_part2.cpp" line="1191"/>
         <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>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1253"/>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
         <source>suspending</source>
         <translation>正在暫停工作中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1275"/>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
         <source>terminating</source>
         <translation>正在中止工作中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1409"/>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
         <source><b>Wrong Password!</b><br><br></source>
         <translation><b>不正確的密碼!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1802"/>
+        <location filename="onmainwindow_part2.cpp" line="1828"/>
         <location filename="onmainwindow_part3.cpp" line="1096"/>
         <source>Unable to create folder:</source>
         <translation>無法創建資料夾:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1828"/>
+        <location filename="onmainwindow_part2.cpp" line="1854"/>
         <source>Unable to write file:</source>
         <translation>檔案無法寫入:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1934"/>
+        <location filename="onmainwindow_part2.cpp" line="1960"/>
         <location filename="onmainwindow_part4.cpp" line="1263"/>
         <source>Attach X2Go window</source>
         <translation>連接X2Go視窗</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1960"/>
+        <location filename="onmainwindow_part2.cpp" line="1986"/>
         <location filename="onmainwindow_part3.cpp" line="2330"/>
         <source>Unable to create SSL tunnel:
 </source>
         <translation>無法建立SSL通道:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1989"/>
+        <location filename="onmainwindow_part2.cpp" line="2015"/>
         <source>Unable to create SSL Tunnel:
 </source>
         <translation>無法建立SSL通道:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2137"/>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
         <source>Finished</source>
         <translation>已完成</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2160"/>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
         <source>starting</source>
         <translation>正在開始</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2162"/>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
         <source>resuming</source>
         <translation>正在還原</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2224"/>
-        <location filename="onmainwindow_part2.cpp" line="2492"/>
-        <location filename="onmainwindow_part2.cpp" line="2510"/>
+        <location filename="onmainwindow_part2.cpp" line="2250"/>
+        <location filename="onmainwindow_part2.cpp" line="2518"/>
+        <location filename="onmainwindow_part2.cpp" line="2536"/>
         <source>Connection timeout, aborting</source>
         <translation>連線超時,中止中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2225"/>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
         <source>aborting</source>
         <translation>中止中</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2381"/>
+        <location filename="onmainwindow_part2.cpp" line="2407"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
         <translation>您確定要終止目前的工作階段嗎? 所有未存檔的資料都將會遺失</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2460"/>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
         <source>Session</source>
         <translation>工作階段</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2462"/>
+        <location filename="onmainwindow_part2.cpp" line="2488"/>
         <location filename="onmainwindow_part4.cpp" line="2067"/>
         <location filename="onmainwindow_part4.cpp" line="2089"/>
         <source>Display</source>
         <translation>顯示</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2464"/>
+        <location filename="onmainwindow_part2.cpp" line="2490"/>
         <location filename="onmainwindow_part4.cpp" line="2078"/>
         <source>Creation time</source>
         <translation>創建時間</translation>
@@ -2238,12 +2238,12 @@ sound system connections through firewalls</source>
         <translation>用戶端列印支援</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="557"/>
+        <location filename="settingswidget.cpp" line="554"/>
         <source>us</source>
         <translation>us</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="558"/>
+        <location filename="settingswidget.cpp" line="555"/>
         <source>pc105/us</source>
         <translation>pc105/us</translation>
     </message>
@@ -2332,82 +2332,82 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="111"/>
+        <location filename="sshmasterconnection.cpp" line="124"/>
         <source>Can not initialize libssh</source>
         <translation>libssh無法初始化</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="131"/>
+        <location filename="sshmasterconnection.cpp" line="144"/>
         <source>Can not create ssh session</source>
         <translation>無法建立SSH工作階段</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="146"/>
+        <location filename="sshmasterconnection.cpp" line="159"/>
         <source>Can not connect to </source>
         <translation>無法連線至 </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="200"/>
         <source>Authentication failed</source>
         <translation>驗證失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="203"/>
+        <location filename="sshmasterconnection.cpp" line="216"/>
         <source>channel_forward_listen failed</source>
         <translation>channel_forward_listen失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="517"/>
+        <location filename="sshmasterconnection.cpp" line="530"/>
         <source>Can not open file </source>
         <translation>無法開啟檔案</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="529"/>
+        <location filename="sshmasterconnection.cpp" line="542"/>
         <source>Can not create remote file </source>
         <translation>無法創建遠端檔案</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="542"/>
+        <location filename="sshmasterconnection.cpp" line="555"/>
         <source>Can not write to remote file </source>
         <translation>無法寫入資料至遠端檔案</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="592"/>
+        <location filename="sshmasterconnection.cpp" line="605"/>
         <source>can not connect to </source>
         <translation>無法連線至 </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="714"/>
         <source>channel_open_forward failed</source>
         <translation>channel_open_forward失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="720"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_open_session failed</source>
         <translation>channel_open_session失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="727"/>
+        <location filename="sshmasterconnection.cpp" line="740"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec失敗</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="792"/>
+        <location filename="sshmasterconnection.cpp" line="805"/>
         <source>error writing to socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="810"/>
+        <location filename="sshmasterconnection.cpp" line="823"/>
         <source>error reading channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="840"/>
+        <location filename="sshmasterconnection.cpp" line="853"/>
         <source>channel_write failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="852"/>
+        <location filename="sshmasterconnection.cpp" line="865"/>
         <source>error reading tcp socket</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2415,12 +2415,12 @@ sound system connections through firewalls</source>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="92"/>
+        <location filename="sshprocess.cpp" line="97"/>
         <source>Error creating socket</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="110"/>
+        <location filename="sshprocess.cpp" line="115"/>
         <source>Error binding </source>
         <translation type="unfinished"></translation>
     </message>
@@ -2447,8 +2447,9 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
-        <source>You must restart the X2go Client for the changes to take effect</source>
-        <translation>您必需重新啟動X2go用戶端以讓設定變更生效</translation>
+        <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="50"/>
diff --git a/x2goplugin.rc b/x2goplugin.rc
index 1578a92..dde2abb 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
 1 TYPELIB "x2goplugin.rc"
 
 1 VERSIONINFO
- FILEVERSION 3,99,0,6
- PRODUCTVERSION 3,99,0,6
+ FILEVERSION 3,99,1,0
+ PRODUCTVERSION 3,99,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
             VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
 	    VALUE "FileExtents", "x2go\0"
 	    VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
-            VALUE "FileVersion", "3, 99, 0 ,6\0"
+            VALUE "FileVersion", "3, 99, 1 ,0\0"
             VALUE "InternalName", "x2goplugin\0"
             VALUE "LegalCopyright", "Copyright © 2010-2012 Obviously Nice\0"
 	    VALUE "MIMEType", "application/x2go\0"
             VALUE "OriginalFilename", "npx2goplugin.dll\0"
-            VALUE "ProductName", "X2GoClient Plug-in 3.99.0.6\0"
-            VALUE "ProductVersion", "3, 99, 0, 6\0"
+            VALUE "ProductName", "X2GoClient Plug-in 3.99.1.0\0"
+            VALUE "ProductVersion", "3, 99, 1, 0\0"
         END
     END
     BLOCK "VarFileInfo"


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).




More information about the x2go-commits mailing list