[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.1.0.5-2-ged684f5

X2Go dev team git-admin at x2go.org
Sat Jun 8 01:13:27 CEST 2013


The branch, build-main has been updated
       via  ed684f537643e3b50baf40d7c43d7f64a0c29c0f (commit)
      from  db0b079d5320b0bc6b718428c9831775b3ba39a7 (commit)

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

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

Summary of changes:
 debian/changelog            |    4 +-
 qt_da.qm                    |  Bin 0 -> 113560 bytes
 qt_de.qm                    |  Bin 157137 -> 273787 bytes
 qt_es.qm                    |  Bin 0 -> 82602 bytes
 qt_fr.qm                    |  Bin 0 -> 161917 bytes
 qt_ru.qm                    |  Bin 60815 -> 191977 bytes
 qt_sv.qm                    |  Bin 0 -> 65830 bytes
 qt_zh_tw.qm                 |  Bin 0 -> 112498 bytes
 resources.rcc               |   11 +++
 x2godesktopsharing.pro      |   28 +++++++-
 x2godesktopsharing_da.ts    |  163 +++++++++++++++++++++++++++++++++++++++++++
 x2godesktopsharing_de.qm    |  Bin 6816 -> 0 bytes
 x2godesktopsharing_de.ts    |   58 ++++++++-------
 x2godesktopsharing_es.ts    |  163 +++++++++++++++++++++++++++++++++++++++++++
 x2godesktopsharing_fr.ts    |  163 +++++++++++++++++++++++++++++++++++++++++++
 x2godesktopsharing_nb_no.ts |  163 +++++++++++++++++++++++++++++++++++++++++++
 x2godesktopsharing_ru.qm    |  Bin 6961 -> 0 bytes
 x2godesktopsharing_ru.ts    |   58 ++++++++-------
 x2godesktopsharing_sv.ts    |  163 +++++++++++++++++++++++++++++++++++++++++++
 x2godesktopsharing_zh_tw    |  163 +++++++++++++++++++++++++++++++++++++++++++
 20 files changed, 1081 insertions(+), 56 deletions(-)
 create mode 100644 qt_da.qm
 create mode 100644 qt_es.qm
 create mode 100644 qt_fr.qm
 create mode 100644 qt_sv.qm
 create mode 100644 qt_zh_tw.qm
 create mode 100644 x2godesktopsharing_da.ts
 delete mode 100644 x2godesktopsharing_de.qm
 create mode 100644 x2godesktopsharing_es.ts
 create mode 100644 x2godesktopsharing_fr.ts
 create mode 100644 x2godesktopsharing_nb_no.ts
 delete mode 100644 x2godesktopsharing_ru.qm
 create mode 100644 x2godesktopsharing_sv.ts
 create mode 100644 x2godesktopsharing_zh_tw

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 85766c3..29b4ac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x2godesktopsharing (3.1.0.6-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (3.1.0.6):
+    - Prepare for translating into the current project
+      languages (da, de, es, fr, nb_no, ru, sv, zh_tw).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 13 Nov 2012 16:24:02 +0100
 
diff --git a/qt_da.qm b/qt_da.qm
new file mode 100644
index 0000000..57a0aa7
Binary files /dev/null and b/qt_da.qm differ
diff --git a/qt_de.qm b/qt_de.qm
index 6b76d7b..28197e1 100644
Binary files a/qt_de.qm and b/qt_de.qm differ
diff --git a/qt_es.qm b/qt_es.qm
new file mode 100644
index 0000000..2c5e54f
Binary files /dev/null and b/qt_es.qm differ
diff --git a/qt_fr.qm b/qt_fr.qm
new file mode 100644
index 0000000..fb29306
Binary files /dev/null and b/qt_fr.qm differ
diff --git a/qt_ru.qm b/qt_ru.qm
index 63b7b8b..0b1ac9e 100644
Binary files a/qt_ru.qm and b/qt_ru.qm differ
diff --git a/qt_sv.qm b/qt_sv.qm
new file mode 100644
index 0000000..b2c5557
Binary files /dev/null and b/qt_sv.qm differ
diff --git a/qt_zh_tw.qm b/qt_zh_tw.qm
new file mode 100644
index 0000000..09f82f8
Binary files /dev/null and b/qt_zh_tw.qm differ
diff --git a/resources.rcc b/resources.rcc
index 0767149..d218d9f 100644
--- a/resources.rcc
+++ b/resources.rcc
@@ -1,7 +1,12 @@
 <RCC>
    <qresource>
+       <file>qt_da.qm</file>
        <file>qt_de.qm</file>
+       <file>qt_es.qm</file>
+       <file>qt_fr.qm</file>
        <file>qt_ru.qm</file>
+       <file>qt_sv.qm</file>
+       <file>qt_zh_tw.qm</file>
        <file>icons/22x22/x2godesktopsharing.png</file>
        <file>icons/22x22/accept.png</file>
        <file>icons/22x22/discard.png</file>
@@ -13,7 +18,13 @@
        <file>icons/32x32/wlist.png</file>
        <file>icons/32x32/x2godesktopsharing.png</file>
        <file>icons/128x128/x2godesktopsharing.png</file>
+       <file>x2godesktopsharing_da.qm</file>
        <file>x2godesktopsharing_de.qm</file>
+       <file>x2godesktopsharing_es.qm</file>
+       <file>x2godesktopsharing_fr.qm</file>
+       <file>x2godesktopsharing_nb_no.qm</file>
        <file>x2godesktopsharing_ru.qm</file>
+       <file>x2godesktopsharing_sv.qm</file>
+       <file>x2godesktopsharing_zh_tw.qm</file>
    </qresource>
 </RCC>
diff --git a/x2godesktopsharing.pro b/x2godesktopsharing.pro
index e8e821c..d51cb40 100644
--- a/x2godesktopsharing.pro
+++ b/x2godesktopsharing.pro
@@ -6,9 +6,35 @@ TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
-TRANSLATIONS += x2godesktopsharing_de.ts x2godesktopsharing_ru.ts 
+TRANSLATIONS += \
+    x2godesktopsharing_da.ts \
+    x2godesktopsharing_de.ts \
+    x2godesktopsharing_es.ts \
+    x2godesktopsharing_fr.ts \
+    x2godesktopsharing_nb_no.ts \
+    x2godesktopsharing_ru.ts \
+    x2godesktopsharing_sv.ts \
+    x2godesktopsharing_zh_tw
 RESOURCES += resources.rcc
 
+!isEmpty(TRANSLATIONS) {
+  isEmpty(QMAKE_LRELEASE) {
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+  }
+
+  isEmpty(TS_DIR):TS_DIR = .
+
+  TSQM.name = lrelease ${QMAKE_FILE_IN}
+  TSQM.input = TRANSLATIONS
+  TSQM.output = $$TS_DIR/${QMAKE_FILE_BASE}.qm
+  TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN}
+  TSQM.CONFIG = no_link
+  QMAKE_EXTRA_COMPILERS += TSQM
+  PRE_TARGETDEPS += compiler_TSQM_make_all
+}
+else:message(No translation files in project)
+
 # Input
 SOURCES += main.cpp \
  sharetray.cpp \
diff --git a/x2godesktopsharing_da.ts b/x2godesktopsharing_da.ts
new file mode 100644
index 0000000..61546f2
--- /dev/null
+++ b/x2godesktopsharing_da.ts
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="da_DK">
+<context>
+    <name>MessageBox</name>
+    <message>
+        <location filename="messagebox.cpp" line="20"/>
+        <source>Save selection for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="messagebox.cpp" line="24"/>
+        <source>Accept %1 from %2 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareTray</name>
+    <message>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="101"/>
+        <source>X2Go desktop sharing application is already active for this display 
+if this application is no longer running, remove %1
+and start again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="128"/>
+        <source>X2Go desktop sharing application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="133"/>
+        <source>Granted users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="135"/>
+        <source>Banned users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="139"/>
+        <source>Activate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="142"/>
+        <source>Deactivate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="147"/>
+        <source>About X2GO Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="160"/>
+        <source>&Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="335"/>
+        <source>Can't listen on socket:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>Access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>%1(%2): access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="391"/>
+        <source>Disconnect %1(%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="396"/>
+        <source>Remote connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
+        <source>%1(%2) connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="403"/>
+        <source>Access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="404"/>
+        <source>%1(%2): access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="477"/>
+        <source>User disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="479"/>
+        <source>%1(%2) disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="515"/>
+        <source>Banned users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="522"/>
+        <source>Granted users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="587"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mwnd</name>
+    <message>
+        <location filename="dlg.ui" line="22"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="34"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="75"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/x2godesktopsharing_de.qm b/x2godesktopsharing_de.qm
deleted file mode 100644
index 3cbe137..0000000
Binary files a/x2godesktopsharing_de.qm and /dev/null differ
diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_de.ts
index b923fc9..4811b0e 100644
--- a/x2godesktopsharing_de.ts
+++ b/x2godesktopsharing_de.ts
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="de">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="de">
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="listdialog.cpp" line="26"/>
         <source>remove</source>
         <translation type="obsolete">entfernen</translation>
     </message>
@@ -25,62 +24,63 @@
 <context>
     <name>ShareTray</name>
     <message>
-        <location filename="sharetray.cpp" line="123"/>
+        <location filename="sharetray.cpp" line="160"/>
         <source>&Quit</source>
         <translation>Be&enden</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="204"/>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="102"/>
+        <location filename="sharetray.cpp" line="139"/>
         <source>Activate desktop sharing</source>
         <translation>Desktopfreigabe aktivieren</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="105"/>
+        <location filename="sharetray.cpp" line="142"/>
         <source>Deactivate desktop sharing</source>
         <translation>Desktopfreigabe deaktivieren</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="230"/>
+        <location filename="sharetray.cpp" line="403"/>
         <source>Access denied</source>
         <translation>Zugriff verweigert</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="243"/>
+        <location filename="sharetray.cpp" line="396"/>
         <source>Remote connection</source>
         <translation>Desktopverbindung</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="318"/>
+        <location filename="sharetray.cpp" line="477"/>
         <source>User disconnected</source>
         <translation>Verbindung getrennt</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="96"/>
+        <location filename="sharetray.cpp" line="133"/>
         <source>Granted users...</source>
         <translation>Automatisch akzeptieren...</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="98"/>
+        <location filename="sharetray.cpp" line="135"/>
         <source>Banned users...</source>
         <translation>Automatisch ablennen...</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="91"/>
+        <location filename="sharetray.cpp" line="128"/>
         <source>X2Go desktop sharing application</source>
         <translation>X2Go Desktopfreigabe</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="202"/>
+        <location filename="sharetray.cpp" line="335"/>
         <source>Can't listen on socket:</source>
         <translation>Socket nicht erreichbar:</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="77"/>
+        <location filename="sharetray.cpp" line="101"/>
         <source>X2Go desktop sharing application is already active for this display 
 if this application is no longer running, remove %1
 and start again</source>
@@ -89,57 +89,61 @@ Falls beendet, %1
 entfernen und Dienst neu starten</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="231"/>
+        <location filename="sharetray.cpp" line="404"/>
         <source>%1(%2): access denied</source>
         <translation>%1(%2): Zugriff verweigert</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="238"/>
+        <location filename="sharetray.cpp" line="391"/>
         <source>Disconnect %1(%2)</source>
         <translation>%1(%2) trennen</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="245"/>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
         <source>%1(%2) connected</source>
         <translation>%1(%2) verbunden</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="320"/>
+        <location filename="sharetray.cpp" line="479"/>
         <source>%1(%2) disconnected</source>
         <translation>%1(%2) getrennt</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="356"/>
+        <location filename="sharetray.cpp" line="515"/>
         <source>Banned users</source>
         <translation>Automatisch ablennen</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="364"/>
+        <location filename="sharetray.cpp" line="522"/>
         <source>Granted users</source>
         <translation>Automatisch akzeptieren</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="57"/>
         <source><b>X2GO DesktopSharing V. </source>
-        <translation><b>X2GO Desktopfreigabe V. </translation>
+        <translation type="obsolete"><b>X2GO Desktopfreigabe V. </translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="110"/>
+        <location filename="sharetray.cpp" line="147"/>
         <source>About X2GO Sharing</source>
         <translation>Über X2Go Desktopfreigabe</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="224"/>
+        <location filename="sharetray.cpp" line="371"/>
         <source>Access granted</source>
         <translation>Zugriff erlaubt</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="226"/>
+        <location filename="sharetray.cpp" line="371"/>
         <source>%1(%2): access granted</source>
         <translation>%1(%2): Zugriff erlaubt</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="430"/>
+        <location filename="sharetray.cpp" line="587"/>
         <source>X2Go Desktop Sharing</source>
         <translation>X2Go Desktopfreigabe</translation>
     </message>
diff --git a/x2godesktopsharing_es.ts b/x2godesktopsharing_es.ts
new file mode 100644
index 0000000..5c7fb28
--- /dev/null
+++ b/x2godesktopsharing_es.ts
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="es_ES">
+<context>
+    <name>MessageBox</name>
+    <message>
+        <location filename="messagebox.cpp" line="20"/>
+        <source>Save selection for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="messagebox.cpp" line="24"/>
+        <source>Accept %1 from %2 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareTray</name>
+    <message>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="101"/>
+        <source>X2Go desktop sharing application is already active for this display 
+if this application is no longer running, remove %1
+and start again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="128"/>
+        <source>X2Go desktop sharing application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="133"/>
+        <source>Granted users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="135"/>
+        <source>Banned users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="139"/>
+        <source>Activate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="142"/>
+        <source>Deactivate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="147"/>
+        <source>About X2GO Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="160"/>
+        <source>&Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="335"/>
+        <source>Can't listen on socket:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>Access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>%1(%2): access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="391"/>
+        <source>Disconnect %1(%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="396"/>
+        <source>Remote connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
+        <source>%1(%2) connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="403"/>
+        <source>Access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="404"/>
+        <source>%1(%2): access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="477"/>
+        <source>User disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="479"/>
+        <source>%1(%2) disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="515"/>
+        <source>Banned users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="522"/>
+        <source>Granted users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="587"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mwnd</name>
+    <message>
+        <location filename="dlg.ui" line="22"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="34"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="75"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts
new file mode 100644
index 0000000..bde94cf
--- /dev/null
+++ b/x2godesktopsharing_fr.ts
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>MessageBox</name>
+    <message>
+        <location filename="messagebox.cpp" line="20"/>
+        <source>Save selection for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="messagebox.cpp" line="24"/>
+        <source>Accept %1 from %2 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareTray</name>
+    <message>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="101"/>
+        <source>X2Go desktop sharing application is already active for this display 
+if this application is no longer running, remove %1
+and start again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="128"/>
+        <source>X2Go desktop sharing application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="133"/>
+        <source>Granted users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="135"/>
+        <source>Banned users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="139"/>
+        <source>Activate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="142"/>
+        <source>Deactivate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="147"/>
+        <source>About X2GO Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="160"/>
+        <source>&Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="335"/>
+        <source>Can't listen on socket:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>Access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>%1(%2): access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="391"/>
+        <source>Disconnect %1(%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="396"/>
+        <source>Remote connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
+        <source>%1(%2) connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="403"/>
+        <source>Access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="404"/>
+        <source>%1(%2): access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="477"/>
+        <source>User disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="479"/>
+        <source>%1(%2) disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="515"/>
+        <source>Banned users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="522"/>
+        <source>Granted users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="587"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mwnd</name>
+    <message>
+        <location filename="dlg.ui" line="22"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="34"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="75"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/x2godesktopsharing_nb_no.ts b/x2godesktopsharing_nb_no.ts
new file mode 100644
index 0000000..3227f2b
--- /dev/null
+++ b/x2godesktopsharing_nb_no.ts
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="nb_NO">
+<context>
+    <name>MessageBox</name>
+    <message>
+        <location filename="messagebox.cpp" line="20"/>
+        <source>Save selection for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="messagebox.cpp" line="24"/>
+        <source>Accept %1 from %2 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareTray</name>
+    <message>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="101"/>
+        <source>X2Go desktop sharing application is already active for this display 
+if this application is no longer running, remove %1
+and start again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="128"/>
+        <source>X2Go desktop sharing application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="133"/>
+        <source>Granted users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="135"/>
+        <source>Banned users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="139"/>
+        <source>Activate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="142"/>
+        <source>Deactivate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="147"/>
+        <source>About X2GO Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="160"/>
+        <source>&Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="335"/>
+        <source>Can't listen on socket:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>Access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>%1(%2): access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="391"/>
+        <source>Disconnect %1(%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="396"/>
+        <source>Remote connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
+        <source>%1(%2) connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="403"/>
+        <source>Access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="404"/>
+        <source>%1(%2): access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="477"/>
+        <source>User disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="479"/>
+        <source>%1(%2) disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="515"/>
+        <source>Banned users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="522"/>
+        <source>Granted users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="587"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mwnd</name>
+    <message>
+        <location filename="dlg.ui" line="22"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="34"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="75"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/x2godesktopsharing_ru.qm b/x2godesktopsharing_ru.qm
deleted file mode 100644
index 1aded5d..0000000
Binary files a/x2godesktopsharing_ru.qm and /dev/null differ
diff --git a/x2godesktopsharing_ru.ts b/x2godesktopsharing_ru.ts
index 6708b26..5920292 100644
--- a/x2godesktopsharing_ru.ts
+++ b/x2godesktopsharing_ru.ts
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="ru">
-<defaultcodec></defaultcodec>
+<!DOCTYPE TS>
+<TS version="2.0" language="ru">
 <context>
     <name>ListDialog</name>
     <message>
-        <location filename="listdialog.cpp" line="26"/>
         <source>remove</source>
         <translation type="obsolete">удалить</translation>
     </message>
@@ -25,62 +24,63 @@
 <context>
     <name>ShareTray</name>
     <message>
-        <location filename="sharetray.cpp" line="204"/>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="96"/>
+        <location filename="sharetray.cpp" line="133"/>
         <source>Granted users...</source>
         <translation>Автоматически разрешать доступ...</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="98"/>
+        <location filename="sharetray.cpp" line="135"/>
         <source>Banned users...</source>
         <translation>Автоматически запрещать доступ...</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="102"/>
+        <location filename="sharetray.cpp" line="139"/>
         <source>Activate desktop sharing</source>
         <translation>Активировать доступ к десктопу</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="105"/>
+        <location filename="sharetray.cpp" line="142"/>
         <source>Deactivate desktop sharing</source>
         <translation>Деактивировать доступ к десктопу</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="123"/>
+        <location filename="sharetray.cpp" line="160"/>
         <source>&Quit</source>
         <translation>&Выход</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="230"/>
+        <location filename="sharetray.cpp" line="403"/>
         <source>Access denied</source>
         <translation>В доступе отказано</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="243"/>
+        <location filename="sharetray.cpp" line="396"/>
         <source>Remote connection</source>
         <translation>Удаленное соединение</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="318"/>
+        <location filename="sharetray.cpp" line="477"/>
         <source>User disconnected</source>
         <translation>Пользователь отсоединился</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="91"/>
+        <location filename="sharetray.cpp" line="128"/>
         <source>X2Go desktop sharing application</source>
         <translation>Доступ к десктопу X2Go</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="202"/>
+        <location filename="sharetray.cpp" line="335"/>
         <source>Can't listen on socket:</source>
         <translation>Ошибка открытия сокета:</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="77"/>
+        <location filename="sharetray.cpp" line="101"/>
         <source>X2Go desktop sharing application is already active for this display 
 if this application is no longer running, remove %1
 and start again</source>
@@ -89,57 +89,61 @@ and start again</source>
 и перезапустите приложение</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="231"/>
+        <location filename="sharetray.cpp" line="404"/>
         <source>%1(%2): access denied</source>
         <translation>%1(%2): в доступе отказано</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="238"/>
+        <location filename="sharetray.cpp" line="391"/>
         <source>Disconnect %1(%2)</source>
         <translation>Отсоединить %1(%2)</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="245"/>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
         <source>%1(%2) connected</source>
         <translation>%1(%2) присоединился</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="320"/>
+        <location filename="sharetray.cpp" line="479"/>
         <source>%1(%2) disconnected</source>
         <translation>%1(%2) отсоединился</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="356"/>
+        <location filename="sharetray.cpp" line="515"/>
         <source>Banned users</source>
         <translation>Автоматически запрещать доступ</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="364"/>
+        <location filename="sharetray.cpp" line="522"/>
         <source>Granted users</source>
         <translation>Автоматически разрешать доступ</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="57"/>
         <source><b>X2GO DesktopSharing V. </source>
-        <translation><b>Доступ к десктопу X2Go V.</translation>
+        <translation type="obsolete"><b>Доступ к десктопу X2Go V.</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="110"/>
+        <location filename="sharetray.cpp" line="147"/>
         <source>About X2GO Sharing</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="224"/>
+        <location filename="sharetray.cpp" line="371"/>
         <source>Access granted</source>
         <translation>Доступ разрешён</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="226"/>
+        <location filename="sharetray.cpp" line="371"/>
         <source>%1(%2): access granted</source>
         <translation>%1(%2): доступ разрешён</translation>
     </message>
     <message>
-        <location filename="sharetray.cpp" line="430"/>
+        <location filename="sharetray.cpp" line="587"/>
         <source>X2Go Desktop Sharing</source>
         <translation>Доступ к десктопу X2Go</translation>
     </message>
diff --git a/x2godesktopsharing_sv.ts b/x2godesktopsharing_sv.ts
new file mode 100644
index 0000000..2e17c06
--- /dev/null
+++ b/x2godesktopsharing_sv.ts
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="sv_SE">
+<context>
+    <name>MessageBox</name>
+    <message>
+        <location filename="messagebox.cpp" line="20"/>
+        <source>Save selection for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="messagebox.cpp" line="24"/>
+        <source>Accept %1 from %2 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareTray</name>
+    <message>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="101"/>
+        <source>X2Go desktop sharing application is already active for this display 
+if this application is no longer running, remove %1
+and start again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="128"/>
+        <source>X2Go desktop sharing application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="133"/>
+        <source>Granted users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="135"/>
+        <source>Banned users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="139"/>
+        <source>Activate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="142"/>
+        <source>Deactivate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="147"/>
+        <source>About X2GO Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="160"/>
+        <source>&Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="335"/>
+        <source>Can't listen on socket:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>Access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>%1(%2): access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="391"/>
+        <source>Disconnect %1(%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="396"/>
+        <source>Remote connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
+        <source>%1(%2) connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="403"/>
+        <source>Access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="404"/>
+        <source>%1(%2): access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="477"/>
+        <source>User disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="479"/>
+        <source>%1(%2) disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="515"/>
+        <source>Banned users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="522"/>
+        <source>Granted users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="587"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mwnd</name>
+    <message>
+        <location filename="dlg.ui" line="22"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="34"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="75"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/x2godesktopsharing_zh_tw b/x2godesktopsharing_zh_tw
new file mode 100644
index 0000000..1801cb2
--- /dev/null
+++ b/x2godesktopsharing_zh_tw
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="zh_CN">
+<context>
+    <name>MessageBox</name>
+    <message>
+        <location filename="messagebox.cpp" line="20"/>
+        <source>Save selection for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="messagebox.cpp" line="24"/>
+        <source>Accept %1 from %2 ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ShareTray</name>
+    <message>
+        <location filename="sharetray.cpp" line="68"/>
+        <source><b>X2GO DesktopSharing v</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="101"/>
+        <source>X2Go desktop sharing application is already active for this display 
+if this application is no longer running, remove %1
+and start again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="108"/>
+        <location filename="sharetray.cpp" line="337"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="128"/>
+        <source>X2Go desktop sharing application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="133"/>
+        <source>Granted users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="135"/>
+        <source>Banned users...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="139"/>
+        <source>Activate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="142"/>
+        <source>Deactivate desktop sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="147"/>
+        <source>About X2GO Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="160"/>
+        <source>&Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="335"/>
+        <source>Can't listen on socket:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>Access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="371"/>
+        <source>%1(%2): access granted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="391"/>
+        <source>Disconnect %1(%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="396"/>
+        <source>Remote connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="398"/>
+        <source>%1(%2) connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="403"/>
+        <source>Access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="404"/>
+        <source>%1(%2): access denied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="477"/>
+        <source>User disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="479"/>
+        <source>%1(%2) disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="515"/>
+        <source>Banned users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="522"/>
+        <source>Granted users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="sharetray.cpp" line="587"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>mwnd</name>
+    <message>
+        <location filename="dlg.ui" line="22"/>
+        <source>X2Go Desktop Sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="34"/>
+        <source>remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="dlg.ui" line="75"/>
+        <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'OpenSymbol'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C. 2006-2010 <span style=" font-weight:600;">obviously nice</span>: Oleksandr Shneyder, Heinz-Markus Graesing)</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />This application enables you to share your running X-Session with other users over a local network or internet. You'll have the chance to allow or deny user connections and to save your preferences. A TrayBar Icon will inform you about the chosen configuration and you'll be informed about connection events. For further information, please visit </p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">http://www.x2go.org</span></a></p></body></html></source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

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




More information about the x2go-commits mailing list