[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.6-14-gf6bd9af

X2go dev team git-admin at x2go.org
Tue Feb 14 13:35:10 CET 2012


The branch, master has been updated
       via  f6bd9af222fe65924c721de688c5efbb6f728db9 (commit)
       via  2e5ee710ffbcb0b03d95c9838d0ffa60d06ecaa1 (commit)
       via  373da1c16fb5cad8b9f4e77db2085b96f43270ad (commit)
       via  805d43099179261f2cdfce7b6554e4f254fd21a9 (commit)
      from  f452167a04ac8ac5a9e24b19c6ddc6ddf58382fc (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 -----------------------------------------------------------------
commit f6bd9af222fe65924c721de688c5efbb6f728db9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 14 13:30:59 2012 +0100

    Fix for zh_TW translation: add qt_zh_TW.qm file from Qt4.8.

commit 2e5ee710ffbcb0b03d95c9838d0ffa60d06ecaa1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 14 13:26:48 2012 +0100

    Build .qm translation files on the fly during build.

commit 373da1c16fb5cad8b9f4e77db2085b96f43270ad
Author: Terje Andersen <teranders at gmail.com>
Date:   Tue Feb 14 13:25:58 2012 +0100

    Add Norwegian (Bokmal) translation. Qt4 lacks Norwegian/Bokmal support, so some of the widgets may stay in English.

commit 805d43099179261f2cdfce7b6554e4f254fd21a9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 14 13:01:48 2012 +0100

    remove i18n build cruft

-----------------------------------------------------------------------

Summary of changes:
 Makefile                             |    2 +
 debian/changelog                     |    7 +
 qt_zh_tw.qm                          |  Bin 0 -> 117253 bytes
 resources.rcc                        |    3 +-
 x2goclient.pro                       |    1 +
 x2goclient_de.qm                     |  Bin 44873 -> 0 bytes
 x2goclient_fr.qm                     |    1 -
 x2goclient_de.ts => x2goclient_nb.ts | 1368 ++++++++++++++++++----------------
 x2goclient_ru.qm                     |  Bin 43127 -> 0 bytes
 x2goclient_zh_tw.qm                  |  Bin 35103 -> 0 bytes
 10 files changed, 757 insertions(+), 625 deletions(-)
 create mode 100644 qt_zh_tw.qm
 delete mode 100644 x2goclient_de.qm
 delete mode 100644 x2goclient_fr.qm
 copy x2goclient_de.ts => x2goclient_nb.ts (66%)
 delete mode 100644 x2goclient_ru.qm
 delete mode 100644 x2goclient_zh_tw.qm

The diff of changes is:
diff --git a/Makefile b/Makefile
index 28dcf9c..5831516 100755
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,12 @@ 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)
 
diff --git a/debian/changelog b/debian/changelog
index d2ffce9..2b6b39e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,13 @@ 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.
+
+  [ 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.
 
   [ Jan Engelhardt ]
   * New upstream version (3.99.1.0):
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..efdd47e 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -63,8 +63,9 @@
        <file>txt/packs</file>
        <file>txt/encodings</file>
        <file>x2goclient_de.qm</file>
-       <file>x2goclient_ru.qm</file>
        <file>x2goclient_fr.qm</file>
+       <file>x2goclient_nb.qm</file>
+       <file>x2goclient_ru.qm</file>
        <file>x2goclient_zh_tw.qm</file>
        <file>qt_de.qm</file>
        <file>qt_ru.qm</file>
diff --git a/x2goclient.pro b/x2goclient.pro
index 8c71ee3..2e80e2a 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -14,6 +14,7 @@ FORMS += cupsprintsettingsdialog.ui cupsprintwidget.ui printdialog.ui printercmd
 
 TRANSLATIONS += x2goclient_de.ts 
 TRANSLATIONS += x2goclient_ru.ts 
+TRANSLATIONS += x2goclient_nb.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_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_de.ts b/x2goclient_nb.ts
similarity index 66%
copy from x2goclient_de.ts
copy to x2goclient_nb.ts
index 35202f3..d26bfc5 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_nb.ts
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="de">
+<TS version="2.0" language="nb_NO">
 <context>
     <name>BrokerPassDialogUi</name>
     <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>Gammelt passord:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="36"/>
         <source>New password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nytt passord:</translation>
     </message>
     <message>
         <location filename="brokerpassdialog.ui" line="50"/>
         <source>Confirm password:</source>
-        <translation type="unfinished"></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,7 +35,7 @@
     <message>
         <location filename="brokerpassdlg.cpp" line="41"/>
         <source>Passwords do not match</source>
-        <translation type="unfinished"></translation>
+        <translation>Passordene stemmer ikke</translation>
     </message>
 </context>
 <context>
@@ -47,12 +48,12 @@
     <message>
         <location filename="cupsprintwidget.cpp" line="68"/>
         <source>Printing</source>
-        <translation>Druckt</translation>
+        <translation>Skriver</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.cpp" line="71"/>
         <source>Stopped</source>
-        <translation>Angehalten</translation>
+        <translation>Stoppet</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.cpp" line="81"/>
@@ -62,7 +63,7 @@
     <message>
         <location filename="cupsprintwidget.cpp" line="81"/>
         <source>No</source>
-        <translation>Nein</translation>
+        <translation>Nei</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="19"/>
@@ -72,12 +73,12 @@
     <message>
         <location filename="cupsprintwidget.ui" line="25"/>
         <source>Name:</source>
-        <translation>Name:</translation>
+        <translation>Navn:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="42"/>
         <source>Properties</source>
-        <translation>Eigenschaften</translation>
+        <translation>Egenskaper</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="49"/>
@@ -87,17 +88,17 @@
     <message>
         <location filename="cupsprintwidget.ui" line="63"/>
         <source>Accepting jobs:</source>
-        <translation>Aufträge werden angenommen:</translation>
+        <translation>Aksepterer jobber:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="77"/>
         <source>Type:</source>
-        <translation>Typ:</translation>
+        <translation>Type:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="91"/>
         <source>Location:</source>
-        <translation>Adresse:</translation>
+        <translation>Plassering:</translation>
     </message>
     <message>
         <location filename="cupsprintwidget.ui" line="105"/>
@@ -124,6 +125,59 @@
     </message>
 </context>
 <context>
+    <name>ConTest</name>
+    <message>
+        <location filename="contest.ui" line="14"/>
+        <source>Connectivity test</source>
+        <translation>Tilkoblings-test</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="24"/>
+        <source>HTTPS connection:</source>
+        <translation>HTTPS tilkobling</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="31"/>
+        <source>SSH connection:</source>
+        <translation>SSH tilkobling</translation>
+    </message>
+    <message>
+        <location filename="contest.ui" line="38"/>
+        <source>Connection speed:</source>
+        <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>Feilet</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>
+        <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>Feilet: </translation>
+    </message>
+</context>
+<context>
     <name>ConfigDialog</name>
     <message>
         <location filename="configdialog.cpp" line="87"/>
@@ -240,7 +294,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 +334,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 +555,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 +695,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 +720,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 +781,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 +794,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 +896,127 @@ 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>
+        <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="167"/>
+        <location filename="httpbrokerclient.cpp" line="181"/>
         <source>pc105/us</source>
-        <translation>pc105/de</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="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>
+        <translation>Feil</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>Innlogging feilet! <br>Vennligst forsøk igjen</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,246 +1024,250 @@ 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>
+        <translation>no</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>
+        <translatorcomment>Need to double-check this one</translatorcomment>
+        <translation>Støtte ...</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>
+        <translation>Sesjon:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="653"/>
+        <location filename="onmainwindow.cpp" line="662"/>
         <source>&Quit</source>
-        <translation>&Beenden</translation>
+        <translation>&Avslutt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="654"/>
+        <location filename="onmainwindow.cpp" line="663"/>
         <source>Ctrl+Q</source>
-        <translation>Strg+Q</translation>
+        <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>Beenden</translation>
+        <translation>Avslutt</translation>
     </message>
     <message>
         <source>&New Session ...</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>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <source>Session Management...</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>
+        <translation>Ctrl+E</translation>
     </message>
     <message>
         <source>LDAP &Settings ...</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>
+        <translation>Gjenopprett verktøylinjen</translation>
     </message>
     <message>
         <source>About X2GO Client</source>
-        <translation type="obsolete">Ãœber X2GoClient</translation>
+        <translation type="obsolete">Ãœber X2GO Client</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="698"/>
+        <location filename="onmainwindow.cpp" line="717"/>
         <source>About Qt</source>
-        <translation>Ãœber QT</translation>
+        <translation>Om QT</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2456"/>
+        <location filename="onmainwindow_part2.cpp" line="2486"/>
         <source>Session</source>
-        <translation>Sitzung</translation>
+        <translation>Sesjon</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>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="721"/>
+        <location filename="onmainwindow.cpp" line="740"/>
         <source>&Session</source>
-        <translation>&Sitzung</translation>
+        <translation>&Sesjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="722"/>
+        <location filename="onmainwindow.cpp" line="741"/>
         <source>&Options</source>
-        <translation>&Einstellungen</translation>
+        <translation>&Innstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="739"/>
+        <location filename="onmainwindow.cpp" line="760"/>
         <source>&Help</source>
-        <translation>&Hilfe</translation>
+        <translation>&Hjelp</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1423"/>
+        <location filename="onmainwindow_part4.cpp" line="1657"/>
         <source>Password:</source>
-        <translation>Password:</translation>
+        <translation>Passord:</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>Tastatur utseende:</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>
+        <translation>Avbryt</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"/>
+        <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"/>
+        <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>
+        <translation>Feil</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>
+        <translation> på </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>
+        <translation>Brukernavn:</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>
+        <translation>Velg sesjon:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1754"/>
+        <location filename="onmainwindow_part4.cpp" line="1988"/>
         <source>Resume</source>
-        <translation>Fortfahren</translation>
+        <translation>Gjenoppta</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>
+        <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="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>
+        <translatorcomment>Need to revisit this word to see if the chosen one is *strong* enough</translatorcomment>
+        <translation>Avslutte</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1766"/>
+        <location filename="onmainwindow_part4.cpp" line="2000"/>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation>Ny</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>
+        <translation>Skjerm</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,22 +1276,22 @@ 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>
+        <translation>Klient 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>
+        <translation>Frakoblet</translation>
     </message>
     <message>
         <source>Unable to create Folder:</source>
@@ -1242,157 +1302,159 @@ 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>Klarer ikke å opprette SSL tunnel:
 </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>
+        <translation>Advarsel</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>
+        <translation>kobler til</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2156"/>
+        <location filename="onmainwindow_part2.cpp" line="2186"/>
         <source>starting</source>
-        <translation>starte</translation>
+        <translation>starter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2158"/>
+        <location filename="onmainwindow_part2.cpp" line="2188"/>
         <source>resuming</source>
-        <translation>aktiviere</translation>
+        <translation>gjenopptar</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>
+        <translation>Tilkoblingen tidsavbrutt, avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2221"/>
+        <location filename="onmainwindow_part2.cpp" line="2251"/>
         <source>aborting</source>
-        <translation>Abbruch</translation>
+        <translation>Avbryter</translation>
     </message>
     <message>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation Time:<br>Status:</b></source>
         <translation type="obsolete"><b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1608"/>
+        <location filename="onmainwindow_part4.cpp" line="1842"/>
         <source>Abort</source>
-        <translation>Abbruch</translation>
+        <translation>Avbryt</translation>
     </message>
     <message>
         <source>Show Details</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> (kan ikke åpne filen)</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> (filen finnes ikke)</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> (mappen finnes ikke)</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>
+        <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="505"/>
+        <location filename="onmainwindow_part3.cpp" line="510"/>
         <source>wrong value for argument"--sound"</source>
-        <translation>unerwarteter Wert "--sound"</translation>
+        <translation>ugyldig verdi for parameteren "--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>
+        <translation>ugyldig verdi for parameteren "--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>
+        <translation>ugyldig verdi for parameteren "--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>
+        <translation>ugyldig verdi for parameteren "--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>
+        <translation>ugyldig verdi for parameteren "--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>
+        <translation>ugyldig parameter: </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>
+        <translation>Tilgjengelige pakkemetoder:</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part3.cpp" line="1511"/>
+        <location filename="onmainwindow_part3.cpp" line="1517"/>
         <source>Support</source>
-        <translation type="unfinished"></translation>
+        <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="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>
+        <translation>Vennligst sjekk LDAP innstillingene</translation>
     </message>
     <message>
         <source>no X2Go Server found in LDAP </source>
-        <translation type="obsolete">LDAP enthält keinen X2GoServer </translation>
+        <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="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>
+        <translation><b>Tilkoblingen feilet</b>
 </translation>
     </message>
     <message>
@@ -1400,26 +1462,26 @@ 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>
+        <translation>Sesjons ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1250"/>
+        <location filename="onmainwindow_part2.cpp" line="1258"/>
         <source>suspending</source>
-        <translation>anhalten</translation>
+        <translation>Kobler fra</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1272"/>
+        <location filename="onmainwindow_part2.cpp" line="1280"/>
         <source>terminating</source>
-        <translation>beende</translation>
+        <translation>Avslutter</translation>
     </message>
     <message>
         <location filename="onmainwindow_part3.cpp" line="196"/>
         <source><b>Connection failed</b>
 :
 </source>
-        <translation><b>Verbindung fehlgeschlagen</b>
+        <translation><b>Tilkoblingen feilet</b>
 :
 </translation>
     </message>
@@ -1453,34 +1515,37 @@ sound system connections through firewalls</source>
         <location filename="onmainwindow_part4.cpp" line="28"/>
         <source>Unable to read :
 </source>
-        <translation>Lesefehler:
+        <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_part4.cpp" line="53"/>
         <source>Unable to write :
 </source>
-        <translation>Schreibfehler:
+        <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>
         <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>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>
+        <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="1406"/>
+        <location filename="onmainwindow_part2.cpp" line="1414"/>
         <source><b>Wrong Password!</b><br><br></source>
-        <translation><b>Falsches Passwort!</b><br><br></translation>
+        <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_part3.cpp" line="590"/>
+        <location filename="onmainwindow_part3.cpp" line="595"/>
         <source>wrong value for argument"--ldap1"</source>
-        <translation>unerwarteter Wert "--ldap1"</translation>
+        <translation>ugyldig verdi for parameteren "--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>
+        <translation>ugyldig verdi for parameteren "--ldap2"</translation>
     </message>
     <message>
         <source>Usage: x2goclient [Options]
@@ -1507,551 +1572,567 @@ 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>
+        <translation>Klarer ikke å opprette filen: </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>
+        <translation>Ingen gyldige kort ble funnet</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>
+        <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_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>
+        <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="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>
+        <translation>Klarte ikke å koble til X-Serveren</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
-Überprüfen Sie Ihre Einstellungen</translation>
+        <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="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>
+        <translation>Klarte ikke å starte X-Serveren
+Vennligst sjekk instillingene dine</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>
+        <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="1162"/>
+        <location filename="onmainwindow_part2.cpp" line="1170"/>
         <source>24 or 32</source>
-        <translation>24 oder 32</translation>
+        <translation>24 eller 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>
+        <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="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>
+        <translation>Nei</translation>
     </message>
     <message>
         <source><b>X2Go Client V. </source>
-        <translation type="obsolete"><b>X2GoClient V. </translation>
+        <translation type="obsolete"><b>X2Go Client V. </translation>
     </message>
     <message>
         <source></b><br> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing)<br><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request 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 X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
+        <translation type="obsolete"></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>
         <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 X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org.</translation>
+        <translation type="obsolete"></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.cpp" line="152"/>
+        <location filename="onmainwindow.cpp" line="156"/>
         <source>OpenOffice.org</source>
-        <translation></translation>
+        <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="153"/>
+        <location filename="onmainwindow.cpp" line="157"/>
         <source>Terminal</source>
-        <translation></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="409"/>
+        <location filename="onmainwindow_part2.cpp" line="417"/>
         <source>unknown</source>
-        <translation>unbekannt</translation>
+        <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1837"/>
+        <location filename="onmainwindow_part4.cpp" line="2071"/>
         <source>Command</source>
-        <translation>Befehl</translation>
+        <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1839"/>
+        <location filename="onmainwindow_part4.cpp" line="2073"/>
         <source>Type</source>
-        <translation>Typ</translation>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1026"/>
+        <location filename="onmainwindow_part2.cpp" line="1034"/>
         <source>Desktop</source>
-        <translation>Desktopumgebung</translation>
+        <translation>Skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1028"/>
+        <location filename="onmainwindow_part2.cpp" line="1036"/>
         <source>single application</source>
-        <translation>Anwendung</translation>
+        <translation>enkel applikasjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1030"/>
+        <location filename="onmainwindow_part2.cpp" line="1038"/>
         <source>shadow session</source>
-        <translation></translation>
+        <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>
         <source><br>Sudo configuration error</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>
+        <translation>Klarte ikke å utføre:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="126"/>
+        <location filename="onmainwindow.cpp" line="130"/>
         <source>X2Go client</source>
-        <translation></translation>
+        <translation>X2Go klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="150"/>
+        <location filename="onmainwindow.cpp" line="154"/>
         <source>Internet browser</source>
-        <translation>Webbrowser</translation>
+        <translation>Nettleser</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="151"/>
+        <location filename="onmainwindow.cpp" line="155"/>
         <source>Email client</source>
-        <translation>E-Mail-Programm</translation>
+        <translation>Epost program</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="658"/>
+        <location filename="onmainwindow.cpp" line="667"/>
         <source>&New session ...</source>
-        <translation>&Neue Sitzung ...</translation>
+        <translation>&Ny sesjon ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="664"/>
+        <location filename="onmainwindow.cpp" line="673"/>
         <source>Session management...</source>
-        <translation>Sitzungsverwaltung...</translation>
+        <translation>Sesjonshåndtering...</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>
+        <translation>Vis verktøylinje</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 X2GoClient</translation>
+        <translation>Om X2GO klient</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>
+        <translation>Vennligst sjekk LDAP innstillingene</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 X2GoServer </translation>
+        <translation>Inge X2Go server ble funnet i 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>Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
+        <translation>Er du sikker på at du ønsker å fjerne denne sesjonen?</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>
+        <translation><b>Feil passord!</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>
+        <translation>Ingen tilgjengelig server</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>
+        <translation>Ikke tilkoblet</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>
+        <translation>Opprettelsestidspunkt</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>
+        <translation>Klarer ikke å opprette katalogen:</translation>
     </message>
     <message>
         <location filename="onmainwindow_part2.cpp" line="79"/>
         <source>Host key for server changed.
 It is now: </source>
-        <translation type="unfinished"></translation>
+        <translation>Vertsnøkkel for serveren har endret seg.
+Den er nå: </translation>
     </message>
     <message>
         <location filename="onmainwindow_part2.cpp" line="80"/>
         <source>For security reasons, connection will be stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</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>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_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>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</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>Serveren er ukjent. Stoler du på vertsnøkkelen?
+Offentlig nøkkel: </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>Verifiseringen av vertsnøkkelen feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="141"/>
+        <location filename="onmainwindow_part2.cpp" line="146"/>
         <source>Authentification failed</source>
-        <translation type="unfinished"></translation>
+        <translation>PÃ¥logging feilet</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>Serveren er ikke tilgjengelig</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>
+        <translation>Klarer ikke å skrive til filen:</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>Klarte ikke å opprette SSL tunnel:
 </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>
+        <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.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>
+        <translation>Del mappe...</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>
+        <translation>Vis detailjer</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>X2GoClient V. </translation>
+        <translation><b>X2Go klient 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>
+        <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="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>
+        <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.cpp" line="675"/>
+        <location filename="onmainwindow.cpp" line="684"/>
         <source>&Create session icon on desktop...</source>
-        <translation>&Desktopsymbol erzeugen...</translation>
+        <translation>&Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="684"/>
+        <location filename="onmainwindow.cpp" line="693"/>
         <source>&Set broker password...</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Still uncertain what to best use as a translation for "broker"</translatorcomment>
+        <translation>&Sett megler passord...</translation>
+    </message>
+    <message>
+        <location filename="onmainwindow.cpp" line="704"/>
+        <source>&Connectivity test...</source>
+        <translation>&Tilkoblings-test...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
+        <location filename="onmainwindow.cpp" line="820"/>
         <source>Operation failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Handlingen feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="811"/>
+        <location filename="onmainwindow.cpp" line="824"/>
         <source>Password changed</source>
-        <translation type="unfinished"></translation>
+        <translation>Passordet er endret</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="830"/>
+        <location filename="onmainwindow.cpp" line="848"/>
         <source>Wrong password!</source>
-        <translation type="unfinished"></translation>
+        <translation>Feil passord!</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>Autentisering</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="920"/>
+        <location filename="onmainwindow.cpp" line="938"/>
         <source>Restore</source>
-        <translation>Wiederherstellen</translation>
+        <translation>Gjenopprett</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 Maustaste: verstecken/wiederherstellen  -  rechte Maustaste: Kontextmenü</translation>
+        <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.cpp" line="1805"/>
+        <location filename="onmainwindow.cpp" line="1843"/>
         <source>Create session icon on desktop</source>
-        <translation>Desktopsymbol erzeugen</translation>
+        <translation>Opprett sesjonsikon på skrivebordet</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 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.
+        <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.
 
-Wollen Sie den versteckten Modus nutzen?</translation>
+Ønsker du å aktivere skjult modus for x2goklient?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1817"/>
+        <location filename="onmainwindow.cpp" line="1855"/>
         <source>New Session</source>
-        <translation>Neue Sitzung</translation>
+        <translation>Ny sesjon</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>X2Go sesjoner ble ikke funnet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2431"/>
+        <location filename="onmainwindow.cpp" line="2473"/>
         <source>RDP connection</source>
-        <translation>RDP Verbindung</translation>
+        <translation>RDP tilkobling</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1867"/>
+        <location filename="onmainwindow.cpp" line="1905"/>
         <source>X2Go Link to session </source>
-        <translation></translation>
+        <translatorcomment>Uncertain of the context here, need to doublecheck this.</translatorcomment>
+        <translation>X2Go kobling til sesjon </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>
+        <translation>Løsne X2Go vindu</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>
+        <translation>Feste X2Go vindu</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="2133"/>
+        <location filename="onmainwindow_part2.cpp" line="2163"/>
         <source>Finished</source>
-        <translation>Beendet</translation>
+        <translation>Ferdig</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>
+        <translation>Er du sikker på at du vil avslutte denne sesjonen?
+Ulagrede data vil gå tapt</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 X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
+        <translation type="obsolete"></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_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
 Please check your installation</source>
-        <translation>X-Server lässt sich nicht starten. 
-Bitte überprüfen Sie Ihre Installation</translation>
+        <translation>Klarer ikke å starte X Serveren
+Vennligst sjekk din installasjon</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 sesjon</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>
+        <translation>Minimer verktøylinje</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>
+        <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>
         <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="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>SSHD konnte nicht gefunden werden. SSHD wird für Dateifreigaben und Druck benötigt.
-Sie können SSHD über folgenden Befehl installieren:
+        <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.cpp" line="2439"/>
+        <location filename="onmainwindow.cpp" line="2481"/>
         <source>Connection to local desktop</source>
-        <translation>Zugriff auf lokalen Desktop</translation>
+        <translation>Tilkobling til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part2.cpp" line="1063"/>
+        <location filename="onmainwindow_part2.cpp" line="1071"/>
         <source>Information</source>
-        <translation>Hinweis</translation>
+        <translation>Informasjon</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>
+        <translation>Velg skrivebord:</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>
+        <translation>Kun vis</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1852"/>
+        <location filename="onmainwindow_part4.cpp" line="2086"/>
         <source>User</source>
-        <translation>Benutzer</translation>
+        <translation>Bruker</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>
+        <translation>Ingen tilgjengelige skrivebord ble funnet</translation>
     </message>
     <message>
-        <location filename="onmainwindow_part4.cpp" line="1769"/>
+        <location filename="onmainwindow_part4.cpp" line="2003"/>
         <source>Full access</source>
-        <translation>Vollzugriff</translation>
+        <translation>Full tilgang</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>
+        <translation>Kun mine skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="484"/>
+        <location filename="onmainwindow.cpp" line="493"/>
         <source>Reconnect</source>
-        <translation>Neu verbinden</translation>
+        <translation>Gjenoppkoble</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>
+        <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="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>
+        <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="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 X2GoServers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
+        <translation><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"/>
@@ -2064,13 +2145,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:Konfigurationsdatei für eine X2Go-Sitzung</translation>
+        <translation type="obsolete">application/x2go:x2go:Konfiguration Datei für eine X2Go Sitzung</translation>
     </message>
 </context>
 <context>
@@ -2093,7 +2174,7 @@ Sie können SSHD über folgenden Befehl installieren:
     <message>
         <location filename="printdialog.ui" line="16"/>
         <source>Print - X2Go client</source>
-        <translation>Drucken - X2GoClient</translation>
+        <translation>Drucken - X2Go Client</translation>
     </message>
 </context>
 <context>
@@ -2298,31 +2379,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>Skjerm </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 +2421,75 @@ 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>
+        <translatorcomment>I think the correct english word here (as best describes the function) would be 'disconnected'. The session isn't paused (=suspended), so I think it's the wrong word.</translatorcomment>
+        <translation>frakoblet</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 +2579,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 +2592,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>Kerberos 5 (GSSAPI) autentisering</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 +2707,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>Benytt hele skjermen</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="71"/>
         <source>Set display DPI</source>
-        <translation>Auflösung festlegen (DPI)</translation>
+        <translation>DPI Auflösung festlegen</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="76"/>
+        <source>Xinerama extension (support for two or more physical displays)</source>
+        <translation>Xinerama utvidelsen (støtte for to, eller flere fysiske skjermer)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="79"/>
+        <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>&Skjerm:</translation>
+    </message>
+    <message>
+        <location filename="settingswidget.cpp" line="104"/>
+        <source>&Identify all displays</source>
+        <translation>&Identifiser alle skjermer</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 +2873,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 +2921,100 @@ sound system connections through firewalls</source>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="100"/>
+        <location filename="sshmasterconnection.cpp" line="117"/>
         <source>Can not initialize libssh</source>
-        <translation type="unfinished"></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="120"/>
+        <location filename="sshmasterconnection.cpp" line="137"/>
         <source>Can not create ssh session</source>
-        <translation type="unfinished"></translation>
+        <translation>Klarer ikke å opprette ssh sesjon</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="135"/>
+        <location filename="sshmasterconnection.cpp" line="152"/>
         <source>Can not connect to </source>
-        <translation type="unfinished"></translation>
+        <translation>Klarer ikke å koble til </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="171"/>
+        <location filename="sshmasterconnection.cpp" line="193"/>
         <source>Authentication failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Autentisering feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="187"/>
+        <location filename="sshmasterconnection.cpp" line="209"/>
         <source>channel_forward_listen failed</source>
-        <translation type="unfinished"></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="498"/>
+        <location filename="sshmasterconnection.cpp" line="523"/>
         <source>Can not open file </source>
-        <translation type="unfinished"></translation>
+        <translation>Kan ikke åpne filen </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="510"/>
+        <location filename="sshmasterconnection.cpp" line="535"/>
         <source>Can not create remote file </source>
-        <translation type="unfinished"></translation>
+        <translation>Klarer ikke å opprette fil over nettverket </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="523"/>
+        <location filename="sshmasterconnection.cpp" line="548"/>
         <source>Can not write to remote file </source>
-        <translation type="unfinished"></translation>
+        <translation>Klarer ikke å skrive til filen over nettverket </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="573"/>
+        <location filename="sshmasterconnection.cpp" line="598"/>
         <source>can not connect to </source>
-        <translation type="unfinished"></translation>
+        <translation>Klarer ikke å koble til </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="682"/>
+        <location filename="sshmasterconnection.cpp" line="707"/>
         <source>channel_open_forward failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_open_forward feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="701"/>
+        <location filename="sshmasterconnection.cpp" line="726"/>
         <source>channel_open_session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_open_session feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="708"/>
+        <location filename="sshmasterconnection.cpp" line="733"/>
         <source>channel_request_exec failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_request_exec feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="773"/>
+        <location filename="sshmasterconnection.cpp" line="798"/>
         <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="791"/>
+        <location filename="sshmasterconnection.cpp" line="816"/>
         <source>error reading channel</source>
-        <translation type="unfinished"></translation>
+        <translation>feil under lesing av kanalen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="821"/>
+        <location filename="sshmasterconnection.cpp" line="846"/>
         <source>channel_write failed</source>
-        <translation type="unfinished"></translation>
+        <translation>channel_write feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="833"/>
+        <location filename="sshmasterconnection.cpp" line="858"/>
         <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>
@@ -2903,12 +3022,12 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingswidget.cpp" line="50"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ã…pne fil</translation>
     </message>
     <message>
         <location filename="xsettingswidget.cpp" line="52"/>
         <source>Executable (*.exe)</source>
-        <translation type="unfinished"></translation>
+        <translation>Programfil (*.exe)</translation>
     </message>
 </context>
 <context>
@@ -2916,62 +3035,65 @@ sound system connections through firewalls</source>
     <message>
         <location filename="xsettingsui.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished">Form</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 type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>Benytt integrert X-Server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="60"/>
         <source>use custom X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Benytt egentilpasset X-Server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="70"/>
         <source>custom X-Server</source>
-        <translation type="unfinished"></translation>
+        <translation>egentilpasset X-Server</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="78"/>
         <source>executable:</source>
-        <translation type="unfinished"></translation>
+        <translation>programfil:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="101"/>
         <source>start X-Server on X2Go client start</source>
-        <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
+        <translation>Vindus-modus:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="141"/>
         <source>fullscreen mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>fullskjerm-modus:</translation>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="151"/>
         <source>single application:</source>
-        <translation type="unfinished"></translation>
+        <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment>
+        <translation>enkeltapplikasjon:</translation>
     </message>
 </context>
 <context>
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_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


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