[X2Go-Commits] [x2goclient] 01/01: Update Bokmal translation file.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 22 08:42:16 CET 2014


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

x2go pushed a commit to branch master
in repository x2goclient.

commit 98f51063c82588c2985b3f63e4b0c9aaa751388e
Author: Klaus Ade Johnstad <klaus at linuxavdelingen.no>
Date:   Wed Jan 22 08:41:44 2014 +0100

    Update Bokmal translation file.
---
 debian/changelog    |    4 +
 x2goclient_nb_no.ts |  848 +++------------------------------------------------
 2 files changed, 40 insertions(+), 812 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a96a61a..f672698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ x2goclient (4.0.1.3-0x2go1) UNRELEASED; urgency=low
       X2Go Client of that version. (Fixes: #384).
     - Minor update of the German translation file.
 
+  [ Klaus Ade Johnstad ]
+  * New upstream version (4.0.1.3):
+    - Update Bokmal translation file.
+
   [ Ricardo Díaz Martín ]
   * New upstream version (4.0.1.3):
     - Update Spanish translation file.
diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts
index 6c85da9..3efefcb 100644
--- a/x2goclient_nb_no.ts
+++ b/x2goclient_nb_no.ts
@@ -4,77 +4,62 @@
 <context>
     <name>AppDialog</name>
     <message>
-        <location filename="appdialog.ui" line="15"/>
         <source>Published Applications</source>
         <translation>Publiserte applikasjoner</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="58"/>
         <source>Search:</source>
         <translation>Søk:</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="74"/>
         <source>&Start</source>
         <translation>&Start</translation>
     </message>
     <message>
-        <location filename="appdialog.ui" line="94"/>
         <source>&Close</source>
         <translation>&Lukk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="102"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="107"/>
         <source>Development</source>
         <translation>Utvikling</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="112"/>
         <source>Education</source>
         <translation>Opplæring</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="117"/>
         <source>Game</source>
         <translation>Spill</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="122"/>
         <source>Graphics</source>
         <translation>Grafikk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="127"/>
         <source>Network</source>
-        <translation></translation>
+        <translation>Nettverk</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="132"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="137"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="142"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="147"/>
         <source>Utility</source>
         <translation>Verktøy</translation>
     </message>
     <message>
-        <location filename="appdialog.cpp" line="152"/>
         <source>Other</source>
         <translation>Andre</translation>
     </message>
@@ -82,104 +67,84 @@
 <context>
     <name>BrokerPassDialogUi</name>
     <message>
-        <location filename="brokerpassdialog.ui" line="15"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="23"/>
         <source>Old password:</source>
         <translation>Gammelt passord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="37"/>
         <source>New password:</source>
         <translation>Nytt passord:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="51"/>
         <source>Confirm password:</source>
         <translation>Bekreft passordet:</translation>
     </message>
     <message>
-        <location filename="brokerpassdialog.ui" line="80"/>
         <source>TextLabel</source>
-        <translatorcomment>hm... Am I supposed to translate this?</translatorcomment>
-        <translation>TestLabel</translation>
+        <translation>TekstMerke</translation>
     </message>
 </context>
 <context>
     <name>BrokerPassDlg</name>
     <message>
-        <location filename="brokerpassdlg.cpp" line="39"/>
         <source>Passwords do not match</source>
-        <translation>Passordene stemmer ikke</translation>
+        <translation>Passordene stemmer ikke overens</translation>
     </message>
 </context>
 <context>
     <name>CUPSPrintWidget</name>
     <message>
-        <location filename="cupsprintwidget.cpp" line="71"/>
         <source>Idle</source>
         <translation>Inaktiv</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="74"/>
         <source>Printing</source>
         <translation>Skriver</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="77"/>
         <source>Stopped</source>
         <translation>Stoppet</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.cpp" line="87"/>
         <source>No</source>
         <translation>Nei</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="21"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="27"/>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="44"/>
         <source>Properties</source>
         <translation>Egenskaper</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="51"/>
         <source>State:</source>
         <translation>Status:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="65"/>
         <source>Accepting jobs:</source>
         <translation>Aksepterer jobber:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="79"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="93"/>
         <source>Location:</source>
         <translation>Plassering:</translation>
     </message>
     <message>
-        <location filename="cupsprintwidget.ui" line="107"/>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
@@ -187,17 +152,14 @@
 <context>
     <name>CUPSPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="110"/>
         <source>No option selected</source>
-        <translation>Ingen alternativer valgt</translation>
+        <translation>Ingen alternativer er valgt</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="271"/>
         <source>This value is in conflict with other option</source>
         <translation>Dette alternativet er i konflikt med et annet alternativ</translation>
     </message>
     <message>
-        <location filename="cupsprintersettingsdialog.cpp" line="281"/>
         <source>Options conflict</source>
         <translation>Alternativskonflikt</translation>
     </message>
@@ -205,52 +167,38 @@
 <context>
     <name>ConTest</name>
     <message>
-        <location filename="contest.ui" line="15"/>
         <source>Connectivity test</source>
-        <translation>Tilkoblings-test</translation>
+        <translation>Tilkoblingstest</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="25"/>
         <source>HTTPS connection:</source>
         <translation>HTTPS tilkobling:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="32"/>
         <source>SSH connection:</source>
         <translation>SSH tilkobling:</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="39"/>
         <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="124"/>
-        <location filename="contest.ui" line="168"/>
         <source>Failed</source>
         <translation>Feilet</translation>
     </message>
     <message>
-        <location filename="contest.ui" line="212"/>
         <source>0 Kb/s</source>
         <translation>0 Kb/s</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="106"/>
-        <location filename="contest.cpp" line="113"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="contest.cpp" line="148"/>
         <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="160"/>
-        <location filename="contest.cpp" line="166"/>
         <source>Failed: </source>
         <translation>Feilet: </translation>
     </message>
@@ -258,158 +206,122 @@
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="configdialog.cpp" line="56"/>
         <source>General</source>
-        <translation>Genrelt</translation>
+        <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="65"/>
         <source>Display icon in system tray</source>
         <translation>Vis ikon i systemkurven</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="72"/>
         <source>Hide to system tray when minimized</source>
         <translation>Skjul til systemkurven ved minimering</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="73"/>
         <source>Hide to system tray when closed</source>
         <translation>Skjul til systemkurven ved lukking</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="74"/>
         <source>Hide to system tray after connection is established</source>
         <translation>Skjul til systemkurven etter tilkoblingen er opprettet</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="75"/>
         <source>Restore from system tray after session is disconnected</source>
-        <translation>Gjenopprett fra systemkurven etter sesjonen blir frakoblet</translation>
+        <translation>Gjenopprett fra systemkurven etter at sesjonen er frakoblet</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="93"/>
         <source>Use LDAP</source>
         <translation>Benytt LDAP</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="117"/>
         <source>Server URL:</source>
         <translation>Server URL:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="118"/>
         <source>BaseDN:</source>
-        <translatorcomment>According to what I could gather these parts of the certificate shouldn't be translated</translatorcomment>
         <translation>BaseDN:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="120"/>
         <source>Failover server 1 URL:</source>
         <translation>URL til reserveserver 1:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="122"/>
         <source>Failover server 2 URL:</source>
         <translation>URL til reserveserver 2:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="204"/>
-        <location filename="configdialog.cpp" line="346"/>
         <source>X-Server settings</source>
         <translation>X-Server innstillinger</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="213"/>
         <source>X11 application:</source>
         <translation>X11 applikasjon:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="224"/>
         <source>X11 version:</source>
         <translation>X11 versjon:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="239"/>
         <source>Find X11 application</source>
         <translation>Finn X11 applikasjon</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="256"/>
         <source>Clientside SSH port for file system export usage:</source>
-        <translation>Klientside SSH port for bruk av filsystem eksport:</translation>
+        <translation>Klientside SSH port for bruk ved eksport av filsystem:</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="266"/>
         <source>Start session embedded inside website</source>
         <translation>Start sesjonen innebygd i websiden</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="270"/>
-        <location filename="configdialog.cpp" line="573"/>
-        <location filename="configdialog.cpp" line="585"/>
         <source>Advanced options</source>
         <translation>Avanserte alternativer</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="297"/>
         <source>Defaults</source>
         <translation>Standardoppsett</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="298"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="299"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="322"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="342"/>
         <source>Printing</source>
         <translation>Utksrift</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="509"/>
-        <location filename="configdialog.cpp" line="527"/>
-        <location filename="configdialog.cpp" line="546"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="510"/>
         <source>x2goclient could not find any suitable X11 Application. Please install Apple X11 or select the path to the application</source>
         <translation>x2goclient kan ikke finne en passende X11 applikasjon. Vennligst installer Apple X11, eller oppgi stien til applikasjonen</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="528"/>
         <source>Your are using X11 (Apple X-Window Server) version </source>
         <translation>Du benytter X11 (Apple X-Window Server) versjon </translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="530"/>
         <source>. This version causes problems with X-application in 24bit color mode. You should update your X11 environment (http://trac.macosforge.org/projects/xquartz).</source>
         <translation>. Denne versjonen forårsaker problemer med X-applikasjoner i 24biters fargemodus. Du burde oppdatere ditt X11 oppsett (http://trac.macosforge.org/projects/xquartz).</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="547"/>
         <source>No suitable X11 application found in selected path</source>
         <translation>Ingen passende X11 applikasjon ble funnet i valgt sti</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="583"/>
         <source>&Connection</source>
         <translation>&Tilkobling</translation>
     </message>
     <message>
-        <location filename="configdialog.cpp" line="584"/>
         <source>&Settings</source>
         <translation>&Innstillinger</translation>
     </message>
@@ -417,32 +329,26 @@
 <context>
     <name>ConnectionWidget</name>
     <message>
-        <location filename="connectionwidget.cpp" line="39"/>
         <source>&Connection speed</source>
         <translation>&Sambandsfart</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="44"/>
         <source>Connection speed:</source>
         <translation>Sambandsfart:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="74"/>
         <source>C&ompression</source>
         <translation>&Komprimering</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="91"/>
         <source>Method:</source>
         <translation>Metode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="93"/>
         <source>Compression method:</source>
         <translation>Komprimeringsmetode:</translation>
     </message>
     <message>
-        <location filename="connectionwidget.cpp" line="95"/>
         <source>Image quality:</source>
         <translation>Bildekvalitet:</translation>
     </message>
@@ -450,72 +356,58 @@
 <context>
     <name>CupsPrinterSettingsDialog</name>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="21"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="37"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="47"/>
         <source>Page size:</source>
         <translation>Arkstørrelse:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="64"/>
         <source>Paper type:</source>
         <translation>Papirtype:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="74"/>
         <source>Paper source:</source>
         <translation>Papirkilde:</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="101"/>
         <source>Duplex Printing</source>
         <translation>Tosidig utskrift</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="107"/>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="114"/>
         <source>Long side</source>
         <translation>Langsiden</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="121"/>
         <source>Short side</source>
         <translation>Kortsiden</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="145"/>
         <source>Driver settings</source>
         <translation>Driver innstillinger</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="177"/>
         <source>Option</source>
         <translation>Alternativ</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="182"/>
         <source>Value</source>
         <translation>Verdi</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="188"/>
         <source>No option selected</source>
         <translation>Ingen alternativer er valgt</translation>
     </message>
     <message>
-        <location filename="cupsprintsettingsdialog.ui" line="207"/>
         <source>text</source>
         <translation>tekst</translation>
     </message>
@@ -523,42 +415,34 @@
 <context>
     <name>EditConnectionDialog</name>
     <message>
-        <location filename="editconnectiondialog.cpp" line="58"/>
         <source>&Session</source>
         <translation>&Sesjon</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="59"/>
         <source>&Connection</source>
-        <translation>Tilk&obling</translation>
+        <translation>&Tilkobling</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="60"/>
         <source>&Settings</source>
         <translation>&Innstillinger</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="61"/>
         <source>&Shared folders</source>
         <translation>&Delte mapper</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="63"/>
         <source>&OK</source>
         <translation>&OK</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="64"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="65"/>
         <source>Defaults</source>
         <translation>Standardoppsett</translation>
     </message>
     <message>
-        <location filename="editconnectiondialog.cpp" line="123"/>
         <source>Session preferences - </source>
         <translation>Sesjonsinnstillinger - </translation>
     </message>
@@ -566,217 +450,170 @@
 <context>
     <name>ExportDialog</name>
     <message>
-        <location filename="exportdialog.cpp" line="44"/>
         <source>&Cancel</source>
         <translation>&Avbryt</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="50"/>
         <source>&share</source>
         <translation>d&el</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="51"/>
         <source>&Preferences ...</source>
         <translation>&Innstillinger ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="52"/>
         <source>&Custom folder ...</source>
         <translation>&Egentilpasset mappe ...</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="62"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Slett</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="79"/>
         <source>share folders</source>
-        <translation>delte mapper</translation>
+        <translation>del mapper</translation>
     </message>
     <message>
-        <location filename="exportdialog.cpp" line="145"/>
         <source>Select folder</source>
-        <translation>Valgt mappe</translation>
+        <translation>Velg mappe</translation>
     </message>
 </context>
 <context>
     <name>HttpBrokerClient</name>
     <message>
         <source>us</source>
-        <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment>
         <translation type="obsolete">no</translation>
     </message>
     <message>
         <source>pc105/us</source>
-        <translatorcomment>hm... Am I supposed to translate this? The German one had it translated, so I did the same.</translatorcomment>
         <translation type="obsolete">pc105/no</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="134"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Vertsnøkkel for serveren har endret seg.
 Den er nå: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="135"/>
         <source>For security reasons, connection will be stopped</source>
         <translation>Av hensyn til sikkerheten vil tilkoblingen bli stoppet</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="148"/>
         <source>The host key for this server was not found but an othertype of key exists.An attacker might change the default server key toconfuse your client into thinking the key does not exist</source>
-        <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
+        <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard servernøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="174"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
         <translation>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="179"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Serveren er ukjent. Stoler du på vertsnøkkelen?
 Offentlig nøkkel: </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="183"/>
-        <location filename="httpbrokerclient.cpp" line="193"/>
         <source>Host key verification failed</source>
         <translation>Verifiseringen av vertsnøkkelen feilet</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="183"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="183"/>
         <source>No</source>
         <translation>Nei</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="206"/>
         <source>Enter passphrase to decrypt a key</source>
-        <translation>Oppgi passordfrase for dekryptere en nøkkel</translation>
+        <translation>Oppgi passordfrase for å dekryptere en nøkkel</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="229"/>
         <source>Authentication failed</source>
         <translation>Autentisering feilet</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="386"/>
-        <location filename="httpbrokerclient.cpp" line="402"/>
-        <location filename="httpbrokerclient.cpp" line="422"/>
-        <location filename="httpbrokerclient.cpp" line="437"/>
-        <location filename="httpbrokerclient.cpp" line="451"/>
-        <location filename="httpbrokerclient.cpp" line="469"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="387"/>
         <source>Login failed!<br>Please try again</source>
         <translation>Innlogging feilet! <br>Vennligst forsøk igjen</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="561"/>
         <source><br><b>Server uses an invalid security certificate.</b><br><br></source>
         <translation><br><b>Servereren benytter et ugyldig sikkerhetssertifikat.</b><br><br></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="564"/>
         <source><p style='background:#FFFFDC;'>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p></source>
         <translation><p style='background:#FFFFDC;'>Du burde ikke legge til et unntak om du benytter en internett forbindelse som du ikke stoler 100% på, eller om du ikke er vant med å se advarsler for denne serveren.</p></translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="569"/>
         <source>Secure connection failed</source>
         <translation>Sikker tilkobling feilet</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="574"/>
         <source>Issued to:
 </source>
         <translation>Utstedet til:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="575"/>
-        <location filename="httpbrokerclient.cpp" line="587"/>
         <source>Common Name(CN)	</source>
         <translation>Navn (CN)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="578"/>
-        <location filename="httpbrokerclient.cpp" line="590"/>
         <source>Organization(O)	</source>
         <translation>Organisation (O)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="581"/>
-        <location filename="httpbrokerclient.cpp" line="593"/>
         <source>Organizational Unit(OU)	</source>
         <translation>Organisasjonsenhet (OU)	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="584"/>
         <source>Serial Number	</source>
         <translation>Serienummer	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="586"/>
         <source>Issued by:
 </source>
         <translation>Utstedet av:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="597"/>
         <source>Validity:
 </source>
         <translation>Gyldighet:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="598"/>
         <source>Issued on	</source>
         <translation>Utstedet den	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="599"/>
         <source>expires on	</source>
         <translation>Utløper den	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="600"/>
         <source>Fingerprints:
 </source>
         <translation>Fingeravtrykk:
 </translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="601"/>
         <source>SHA1	</source>
         <translation>SHA1	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="603"/>
         <source>MD5	</source>
         <translation>MD5	</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="609"/>
         <source>Exit X2Go Client</source>
         <translation>Avlsutt X2Go Klienten</translation>
     </message>
     <message>
-        <location filename="httpbrokerclient.cpp" line="611"/>
         <source>Add exception</source>
         <translation>Legg til unntak</translation>
     </message>
@@ -788,8 +625,6 @@ Offentlig nøkkel: </translation>
 <context>
     <name>ONMainWindow</name>
     <message>
-        <location filename="onmainwindow.cpp" line="90"/>
-        <location filename="onmainwindow.cpp" line="6612"/>
         <source>us</source>
         <translation>no</translation>
     </message>
@@ -798,31 +633,22 @@ Offentlig nøkkel: </translation>
         <translation type="obsolete">pc105/de</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="360"/>
         <source>Support ...</source>
-        <translatorcomment>Need to double-check this one</translatorcomment>
         <translation>Støtte ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="700"/>
-        <location filename="onmainwindow.cpp" line="2018"/>
-        <location filename="onmainwindow.cpp" line="8035"/>
         <source>Session:</source>
         <translation>Sesjon:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="752"/>
         <source>&Quit</source>
         <translation>&Avslutt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="753"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="754"/>
-        <location filename="onmainwindow.cpp" line="1090"/>
         <source>Quit</source>
         <translation>Avslutt</translation>
     </message>
@@ -831,7 +657,6 @@ Offentlig nøkkel: </translation>
         <translation type="obsolete">&Neue Sitzung ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="758"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -840,7 +665,6 @@ Offentlig nøkkel: </translation>
         <translation type="obsolete">Sitzungsverwaltung...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="764"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
@@ -849,7 +673,6 @@ Offentlig nøkkel: </translation>
         <translation type="obsolete">LDAP &Konfiguration ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11108"/>
         <source>Restore toolbar</source>
         <translation>Gjenopprett verktøylinjen</translation>
     </message>
@@ -858,276 +681,179 @@ Offentlig nøkkel: </translation>
         <translation type="obsolete">Über X2GO Client</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="807"/>
         <source>About Qt</source>
         <translation>Om QT</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5998"/>
         <source>Session</source>
         <translation>Sesjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="824"/>
         <source>Ctrl+Q</source>
         <comment>exit</comment>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="830"/>
         <source>&Session</source>
         <translation>&Sesjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="831"/>
         <source>&Options</source>
         <translation>&Innstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="850"/>
         <source>&Help</source>
         <translation>&Hjelp</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2956"/>
         <source>Verification code:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verifikasjons kode:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2997"/>
         <source>This can be an indication of a man-in-the-middle attack.
 Somebody might be eavesdropping on you.
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Dette kan være et tegn på såkalt man-in-the-middle angrep.
+Noen kan forsøke å avlytte din forbindelse.
+Av hensyn til din sikkerhet, så bør du avbryte tilkoblingen.
+Vil du avbryte tilkoblingen?
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3017"/>
-        <location filename="onmainwindow.cpp" line="3044"/>
         <source>If you accept the new host key the security of your connection may be compromised.
 Do you want to update the host key?</source>
-        <translation type="unfinished"></translation>
+        <translation>Hvis du aksepterer den nye vertsnøkkelen, så kan din tilkobling bli avlyttet.
+Vil du oppdateren den nye vertsnøkkelen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3023"/>
         <source>The host key for this server was not found but an othertype of key exists. An attacker might change the default server key to confuse your client into thinking the key does not exist. 
 For security reasons, it is recommended to stop the connection.
 Do you want to terminate the connection?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type nøkkel finnes. En angriper kan endre standard vertsnøkkel for serveren for å lure din klient til å tro at nøkkelen ikke finnes.
+Av hensyn til din sikkerhet så bør du avbryte tilkoblingen.
+Vil du avbryte tilkoblingen?
+</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4951"/>
         <source>New session started</source>
         <translation>Ny sesjon startet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4986"/>
         <source>Session resumed</source>
         <translation>Sesjon gjenopptatt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5243"/>
-        <location filename="onmainwindow.cpp" line="5247"/>
         <source>Unable to create folder: </source>
         <translation>Klarer ikke å opprette katalogen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5273"/>
-        <location filename="onmainwindow.cpp" line="5277"/>
         <source>Unable to write file: </source>
         <translation>Klarer ikke å skrive til filen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5550"/>
         <source>Emergency exit.</source>
         <translation>Avsluttning grunnet nødstilfelle.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5559"/>
         <source>Waiting for proxy to exit.</source>
         <translation>Venter på at proxy skal avslutte.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5562"/>
         <source>Failed, killing the proxy.</source>
         <translation>Feilet, dreper derfor proxy.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7037"/>
-        <location filename="onmainwindow.cpp" line="7042"/>
         <source>Wrong parameter: </source>
         <translation>Feil parameter: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7568"/>
         <source>RSA file empty.</source>
         <translation>RSA filen er tom.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7577"/>
         <source>Can not open key: </source>
         <translation>Kan ikke åpne nøkkelfilen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8271"/>
         <source>Card not configured.</source>
         <translation>Kortet er ikke konfigurert.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="9850"/>
         <source>Error getting window geometry (window closed)?</source>
         <translation>Feil under uthenting av vindusgeometrien (Er vinduet lukket?)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10445"/>
         <source>Password:</source>
         <translation>Passord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10446"/>
         <source>Keyboard layout:</source>
         <translation>Tastatur utseende:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10487"/>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10489"/>
-        <location filename="onmainwindow.cpp" line="10811"/>
-        <location filename="onmainwindow.cpp" line="10813"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="569"/>
-        <location filename="onmainwindow.cpp" line="10636"/>
         <source>Applications...</source>
         <translation>Applikasjoner...</translation>
     </message>
     <message>
         <source>Invalid reply from broker</source>
-        <translatorcomment>Need to update/create the Norwegian documentation to make clear what the "megeleren" actually is in this context.</translatorcomment>
         <translation type="obsolete">Ugyldig svar fra megleren</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="910"/>
-        <location filename="onmainwindow.cpp" line="939"/>
-        <location filename="onmainwindow.cpp" line="1691"/>
-        <location filename="onmainwindow.cpp" line="1720"/>
-        <location filename="onmainwindow.cpp" line="1728"/>
-        <location filename="onmainwindow.cpp" line="1876"/>
-        <location filename="onmainwindow.cpp" line="1903"/>
-        <location filename="onmainwindow.cpp" line="1906"/>
-        <location filename="onmainwindow.cpp" line="2185"/>
-        <location filename="onmainwindow.cpp" line="2426"/>
-        <location filename="onmainwindow.cpp" line="2442"/>
-        <location filename="onmainwindow.cpp" line="2456"/>
-        <location filename="onmainwindow.cpp" line="2490"/>
-        <location filename="onmainwindow.cpp" line="2535"/>
-        <location filename="onmainwindow.cpp" line="3530"/>
-        <location filename="onmainwindow.cpp" line="3720"/>
-        <location filename="onmainwindow.cpp" line="3729"/>
-        <location filename="onmainwindow.cpp" line="4061"/>
-        <location filename="onmainwindow.cpp" line="4605"/>
-        <location filename="onmainwindow.cpp" line="4686"/>
-        <location filename="onmainwindow.cpp" line="4750"/>
-        <location filename="onmainwindow.cpp" line="4780"/>
-        <location filename="onmainwindow.cpp" line="4824"/>
-        <location filename="onmainwindow.cpp" line="5247"/>
-        <location filename="onmainwindow.cpp" line="5277"/>
-        <location filename="onmainwindow.cpp" line="5432"/>
-        <location filename="onmainwindow.cpp" line="6281"/>
-        <location filename="onmainwindow.cpp" line="6311"/>
-        <location filename="onmainwindow.cpp" line="7145"/>
-        <location filename="onmainwindow.cpp" line="7227"/>
-        <location filename="onmainwindow.cpp" line="7474"/>
-        <location filename="onmainwindow.cpp" line="7606"/>
-        <location filename="onmainwindow.cpp" line="7669"/>
-        <location filename="onmainwindow.cpp" line="7978"/>
-        <location filename="onmainwindow.cpp" line="7980"/>
-        <location filename="onmainwindow.cpp" line="8218"/>
-        <location filename="onmainwindow.cpp" line="8274"/>
-        <location filename="onmainwindow.cpp" line="8302"/>
-        <location filename="onmainwindow.cpp" line="8756"/>
-        <location filename="onmainwindow.cpp" line="8775"/>
-        <location filename="onmainwindow.cpp" line="8829"/>
-        <location filename="onmainwindow.cpp" line="8855"/>
-        <location filename="onmainwindow.cpp" line="8882"/>
-        <location filename="onmainwindow.cpp" line="11034"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2663"/>
-        <location filename="onmainwindow.cpp" line="6108"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2755"/>
         <source> on </source>
         <translation> på </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="889"/>
-        <location filename="onmainwindow.cpp" line="2011"/>
-        <location filename="onmainwindow.cpp" line="8028"/>
-        <location filename="onmainwindow.cpp" line="10444"/>
         <source>Login:</source>
         <translation>Brukernavn:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4327"/>
-        <location filename="onmainwindow.cpp" line="10807"/>
         <source>Select session:</source>
         <translation>Velg sesjon:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10809"/>
         <source>Resume</source>
         <translation>Gjenoppta</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="572"/>
-        <location filename="onmainwindow.cpp" line="1072"/>
-        <location filename="onmainwindow.cpp" line="5724"/>
-        <location filename="onmainwindow.cpp" line="10816"/>
         <source>Suspend</source>
-        <translatorcomment>I disagree with the word 'Suspend' here, if it was suspending then the session would be paused. As this is not the case, it's more like disconnect (and the counterpart: reconnect). I used the translation fro 'Disconnect' here, and will research the possibility of changing the Suspend word to Disconnect also in the english translation.</translatorcomment>
         <translation>Koble fra</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="575"/>
-        <location filename="onmainwindow.cpp" line="1073"/>
-        <location filename="onmainwindow.cpp" line="10656"/>
-        <location filename="onmainwindow.cpp" line="10818"/>
         <source>Terminate</source>
-        <translatorcomment>Need to revisit this word to see if the chosen one is *strong* enough</translatorcomment>
         <translation>Avslutte</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10821"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6000"/>
-        <location filename="onmainwindow.cpp" line="10888"/>
-        <location filename="onmainwindow.cpp" line="10910"/>
         <source>Display</source>
         <translation>Skjerm</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10890"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10896"/>
         <source>Server</source>
         <translation>Server</translation>
     </message>
@@ -1136,20 +862,14 @@ Do you want to terminate the connection?
         <translation type="obsolete">Startzeit</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10901"/>
         <source>Client IP</source>
         <translation>Klient IP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4342"/>
-        <location filename="onmainwindow.cpp" line="4464"/>
-        <location filename="onmainwindow.cpp" line="5688"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4344"/>
-        <location filename="onmainwindow.cpp" line="4698"/>
         <source>suspended</source>
         <translation>Frakoblet</translation>
     </message>
@@ -1162,46 +882,32 @@ Do you want to terminate the connection?
         <translation type="obsolete">Datei kann nicht geschrieben werden:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5460"/>
         <source>Unable to create SSL Tunnel:
 </source>
         <translation>Klarer ikke å opprette SSL tunnel:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4514"/>
-        <location filename="onmainwindow.cpp" line="4534"/>
-        <location filename="onmainwindow.cpp" line="5462"/>
-        <location filename="onmainwindow.cpp" line="5903"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="174"/>
-        <location filename="onmainwindow.cpp" line="3150"/>
-        <location filename="onmainwindow.cpp" line="5668"/>
         <source>connecting</source>
         <translation>kobler til</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5677"/>
         <source>starting</source>
         <translation>starter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5681"/>
         <source>resuming</source>
         <translation>gjenopptar</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5744"/>
-        <location filename="onmainwindow.cpp" line="6030"/>
-        <location filename="onmainwindow.cpp" line="6049"/>
         <source>Connection timeout, aborting</source>
         <translation>Tilkoblingen tidsavbrutt, avbryter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5745"/>
         <source>aborting</source>
         <translation>Avbryter</translation>
     </message>
@@ -1210,7 +916,6 @@ Do you want to terminate the connection?
         <translation type="obsolete"><b>Sitzungs ID:<br>Server:<br>Login:<br>Display:<br>Startzeit:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10649"/>
         <source>Abort</source>
         <translation>Avbryt</translation>
     </message>
@@ -1219,51 +924,38 @@ Do you want to terminate the connection?
         <translation type="obsolete">Zeige Details</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6762"/>
         <source> (can't open file)</source>
         <translation> (kan ikke åpne filen)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6774"/>
-        <location filename="onmainwindow.cpp" line="6785"/>
-        <location filename="onmainwindow.cpp" line="6796"/>
         <source> (file not exists)</source>
         <translation> (filen finnes ikke)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6823"/>
         <source> (directory not exists)</source>
         <translation> (mappen finnes ikke)</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6851"/>
         <source>wrong value for argument"--link"</source>
-        <translatorcomment>Chose to use 'parameteren' here, the direct translation is 'argument', but didn't fit in my opinion. The cmdline arguments, will they be translated as well?</translatorcomment>
         <translation>ugyldig verdi for parameteren "--link"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6869"/>
         <source>wrong value for argument"--sound"</source>
         <translation>ugyldig verdi for parameteren "--sound"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6886"/>
-        <location filename="onmainwindow.cpp" line="6897"/>
         <source>wrong value for argument"--geometry"</source>
         <translation>ugyldig verdi for parameteren "--geometry"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6915"/>
         <source>wrong value for argument"--set-kbd"</source>
         <translation>ugyldig verdi for parameteren "--set-kbd"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6932"/>
         <source>wrong value for argument"--ldap"</source>
         <translation>ugyldig verdi for parameteren "--ldap"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7027"/>
         <source>wrong value for argument"--pack"</source>
         <translation>ugyldig verdi for parameteren "--pack"</translation>
     </message>
@@ -1272,23 +964,18 @@ Do you want to terminate the connection?
         <translation type="obsolete">ugyldig parameter: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7104"/>
         <source>Available pack methodes:</source>
         <translation>Tilgjengelige pakkemetoder:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7910"/>
         <source>Support</source>
-        <translatorcomment>Will have to revisit this one, not sure if it fits</translatorcomment>
         <translation>Støtte</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7915"/>
         <source></b><br> (C. 2005-2014 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></source>
         <translation></b><br> (C. 2005-2014 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7981"/>
         <source>Please check LDAP Settings</source>
         <translation>Vennligst sjekk LDAP innstillingene</translation>
     </message>
@@ -1301,15 +988,6 @@ Do you want to terminate the connection?
         <translation type="obsolete">Sind Sie sicher, dass Sie die Sitzung löschen wollen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3521"/>
-        <location filename="onmainwindow.cpp" line="4679"/>
-        <location filename="onmainwindow.cpp" line="4773"/>
-        <location filename="onmainwindow.cpp" line="4806"/>
-        <location filename="onmainwindow.cpp" line="7138"/>
-        <location filename="onmainwindow.cpp" line="7220"/>
-        <location filename="onmainwindow.cpp" line="7597"/>
-        <location filename="onmainwindow.cpp" line="7662"/>
-        <location filename="onmainwindow.cpp" line="8749"/>
         <source><b>Connection failed</b>
 </source>
         <translation><b>Tilkoblingen feilet</b>
@@ -1320,23 +998,18 @@ Do you want to terminate the connection?
         <translation type="obsolete">es konnte kein Server gefunden werden</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10903"/>
         <source>Session ID</source>
         <translation>Sesjons ID</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4632"/>
         <source>suspending</source>
         <translation>Kobler fra</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4667"/>
         <source>terminating</source>
         <translation>Avslutter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6275"/>
-        <location filename="onmainwindow.cpp" line="6305"/>
         <source><b>Connection failed</b>
 :
 </source>
@@ -1371,18 +1044,14 @@ Do you want to terminate the connection?
         <translation type="obsolete">Usage: x2goclient [Options]            Options:            --help                           Print this message            --help-pack                      Print availabel pack methods            --no-menu                        Hide menu bar            --maximize                       Start maximized            --add-to-known-hosts             Add RSA key fingerprint to .ssh/known_hosts 		                             if authenticity of server can&apos [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8854"/>
         <source>Unable to read :
 </source>
-        <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment>
         <translation>Klarer ikke å lese:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8881"/>
         <source>Unable to write :
 </source>
-        <translatorcomment>need to check the length of the norwegian string here, I don't know how it will look in the UI</translatorcomment>
         <translation>Klarer ikke å skrive:
 </translation>
     </message>
@@ -1391,18 +1060,14 @@ Do you want to terminate the connection?
         <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  [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4809"/>
         <source><b>Wrong Password!</b><br><br></source>
-        <translatorcomment>Should we actually tell that it's the password that's wrong? Isn't that considered bad practice in regards to security? I propose to use "Wrong Username or Password!" instead.</translatorcomment>
         <translation><b>Feil passord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6954"/>
         <source>wrong value for argument"--ldap1"</source>
         <translation>ugyldig verdi for parameteren "--ldap1"</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6973"/>
         <source>wrong value for argument"--ldap2"</source>
         <translation>ugyldig verdi for parameteren "--ldap2"</translation>
     </message>
@@ -1431,12 +1096,10 @@ Do you want to terminate the connection?
         <translation type="obsolete">Usage: x2goclient [Options]			Options:			--help                           Print this message			--help-pack                      Print availabel pack methods			--no-menu                        Hide menu bar			--maximize                       Start maximized			--add-to-known-hosts             Add RSA key fingerprint to .ssh/known_hosts 			if authenticity of server can't be established			--ldap=<host:port:dn>            Start with LDAP Support [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8303"/>
         <source>Unable to create file: </source>
         <translation>Klarer ikke å opprette filen: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8219"/>
         <source>No valid card found</source>
         <translation>Ingen gyldige kort ble funnet</translation>
     </message>
@@ -1445,16 +1108,11 @@ Do you want to terminate the connection?
         <translation type="obsolete">Diese Karte ist dem X2Go System unbekannt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="356"/>
         <source>&Settings ...</source>
-        <translatorcomment>Need to revisit the keybindings in all the Norwegian strings to check for consistency and collisions</translatorcomment>
         <translation>&Innstillinger ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7098"/>
-        <location filename="onmainwindow.cpp" line="7125"/>
         <source>Options</source>
-        <translatorcomment>Hm.. Should we actually use different words here in Norwegian? Or could they mean the same? Need to check the UI first</translatorcomment>
         <translation>Alternativer</translation>
     </message>
     <message>
@@ -1466,11 +1124,8 @@ Do you want to terminate the connection?
         <translation type="obsolete">Klarte ikke å koble til X-Serveren</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8590"/>
         <source>Can't connect to X server
 Please check your settings</source>
-        <oldsource>Can't connect to X-Server
-Please check your settings</oldsource>
         <translation>Klarte ikke å koble til X-Serveren
 Vennligst sjekk innstillingene dine</translation>
     </message>
@@ -1485,44 +1140,27 @@ Please check your settings</source>
 Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4515"/>
-        <location filename="onmainwindow.cpp" line="4535"/>
         <source>Your current color depth is different to the color depth of your x2go-session. This may cause problems reconnecting to this session and in most cases <b>you will loose the session</b> and have to start a new one! It's highly recommended to change the color depth of your Display to </source>
         <translation>Din nåværende fargedybde er forskjellig fra fargedybden i din x2go sesjon. Dette kan skape problemer ved gjenoppkobling til denne sesjonen, og i de fleste tilfellene <b>vil du miste hele sesjonen</b>. og du må starte en ny en! Det er sterkt anbefalt å endre fargedybden på skjemen din til </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4523"/>
         <source>24 or 32</source>
         <translation>24 eller 32</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4524"/>
-        <location filename="onmainwindow.cpp" line="4544"/>
         <source> bit and restart your X-server before you reconnect to this x2go-session.<br>Resume this session anyway?</source>
         <translation> bit og deretter restarte X-Serveren før du kobler til denne x2go sesjonen. <br>Gjenoppta denne sesjonen uansett?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3002"/>
-        <location filename="onmainwindow.cpp" line="3029"/>
-        <location filename="onmainwindow.cpp" line="3070"/>
-        <location filename="onmainwindow.cpp" line="4527"/>
-        <location filename="onmainwindow.cpp" line="4547"/>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3002"/>
-        <location filename="onmainwindow.cpp" line="3029"/>
-        <location filename="onmainwindow.cpp" line="3070"/>
-        <location filename="onmainwindow.cpp" line="4528"/>
-        <location filename="onmainwindow.cpp" line="4548"/>
         <source>No</source>
         <translation>Nei</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7936"/>
         <source><b>X2Go Client V. </source>
-        <translatorcomment><b>X2Go klient V. </translatorcomment>
         <translation><b>X2Go Client V. </translation>
     </message>
     <message>
@@ -1534,44 +1172,35 @@ Vennligst sjekk instillingene dine</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 ka [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="183"/>
         <source>OpenOffice.org</source>
         <translation>OpenOffice.org</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="184"/>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3654"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10892"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10894"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4350"/>
         <source>Desktop</source>
         <translation>Skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4352"/>
         <source>single application</source>
         <translation>enkel applikasjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4354"/>
         <source>shadow session</source>
-        <translatorcomment>hm.. Need to revisit this one, not sure if I should use a better technical term in Norwegian</translatorcomment>
         <translation>skygge sesjonen</translation>
     </message>
     <message>
@@ -1579,134 +1208,94 @@ Vennligst sjekk instillingene dine</translation>
         <translation type="obsolete"><br>Fehler in der Sudo Konfiguration</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8771"/>
-        <location filename="onmainwindow.cpp" line="8776"/>
         <source>Unable to execute: </source>
         <translation>Klarte ikke å utføre:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="157"/>
         <source>X2Go Client</source>
         <translation>X2Go klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="181"/>
         <source>Internet browser</source>
         <translation>Nettleser</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="182"/>
         <source>Email client</source>
         <translation>Epost program</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="757"/>
         <source>&New session ...</source>
         <translation>&Ny sesjon ...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="763"/>
         <source>Session management...</source>
         <translation>Sesjonshåndtering...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="801"/>
-        <location filename="onmainwindow.cpp" line="822"/>
         <source>Show toolbar</source>
         <translation>Vis verktøylinje</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="367"/>
-        <location filename="onmainwindow.cpp" line="7935"/>
         <source>About X2GO client</source>
         <translation>Om X2GO klient</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1692"/>
-        <location filename="onmainwindow.cpp" line="1877"/>
-        <location filename="onmainwindow.cpp" line="1907"/>
         <source>Please check LDAP settings</source>
         <translation>Vennligst sjekk LDAP innstillingene</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1727"/>
         <source>no X2Go server found in LDAP </source>
         <translation>Inge X2Go server ble funnet i LDAP </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2345"/>
         <source>Are you sure you want to delete this session?</source>
         <translation>Er du sikker på at du ønsker å fjerne denne sesjonen?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3524"/>
-        <location filename="onmainwindow.cpp" line="4682"/>
-        <location filename="onmainwindow.cpp" line="4776"/>
-        <location filename="onmainwindow.cpp" line="6278"/>
-        <location filename="onmainwindow.cpp" line="6308"/>
-        <location filename="onmainwindow.cpp" line="7141"/>
-        <location filename="onmainwindow.cpp" line="7223"/>
-        <location filename="onmainwindow.cpp" line="7600"/>
-        <location filename="onmainwindow.cpp" line="7665"/>
-        <location filename="onmainwindow.cpp" line="8752"/>
         <source><b>Wrong password!</b><br><br></source>
         <translation><b>Feil passord!</b><br><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3721"/>
         <source>No server availabel</source>
         <translation>Ingen tilgjengelig server</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1044"/>
-        <location filename="onmainwindow.cpp" line="5538"/>
         <source>Not connected</source>
-        <oldsource>Active connection</oldsource>
         <translation>Ikke tilkoblet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="6002"/>
-        <location filename="onmainwindow.cpp" line="10899"/>
         <source>Creation time</source>
         <translation>Opprettelsestidspunkt</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7472"/>
         <source>Unable to create folder:</source>
         <translation>Klarer ikke å opprette katalogen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2960"/>
         <source>Enter passphrase to decrypt a key</source>
         <translation>Oppgi passordfrase for dekryptere en nøkkel</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2183"/>
         <source>No X2Go sessions found, closing.</source>
         <translation>Ingen X2Go sesjoner ble funnet, lukker.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2814"/>
         <source>Starting connection to server: </source>
         <translation>Starter tilkobling til server: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2823"/>
         <source> to </source>
         <translation> til </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2868"/>
         <source>Connection Error(</source>
         <translation>Tilkoblingsfeil(</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2937"/>
         <source>Couldn't find a SSH connection.</source>
         <translation>Klarte ikke å finne en SSH tilkobling.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2996"/>
         <source>Host key for server changed.
 It is now: </source>
         <translation>Vertsnøkkel for serveren har endret seg.
@@ -1721,63 +1310,40 @@ Den er nå: </translation>
         <translation type="obsolete">Vertsnøkkelen for denne serveren ble ikke funnet, men en annen type av nøkkel eksisterer. En angriper kan endre standard server nøkkel for å lure klienten din til å tro at nøkkelen ikke finnes</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3061"/>
         <source>Could not find known host file.If you accept the host key here, the file will be automatically created</source>
         <translation>Kan ikke finne "known host" filen. Om du aksepterer vertsnøkkelen her vil filen automatisk bli opprettet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3066"/>
         <source>The server is unknown. Do you trust the host key?
 Public key hash: </source>
         <translation>Serveren er ukjent. Stoler du på vertsnøkkelen?
 Offentlig nøkkel: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3001"/>
-        <location filename="onmainwindow.cpp" line="3011"/>
-        <location filename="onmainwindow.cpp" line="3028"/>
-        <location filename="onmainwindow.cpp" line="3038"/>
-        <location filename="onmainwindow.cpp" line="3070"/>
-        <location filename="onmainwindow.cpp" line="3080"/>
         <source>Host key verification failed</source>
         <translation>Verifiseringen av vertsnøkkelen feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3108"/>
         <source>Authentication failed: </source>
         <translation>Autentisering feilet: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3112"/>
         <source>Authentication failed</source>
         <translation>Pålogging feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3500"/>
         <source>Enter password for SSH proxy</source>
         <translation>Oppgi passord for SSH proxy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3536"/>
-        <location filename="onmainwindow.cpp" line="3539"/>
-        <location filename="onmainwindow.cpp" line="3541"/>
-        <location filename="onmainwindow.cpp" line="7612"/>
-        <location filename="onmainwindow.cpp" line="7615"/>
-        <location filename="onmainwindow.cpp" line="7617"/>
         <source>Connection failed: </source>
         <translation>Tilkoblingen feilet: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3539"/>
-        <location filename="onmainwindow.cpp" line="7615"/>
         <source> - Wrong password.</source>
         <translation> - Feil passord.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="3730"/>
-        <location filename="onmainwindow.cpp" line="4062"/>
-        <location filename="onmainwindow.cpp" line="4606"/>
-        <location filename="onmainwindow.cpp" line="4751"/>
         <source>Server not availabel</source>
         <translation>Serveren er ikke tilgjengelig</translation>
     </message>
@@ -1786,209 +1352,156 @@ Offentlig nøkkel: </translation>
         <translation type="obsolete">Klarer ikke å skrive til filen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5430"/>
-        <location filename="onmainwindow.cpp" line="8827"/>
         <source>Unable to create SSL tunnel:
 </source>
         <translation>Klarte ikke å opprette SSL tunnel:
 </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10626"/>
         <source><b>Session ID:<br>Server:<br>Username:<br>Display:<br>Creation time:<br>Status:</b></source>
-        <translatorcomment>Uncertain if the translation for "Creation time" is the most fitting one.</translatorcomment>
         <translation><b>Sesjons ID:<br>Server:<br>Brukernavn:<br>Skjerm:<br>Opprettet:<br>Status:</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="566"/>
-        <location filename="onmainwindow.cpp" line="1071"/>
-        <location filename="onmainwindow.cpp" line="10643"/>
         <source>Share folder...</source>
         <translation>Del mappe...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10661"/>
         <source>Show details</source>
-        <translation>Vis detailjer</translation>
+        <translation>Vis detaljer</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8275"/>
         <source>This card is unknown by X2Go system</source>
-        <translatorcomment>Need to double-check if the translation of "card" is suitable here</translatorcomment>
         <translation>Dette kortet er ukjent for X2Go systemet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8591"/>
         <source>Can't start X server
 Please check your settings</source>
         <translation>Klarte ikke å starte X-Serveren
 Vennligst sjekk instillingene dine</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8801"/>
         <source>Remote server does not support file system export through SSH Tunnel
 Please update to a newer x2goserver package</source>
         <translation>Serveren støtter ikke eksport av filsystemet over en SSH Tunnel
 Vennligst oppdater til en nyere x2goserver pakke</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="774"/>
         <source>&Create session icon on desktop...</source>
         <translation>&Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="50"/>
         <source>Starting x2goclient...</source>
-        <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment>
         <translation>Starter x2goclient...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="234"/>
         <source>Starting x2goclient in portable mode... data directory is: </source>
-        <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment>
         <translation>Starter x2goclient i portabel modus... data-katalogen er: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="465"/>
         <source>Started  x2goclient.</source>
-        <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment>
         <translation>Startet x2goclient.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="527"/>
-        <location filename="onmainwindow.cpp" line="540"/>
         <source>Can't load translator: </source>
         <translation>Kan ikke laste oversetter: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="532"/>
-        <location filename="onmainwindow.cpp" line="545"/>
         <source>Translator: </source>
         <translation>Oversetter: </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="532"/>
-        <location filename="onmainwindow.cpp" line="545"/>
         <source> installed.</source>
         <translation> installert.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="783"/>
         <source>&Set broker password...</source>
-        <translatorcomment>Still uncertain what to best use as a translation for "broker"</translatorcomment>
         <translation>&Sett megler passord...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="794"/>
         <source>&Connectivity test...</source>
         <translation>&Tilkoblings-test...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="910"/>
         <source>Operation failed</source>
         <translation>Handlingen feilet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="914"/>
         <source>Password changed</source>
         <translation>Passordet er endret</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="939"/>
         <source>Wrong password!</source>
         <translation>Feil passord!</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="992"/>
         <source><b>Authentication</b></source>
         <translation><b>Autentisering</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1042"/>
         <source>Restore</source>
         <translation>Gjenopprett</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1046"/>
         <source>Multimedia</source>
         <translation>Multimedia</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1048"/>
         <source>Development</source>
         <translation>Utvikling</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1050"/>
         <source>Education</source>
         <translation>Opplæring</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1052"/>
         <source>Game</source>
         <translation>Spill</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1054"/>
         <source>Graphics</source>
         <translation>Grafikk</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1056"/>
         <source>Network</source>
         <translation>Nettverk</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1058"/>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1060"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1062"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1064"/>
         <source>Utility</source>
         <translation>Verktøy</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1066"/>
         <source>Other</source>
         <translation>Andre</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1101"/>
         <source>Left mouse button to hide/restore - Right mouse button to display context menu</source>
-        <oldsource>Left click to open the X2GoClient window or right click to get the context menu.</oldsource>
-        <translatorcomment>According to the Norwegian skolelinux translation projects discussion on the words "context menu", I've chosen to follow their guidance and used "sprettoppmeny"</translatorcomment>
         <translation>Venstre museknapp for å skjule/gjenopprette  -  Høyre museknapp viser sprettoppmeny</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1272"/>
         <source>Closing x2goclient...</source>
-        <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment>
         <translation>Lukker x2goclient...</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="1420"/>
         <source>Closed  x2goclient.</source>
-        <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment>
         <translation>Lukket x2goclient.</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2040"/>
         <source>Create session icon on desktop</source>
         <translation>Opprett sesjonsikon på skrivebordet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2041"/>
         <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>
@@ -1997,12 +1510,10 @@ Use x2goclient hidden mode?</source>
 Ønsker du å aktivere skjult modus for x2goklient?</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2051"/>
         <source>Show session tray icon when running</source>
-        <translation type="unfinished"></translation>
+        <translation>Hvis sesjonsikon i systemkurven når sesjonen kjører</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2065"/>
         <source>New Session</source>
         <translation>Ny sesjon</translation>
     </message>
@@ -2011,35 +1522,26 @@ Use x2goclient hidden mode?</source>
         <translation type="obsolete">X2Go sesjoner ble ikke funnet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2743"/>
         <source>RDP connection</source>
         <translation>RDP tilkobling</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2125"/>
         <source>X2Go Link to session </source>
-        <translatorcomment>Uncertain of the context here, need to doublecheck this.</translatorcomment>
         <translation>X2Go kobling til sesjon </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="581"/>
-        <location filename="onmainwindow.cpp" line="10060"/>
         <source>Detach X2Go window</source>
         <translation>Løsne X2Go vindu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5404"/>
-        <location filename="onmainwindow.cpp" line="10035"/>
         <source>Attach X2Go window</source>
         <translation>Feste X2Go vindu</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5645"/>
         <source>Finished</source>
         <translation>Ferdig</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="5904"/>
         <source>Are you sure you want to terminate this session?
 Unsaved documents will be lost</source>
         <translation>Er du sikker på at du vil avslutte denne sesjonen?
@@ -2050,27 +1552,20 @@ Ulagrede data vil gå tapt</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 ka [...]
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8605"/>
-        <location filename="onmainwindow.cpp" line="9262"/>
-        <location filename="onmainwindow.cpp" line="9292"/>
         <source>Can't start X Server
 Please check your installation</source>
         <translation>Klarer ikke å starte X Serveren
 Vennligst sjekk din installasjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10128"/>
         <source>X2Go Session</source>
         <translation>X2Go sesjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="584"/>
-        <location filename="onmainwindow.cpp" line="11120"/>
         <source>Minimize toolbar</source>
         <translation>Minimer verktøylinje</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11154"/>
         <source><br><b>&nbsp;&nbsp;&nbsp;Click this button&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;to restore toolbar&nbsp;&nbsp;&nbsp;</b><br></source>
         <translation><br><b>&nbsp;&nbsp;&nbsp;Trykk her&nbsp;&nbsp;&nbsp;<br> &nbsp;&nbsp;&nbsp;for å gjenopprette&nbsp;&nbsp;&nbsp;<br>&nbsp;&nbsp;&nbsp;verktøylinjen&nbsp;&nbsp;&nbsp;</b><br></translation>
     </message>
@@ -2079,7 +1574,6 @@ Vennligst sjekk din installasjon</translation>
         <translation type="obsolete">Konfigurationsdatei lässt sich nicht öffnen:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="11035"/>
         <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>
@@ -2088,65 +1582,50 @@ Du kan installere sshd med:
 <b>sudo apt-get install openssh-server</b></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2751"/>
         <source>Connection to local desktop</source>
         <translation>Tilkobling til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4387"/>
         <source>Information</source>
         <translation>Informasjon</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4401"/>
-        <location filename="onmainwindow.cpp" line="11224"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4408"/>
         <source>Select desktop:</source>
         <translation>Velg skrivebord:</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10827"/>
         <source>View only</source>
         <translation>Kun vis</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10907"/>
         <source>User</source>
         <translation>Bruker</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="2747"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="4388"/>
         <source>No accessible desktop found</source>
         <translation>Ingen tilgjengelige skrivebord ble funnet</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10824"/>
         <source>Full access</source>
         <translation>Full tilgang</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10938"/>
         <source>Only my desktops</source>
         <translation>Kun mine skrivebord</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="577"/>
         <source>Reconnect</source>
         <translation>Gjenoppkoble</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="943"/>
-        <location filename="onmainwindow.cpp" line="3156"/>
-        <location filename="onmainwindow.cpp" line="11292"/>
         <source>Connecting to broker</source>
         <translation>Koble til megleren</translation>
     </message>
@@ -2155,27 +1634,22 @@ Du kan installere sshd med:
         <translation type="obsolete"></b><br> (C. 2006-2010 <b>obviously nice</b>: Oleksandr Shneyder, Heinz-Markus Graesing)<br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7919"/>
         <source><br>x2goplugin mode was sponsored by <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></source>
         <translation><br>x2goplugin modusen ble sponset av <a href="http://www.foss-group.de/">FOSS-Group GmbH(Freiburg)</a><br></translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="7923"/>
         <source><br>Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source>
         <translation><br>Ein Client für den Zugriff auf die serverbasierende Anwendungsumgebung X2Go. Mit Hilfe dieser Anwendung können Sie Sitzungen eines X2Go Servers starten, stoppen, laufende Sitzungen fortführen oder anhalten und verschiedene Sitzungskonfigurationen verwalten. Die Authentifizierung kann über LDAP erfolgen und das Programm kann im Vollbildmodus (als Ersatz für XDM) gestartet werden. Weitere Informationen erhalten SIe auf x2go.org. </translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8968"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="8980"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
     <message>
-        <location filename="onmainwindow.cpp" line="10329"/>
         <source>wrong value for argument"speed"</source>
         <translation>wrong value for argument"speed"</translation>
     </message>
@@ -2187,51 +1661,39 @@ Du kan installere sshd med:
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="printdialog.ui" line="18"/>
         <source>Print - X2Go Client</source>
         <translation>Utskrift - X2Go klient</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="31"/>
         <source>Print</source>
-        <translatorcomment>note to myself: Need to doublecheck the context of this word, other places 'utskrift' is a better translation, but I'm guessing this the actual print-button text.</translatorcomment>
         <translation>Skriv ut</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="60"/>
         <source>You've deactivated the x2go client printing dialog.</source>
         <translation>Du har deaktivert X2Go klientens utskriftsdialog.</translation>
     </message>
     <message>
-        <location filename="printdialog.cpp" line="62"/>
         <source>You may reactivate this dialog using the x2goclient settings dialog (Menu -> Options -> Settings)</source>
-        <translatorcomment>Hm... This indicates that I might have overlooked the usage of the word 'settings' somewhere - will have to look how this will look.</translatorcomment>
         <translation>Du kan reaktivere denne dialogen ved å benytte x2goclient innstillingene (Meny -> Innstillinger -> Innstillinger)</translation>
     </message>
 </context>
 <context>
     <name>PrintProcess</name>
     <message>
-        <location filename="printprocess.cpp" line="161"/>
         <source>Save File</source>
         <translation>Lagre fil</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="163"/>
         <source>PDF Document (*.pdf)</source>
         <translation>PDF Dokuemtn (*.pdf)</translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="257"/>
-        <location filename="printprocess.cpp" line="280"/>
         <source>Failed to execute command:
 </source>
         <translation>Klarte ikke å utføre kommandoen:
 </translation>
     </message>
     <message>
-        <location filename="printprocess.cpp" line="272"/>
-        <location filename="printprocess.cpp" line="279"/>
         <source>Printing error</source>
         <translation>Utskriftsfeil</translation>
     </message>
@@ -2239,74 +1701,60 @@ Du kan installere sshd med:
 <context>
     <name>PrintWidget</name>
     <message>
-        <location filename="printwidget.ui" line="15"/>
         <source>Form</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="25"/>
         <source>Print</source>
         <translation>Utskrift</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="35"/>
         <source>View as PDF</source>
         <translation>Vis som PDF</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="65"/>
         <source>Print settings</source>
         <translation>Utskriftsinnstillinger</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="71"/>
         <source>Printer:</source>
         <translation>Skriver:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="81"/>
         <source>Print using default Windows PDF Viewer
 (Viewer application needs to be installed)</source>
         <translation>Skriv ut via standard Windows PDF leser
 (lese programmet må være installert)</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="96"/>
         <source>Printer command:</source>
         <translation>Utskriftskommando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="118"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="149"/>
         <source>Viewer settings</source>
         <translation>Instillinger for PDF leser</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="155"/>
         <source>Open in viewer application</source>
         <translation>Åpne i leseprogrammet</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="167"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="179"/>
         <source>Save to disk</source>
         <translation>Lagre til disk</translation>
     </message>
     <message>
-        <location filename="printwidget.ui" line="209"/>
         <source>Show this dialog before start printing</source>
         <translation>Vis denne dialogen før start av utskrift</translation>
     </message>
     <message>
-        <location filename="printwidget.cpp" line="59"/>
         <source>Please configure your client side printing settings.<br><br>If you want to print the created file, you'll need an external application. Typically you can use <a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> and <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>You can find  further information <a href="http://www.x2go.org/index.php?id=49">here</ [...]
         <translation>Vennligst sett opp innstillingene for utskrift på klientsiden.<br><br>Om du ønsker å skrive ut den opprettede filen så trengs en ekstern applikasjon. Typisk kan du benytte<a href="http://pages.cs.wisc.edu/~ghost/doc/GPL/index.htm">ghostprint</a> og <a href="http://pages.cs.wisc.edu/~ghost/gsview/">ghostview</a><br>Du kan finne ytterlig informasjon <a href="http://www.x2go.org/index.php?id=49"& [...]
     </message>
@@ -2314,17 +1762,14 @@ Du kan installere sshd med:
 <context>
     <name>PrinterCmdDialog</name>
     <message>
-        <location filename="printercmddialog.ui" line="15"/>
         <source>Printer command</source>
         <translation>Utskriftskommando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="21"/>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="27"/>
         <source>Please enter your customized or individual printing command.
 Examples:
 kprinter
@@ -2335,47 +1780,38 @@ kprinter
 lpr -P hp_laserjet</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="46"/>
         <source>Output format</source>
         <translation>Utformat</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="52"/>
         <source>Please choose the printing file format (regarding to your printing environment - if you use CUPS you may use PDF)</source>
         <translation>Vennligst velg filformat for utskrift (relatert til ditt uskriftsoppsett - om du benytter CUPS kan du bruke PDF)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="68"/>
         <source>PDF</source>
         <translation>PDF</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="75"/>
         <source>PS</source>
         <translation>PS</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="88"/>
         <source>Data structure</source>
         <translation>Datastruktur</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="94"/>
         <source>Please choose the method of printing file input (some commands accepting printing files as program options, some are awaiting data on standard input):</source>
         <translation>Vennligst velg metoden for inndatafil for utskrift (noen kommandoer aksepterer utskriftsfiler som programparametere, noen forventer data på standard inn):</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="110"/>
         <source>standard input (STDIN)</source>
         <translation>Standard inn (STDIN)</translation>
     </message>
     <message>
-        <location filename="printercmddialog.ui" line="117"/>
         <source>Specify path as program parameter</source>
         <translation>Spesifiser stien som programparameter</translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="43"/>
         <source>Please enter your customized or individual printing command.
 Example:
 </source>
@@ -2384,16 +1820,13 @@ Eksempel:
 </translation>
     </message>
     <message>
-        <location filename="printercmddialog.cpp" line="51"/>
         <source><Path to gsprint.exe> -query -color</source>
-        <translatorcomment>Need to doublecheck this one</translatorcomment>
         <translation><Sti til gsprint.exe> -query -color</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="ongetpass.cpp" line="79"/>
         <source>No response received from the remote server. Do you want to terminate the current session?</source>
         <translation>Ingen respons mottatt fra serveren. Ønsker du å avslutte gjeldende sesjon?</translation>
     </message>
@@ -2401,127 +1834,86 @@ Eksempel:
 <context>
     <name>SessionButton</name>
     <message>
-        <location filename="sessionbutton.cpp" line="136"/>
         <source>Session preferences...</source>
         <translation>Sesjonsinnstillinger...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="140"/>
         <source>Create session icon on desktop...</source>
         <translation>Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="145"/>
         <source>Delete session</source>
         <translation>Slett sesjon</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="158"/>
         <source>Session actions</source>
         <translation>Sesjonshandlinger</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="159"/>
         <source>Select type</source>
         <translation>Velg type</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="161"/>
         <source>Select resolution</source>
         <translation>Velg oppløsning</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="162"/>
         <source>Toggle sound support</source>
         <translation>Slå av/på lydstøtte</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="292"/>
         <source>New Session</source>
         <translation>Ny sesjon</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="297"/>
         <source>running</source>
         <translation>aktiv</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="301"/>
         <source>suspended</source>
         <translation>frakoblet</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="335"/>
         <source>KDE</source>
         <translation>KDE</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="351"/>
-        <location filename="sessionbutton.cpp" line="403"/>
-        <location filename="sessionbutton.cpp" line="704"/>
         <source>RDP connection</source>
         <translation>RDP tilkobling</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="352"/>
-        <location filename="sessionbutton.cpp" line="409"/>
-        <location filename="sessionbutton.cpp" line="710"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="353"/>
-        <location filename="sessionbutton.cpp" line="394"/>
-        <location filename="sessionbutton.cpp" line="698"/>
         <source>Connection to local desktop</source>
         <translation>Tilkobling til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="354"/>
-        <location filename="sessionbutton.cpp" line="414"/>
-        <location filename="sessionbutton.cpp" line="751"/>
         <source>Published applications</source>
         <translation>Publiserte applikasjoner</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="438"/>
-        <location filename="sessionbutton.cpp" line="463"/>
-        <location filename="sessionbutton.cpp" line="772"/>
         <source>fullscreen</source>
         <translation>fullskjerm</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="443"/>
-        <location filename="sessionbutton.cpp" line="473"/>
-        <location filename="sessionbutton.cpp" line="477"/>
-        <location filename="sessionbutton.cpp" line="785"/>
-        <location filename="sessionbutton.cpp" line="788"/>
         <source>Display </source>
         <translation>Skjerm </translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="458"/>
-        <location filename="sessionbutton.cpp" line="498"/>
         <source>window</source>
         <translation>vindu</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="505"/>
-        <location filename="sessionbutton.cpp" line="509"/>
-        <location filename="sessionbutton.cpp" line="510"/>
-        <location filename="sessionbutton.cpp" line="778"/>
         <source>Maximum</source>
         <translation>Maksimalt</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="517"/>
-        <location filename="sessionbutton.cpp" line="647"/>
         <source>Enabled</source>
         <translation>Aktivert</translation>
     </message>
     <message>
-        <location filename="sessionbutton.cpp" line="519"/>
-        <location filename="sessionbutton.cpp" line="649"/>
         <source>Disabled</source>
         <translation>Deaktivert</translation>
     </message>
@@ -2529,38 +1921,31 @@ Eksempel:
 <context>
     <name>SessionManageDialog</name>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="41"/>
         <source>E&xit</source>
         <translation>&Avslutt</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="47"/>
         <source>&New session</source>
         <translation>&Ny sesjon</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="48"/>
         <source>&Session preferences</source>
         <translation>&Sesjonsinnstillinger</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="49"/>
         <source>&Delete session</source>
         <translation>S&lett sesjon</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="53"/>
         <source>&Create session icon on desktop...</source>
         <translation>&Opprett sesjonsikon på skrivebordet...</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="87"/>
         <source>Delete</source>
         <comment>Delete</comment>
         <translation>Slett</translation>
     </message>
     <message>
-        <location filename="sessionmanagedialog.cpp" line="115"/>
         <source>Session management</source>
         <translation>Sesjonshåndtering</translation>
     </message>
@@ -2568,233 +1953,174 @@ Eksempel:
 <context>
     <name>SessionWidget</name>
     <message>
-        <location filename="sessionwidget.cpp" line="62"/>
         <source>Session name:</source>
         <translation>Sesjonsnavn:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="67"/>
         <source><< change icon</source>
         <translation><< endre ikon</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="70"/>
         <source>&Server</source>
         <translation>&Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="103"/>
-        <location filename="sessionwidget.cpp" line="165"/>
         <source>Host:</source>
         <translation>Vert:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="104"/>
-        <location filename="sessionwidget.cpp" line="171"/>
         <source>Login:</source>
         <translation>Brukernavn:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="105"/>
-        <location filename="sessionwidget.cpp" line="374"/>
         <source>SSH port:</source>
         <translation>SSH port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="120"/>
         <source>Use RSA/DSA key for ssh connection:</source>
         <translation>Bruk RSA/DSA  nøkkel for SSH tilkobling:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="127"/>
         <source>Try auto login (ssh-agent or default ssh key)</source>
         <translation>Forsøk automatisk pålogging (SSH agent, eller standard SSH nøkkel)</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="128"/>
-        <location filename="sessionwidget.cpp" line="159"/>
         <source>Kerberos 5 (GSSAPI) authentication</source>
         <translation>Kerberos 5 (GSSAPI) autentisering</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="129"/>
         <source>Delegation of GSSAPI credentials to the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Delegering av GSSAPI fullmakt til server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="133"/>
         <source>Use Proxy server for SSH connection</source>
         <translation>Bruk proxyserver for SSH tilkobling</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="134"/>
         <source>Proxy server</source>
         <translation>Proxyserver</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="140"/>
         <source>SSH</source>
         <translation>SSH</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="141"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="149"/>
         <source>Same login as on X2Go Server</source>
         <translation>Samme innlogging som på X2Go Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="151"/>
         <source>Same password as on X2Go Server</source>
         <translation>Samme passord som på X2Go Server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="153"/>
         <source>RSA/DSA key:</source>
         <translation>RSA/DSA nøkkel:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="158"/>
         <source>ssh-agent or default ssh key</source>
         <translation>SSH-agent, eller standard SSH nøkkel</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="162"/>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="166"/>
         <source>Port:</source>
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="182"/>
         <source>&Session type</source>
         <translation>&Sesjontype</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="187"/>
         <source>Session type:</source>
         <translation>Sesjontype:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="199"/>
-        <location filename="sessionwidget.cpp" line="498"/>
         <source>Connect to Windows terminal server</source>
         <translation>Koble til Windows terminal server</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="200"/>
         <source>XDMCP</source>
         <translation>XDMCP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="201"/>
         <source>Connect to local desktop</source>
         <translation>Koble til lokalt skrivebord</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="202"/>
         <source>Custom desktop</source>
-        <translatorcomment>The normal "brukertilpasset" doesn't fit here</translatorcomment>
         <translation>Selvvalgt skrivebord</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="203"/>
         <source>Single application</source>
         <translation>Enkel applikasjon</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="204"/>
         <source>Published applications</source>
         <translation>Publiserte applikasjoner</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="206"/>
-        <location filename="sessionwidget.cpp" line="442"/>
         <source>Command:</source>
         <translation>Kommando:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="207"/>
         <source>Advanced options...</source>
         <translation>Avanserte alternativer...</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="219"/>
-        <location filename="sessionwidget.cpp" line="741"/>
-        <location filename="sessionwidget.cpp" line="838"/>
         <source>Path to executable</source>
         <translation>Sti til programfil</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="229"/>
         <source>Direct RDP Connection</source>
         <translation>Direktekobling med RDP</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="370"/>
         <source>RDP port:</source>
         <translation>RDP port:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="386"/>
         <source>Open picture</source>
         <translation>Åpne bilde</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="388"/>
         <source>Pictures</source>
         <translation>Bilder</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="296"/>
-        <location filename="sessionwidget.cpp" line="409"/>
         <source>Open key file</source>
         <translation>Åpne nøkkelfil</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="298"/>
-        <location filename="sessionwidget.cpp" line="411"/>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="308"/>
-        <location filename="sessionwidget.cpp" line="421"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="309"/>
-        <location filename="sessionwidget.cpp" line="422"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
         <translation>x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="469"/>
-        <location filename="sessionwidget.cpp" line="695"/>
         <source>Server:</source>
         <translation>Server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="478"/>
-        <location filename="sessionwidget.cpp" line="707"/>
         <source>XDMCP server:</source>
         <translation>XDMCP server:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="499"/>
         <source>rdesktop command line options:</source>
         <translation>rdesktop kommandolinjevalg:</translation>
     </message>
     <message>
-        <location filename="sessionwidget.cpp" line="512"/>
-        <location filename="sessionwidget.cpp" line="719"/>
         <source>New session</source>
         <translation>Ny sesjon</translation>
     </message>
@@ -2802,110 +2128,86 @@ Eksempel:
 <context>
     <name>SettingsWidget</name>
     <message>
-        <location filename="settingswidget.cpp" line="47"/>
-        <location filename="settingswidget.cpp" line="51"/>
         <source>&Display</source>
         <translation>&Skjerm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="48"/>
-        <location filename="settingswidget.cpp" line="52"/>
         <source>&Keyboard</source>
         <translation>&Tastatur</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="49"/>
-        <location filename="settingswidget.cpp" line="53"/>
         <source>Sound</source>
         <translation>Lyd</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="154"/>
         <source>Auto detect keyboard settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdag automatisk tastaturopplegget</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="155"/>
         <source>Do not configure keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikke konfigurer tastaturet</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="156"/>
         <source>Configure keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurer tastaturet</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="167"/>
         <source>Model: </source>
-        <translation type="unfinished"></translation>
+        <translation>Model: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="170"/>
         <source>Layout: </source>
-        <translation type="unfinished"></translation>
+        <translation>Utseende: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="173"/>
         <source>Variant: </source>
-        <translation type="unfinished"></translation>
+        <translation>Variant: </translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="246"/>
         <source>RDP Client</source>
         <translation>RDP klient</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="64"/>
         <source>Fullscreen</source>
         <translation>Fullskjerm</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="66"/>
         <source>Custom</source>
         <translation>Tilpasset</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="68"/>
         <source>Window</source>
         <translation>Vindu</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="70"/>
         <source>Use whole display</source>
         <translation>Bruk hele skjermen</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="71"/>
         <source>Maximum available</source>
         <translation>Maksimalt tilgjengelig</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="79"/>
         <source>Set display DPI</source>
         <translation>Sett skjermens DPI</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="84"/>
         <source>Xinerama extension (support for two or more physical displays)</source>
         <translation>Xinerama utvidelse (støtte for to, eller flere fysiske skjermer)</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="100"/>
         <source>Width:</source>
         <translation>Bredde:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="103"/>
         <source>Height:</source>
         <translation>Høyde:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="111"/>
         <source>&Display:</source>
         <translation>&Skjerm:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="113"/>
         <source>&Identify all displays</source>
         <translation>&Identifiser alle skjermer</translation>
     </message>
@@ -2922,55 +2224,44 @@ Eksempel:
         <translation type="obsolete">Tastatur modell:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="184"/>
         <source>Enable sound support</source>
         <translation>Aktiver lydstøtte</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="193"/>
         <source>Start sound daemon</source>
-        <translatorcomment>The translated word for daemon is not easy to understand in this context, I choose to use 'tjener' since I never use this as a translation for 'server'</translatorcomment>
         <translation>Start lydtjeneren</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="195"/>
         <source>Use running sound daemon</source>
         <translation>Benytt kjørende lydtjener</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="197"/>
         <source>Use SSH port forwarding to tunnel
 sound system connections through firewalls</source>
         <translation>Benytt SSH port videresendring for å tunnelere
 lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="199"/>
         <source>Use default sound port</source>
         <translation>Benytt standard lyd port</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="206"/>
         <source>Sound port:</source>
         <translation>Lyd port:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="233"/>
         <source>Client side printing support</source>
         <translation>Klientside utskrifts støtte</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="258"/>
         <source>Additional parameters:</source>
         <translation>Ekstra parametere:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="259"/>
         <source>Command line:</source>
         <translation>Kommandolinje:</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="680"/>
         <source>us</source>
         <translation>no</translation>
     </message>
@@ -2979,7 +2270,6 @@ lydsystem forbindelser gjennom brannmurer</translation>
         <translation type="obsolete">pc105/no</translation>
     </message>
     <message>
-        <location filename="settingswidget.cpp" line="836"/>
         <source>password</source>
         <translation>passord</translation>
     </message>
@@ -2987,81 +2277,62 @@ lydsystem forbindelser gjennom brannmurer</translation>
 <context>
     <name>ShareWidget</name>
     <message>
-        <location filename="sharewidget.cpp" line="43"/>
         <source>&Folders</source>
         <translation>&Mapper</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="53"/>
         <source>Path</source>
         <translation>Sti</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="55"/>
-        <location filename="sharewidget.cpp" line="137"/>
         <source>Automount</source>
         <translation>Automonter</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="64"/>
         <source>Add</source>
         <translation>Legg til</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="65"/>
         <source>Delete</source>
         <translation>Slett</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="75"/>
         <source>Path:</source>
         <translation>Sti:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="82"/>
         <source>Filename encoding</source>
         <translation>Tegnkoding av filnavn</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="88"/>
         <source>local:</source>
         <translation>lokal:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="89"/>
         <source>remote:</source>
-        <translatorcomment>ouch! This word is really hard to get right in Norwegian in these contextes...</translatorcomment>
         <translation>fjerntliggende:</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="101"/>
         <source>Use ssh port forwarding to tunnel file system connections through firewalls</source>
         <translation>Benytt SSH port videresendring for å tunnelere lydsystem forbindelser gjennom brannmurer</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="164"/>
         <source>Select folder</source>
         <translation>Velg mappe</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="175"/>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="176"/>
         <source>x2goclient is running in portable mode. You should use a path on your usb device to be able to access your data whereever you are</source>
         <translation>x2goclient kjører i portabel modus. Du burde bruke en sti på din USB enhet for å kunne benytte dataene dine uavhengig av hvor du er</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="235"/>
-        <location filename="sharewidget.cpp" line="286"/>
         <source>WINDOWS-1252</source>
         <translation>WINDOWS-1252</translation>
     </message>
     <message>
-        <location filename="sharewidget.cpp" line="245"/>
-        <location filename="sharewidget.cpp" line="292"/>
         <source>ISO8859-1</source>
         <translation>ISO8859-1</translation>
     </message>
@@ -3069,117 +2340,90 @@ lydsystem forbindelser gjennom brannmurer</translation>
 <context>
     <name>SshMasterConnection</name>
     <message>
-        <location filename="sshmasterconnection.cpp" line="330"/>
         <source>SSH proxy connection error</source>
         <translation>SSH proxy tilkoblingsfeil</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="335"/>
-        <location filename="sshmasterconnection.cpp" line="341"/>
         <source>SSH proxy connection error: </source>
         <translation>SSH proxy tilkoblingsfeil:</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="357"/>
         <source>Failed to create SSH proxy tunnel</source>
         <translation>Klarte ikke å opprette SSH proxy tunnel</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="434"/>
         <source>Can not initialize libssh</source>
-        <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="462"/>
         <source>Can not create ssh session</source>
         <translation>Klarer ikke å opprette ssh sesjon</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="497"/>
         <source>Can not connect to proxy server</source>
         <translation>Klarte ikke å koble til proxyserver</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="527"/>
         <source>Can not connect to </source>
         <translation>Klarer ikke å koble til </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="624"/>
-        <location filename="sshmasterconnection.cpp" line="880"/>
         <source>Authentication failed</source>
         <translation>Autentisering feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="659"/>
         <source>channel_forward_listen failed</source>
-        <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="1154"/>
         <source>Failed to start SSH Client. Please check your installation and GSSApi configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Klarte ikke å starte SSH-klient. Sjekk ditt oppsett og din GSSApi innstillinger</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1180"/>
         <source>Check your GSSApi configuration or choose another authentication method</source>
-        <translation type="unfinished"></translation>
+        <translation>Sjekk ditt GSSApi oppsett, eller velg en annen autentiserings metode</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1279"/>
         <source>Can not open file </source>
         <translation>Kan ikke åpne filen </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1291"/>
         <source>Can not create remote file </source>
         <translation>Klarer ikke å opprette fil over nettverket </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1306"/>
         <source>Can not write to remote file </source>
         <translation>Klarer ikke å skrive til filen over nettverket </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1420"/>
         <source>can not connect to </source>
         <translation>Klarer ikke å koble til </translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1497"/>
         <source>channel_open_forward failed</source>
         <translation>channel_open_forward feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1518"/>
         <source>channel_open_session failed</source>
         <translation>channel_open_session feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1527"/>
         <source>channel_request_exec failed</source>
         <translation>channel_request_exec feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1606"/>
         <source>error writing to socket</source>
-        <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="1628"/>
         <source>error reading channel</source>
         <translation>feil under lesing av kanalen</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1662"/>
         <source>channel_write failed</source>
         <translation>channel_write feilet</translation>
     </message>
     <message>
-        <location filename="sshmasterconnection.cpp" line="1678"/>
         <source>error reading tcp socket</source>
         <translation>feil ved lesing av tcp sokkelen</translation>
     </message>
@@ -3187,12 +2431,10 @@ lydsystem forbindelser gjennom brannmurer</translation>
 <context>
     <name>SshProcess</name>
     <message>
-        <location filename="sshprocess.cpp" line="131"/>
         <source>Error creating socket</source>
         <translation>feil under opprettelse av sokkelen</translation>
     </message>
     <message>
-        <location filename="sshprocess.cpp" line="149"/>
         <source>Error binding </source>
         <translation>Feil ved binding </translation>
     </message>
@@ -3200,12 +2442,10 @@ lydsystem forbindelser gjennom brannmurer</translation>
 <context>
     <name>XSettingsWidget</name>
     <message>
-        <location filename="xsettingswidget.cpp" line="49"/>
         <source>Open File</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="xsettingswidget.cpp" line="51"/>
         <source>Executable (*.exe)</source>
         <translation>Programfil (*.exe)</translation>
     </message>
@@ -3213,71 +2453,55 @@ lydsystem forbindelser gjennom brannmurer</translation>
 <context>
     <name>XSettingsWidgetUI</name>
     <message>
-        <location filename="xsettingsui.ui" line="15"/>
         <source>Form</source>
         <translation>Skjema</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="28"/>
         <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation>Du må restarte X2Go klienten for at endringene skal tre i kraft</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="51"/>
         <source>use integrated X-Server</source>
         <translation>Benytt integrert X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="61"/>
         <source> do not use primary clipboard</source>
         <translation> ikke benytt primær utklippstavle</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="68"/>
         <source>use custom X-Server</source>
         <translation>Benytt egentilpasset X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="78"/>
         <source>custom X-Server</source>
         <translation>egentilpasset X-Server</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="86"/>
         <source>executable:</source>
         <translation>programfil:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="109"/>
         <source>start X-Server on X2Go Client start</source>
         <translation>start X-Serveren når X2Go klienten startes</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="121"/>
         <source>command line options:</source>
-        <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="133"/>
         <source>X-Server command line options</source>
-        <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="139"/>
         <source>window mode:</source>
         <translation>Vindus-modus:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="149"/>
         <source>fullscreen mode:</source>
         <translation>fullskjerm-modus:</translation>
     </message>
     <message>
-        <location filename="xsettingsui.ui" line="159"/>
         <source>single application:</source>
-        <translatorcomment>Not sure if this is the best translation, but I'll stick to this for now</translatorcomment>
         <translation>enkeltapplikasjon:</translation>
     </message>
 </context>

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



More information about the x2go-commits mailing list