x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

python-x2go.git - master (branch) updated: 0.2.1.1-7-gcee0cac
by git-admin＠x2go.org 11 Jan '13

11 Jan '13

The branch, master has been updated via cee0cac37466c9ea792588f0a26f6842d104f8e4 (commit) via 917cca2a6a1dbd6cf1105cf9b5329d76a7c99758 (commit) from fe173b2649c28ede9348f4ed6bc6a926ffbe303a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cee0cac37466c9ea792588f0a26f6842d104f8e4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 11 09:56:42 2013 +0100 fix __doc__ string commit 917cca2a6a1dbd6cf1105cf9b5329d76a7c99758 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 11 09:56:29 2013 +0100 Add session profile option ,,display'' to default session profile options. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ x2go/backends/profiles/_file.py | 2 +- x2go/defaults.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fd68bb4..20bd71f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ python-x2go (0.2.1.2-0~x2go1) UNRELEASED; urgency=low DISPLAY not being set. It is overkill as well, causing extra dependencies to be installed at build time. (Fixes: #91). + [ Mike Gabriel ] + * New upstream version (0.2.1.2): + - Add session profile option ,,display'' to default session profile options. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 20 Dec 2012 08:58:44 +0100 python-x2go (0.2.1.1-0~x2go1) unstable; urgency=low diff --git a/x2go/backends/profiles/_file.py b/x2go/backends/profiles/_file.py index eb21f61..fbbf396 100644 --- a/x2go/backends/profiles/_file.py +++ b/x2go/backends/profiles/_file.py @@ -186,7 +186,7 @@ class X2goSessionProfilesFILE(inifiles.X2goIniFile): @type profile_id_or_name: C{str} @param parameter: if specified, only the value for the given parameter is returned @type parameter: C{str} - @param profile_id: profile ID (fast than specifying C{profile_id_or_name}) + @param profile_id: profile ID (faster than specifying C{profile_id_or_name}) @type profile_id: C{str} @return: the session profile configuration for the given profile ID (or name) diff --git a/x2go/defaults.py b/x2go/defaults.py index 15ea901..b40fefc 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -300,7 +300,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'useexports': True, 'restoreexports': False, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', 'fullscreen': False, - 'width': 800,'height': 600, 'maxdim': False, 'dpi': 96, 'setdpi': False, 'xinerama': False, 'multidisp': False, + 'width': 800,'height': 600, 'maxdim': False, 'dpi': 96, 'setdpi': False, 'xinerama': False, 'multidisp': False, 'display': 1, 'usekbd': True, 'layout': 'us', 'type': 'pc105/us', 'variant': '', 'sound': False, 'soundsystem': 'pulse', 'startsoundsystem': False, 'soundtunnel':True, 'defsndport':True, 'sndport':4713, 'name': 'NEW_PROFILE', 'icon': ':icons/128x128/x2gosession.png', hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-119-gd45eed1
by git-admin＠x2go.org 10 Jan '13

10 Jan '13

The branch, master has been updated via d45eed1fad248c20ce0fefeac180e13cb9155f38 (commit) from 9394f9bd9e433dab4d56496a037446e212374e17 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d45eed1fad248c20ce0fefeac180e13cb9155f38 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jan 10 11:19:03 2013 +0100 Rely on $PATH when invoking x2gocleansessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/x2goserver.init | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5191c55..4349cbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low + Use Breaks/Replaces to exchange x2goserver.conf in x2goserver package by x2goserver.conf in new x2goserver-common package. + Move several x2goserver-* package to x2goserver's Recommends field. + * /debian/x2goserver.init: + + Rely on $PATH when invoking x2gocleansessions. * Move code in pre/post+inst/rm scripts around (from x2goserver package to libx2go-server-db-perl and x2goserver-common). diff --git a/debian/x2goserver.init b/debian/x2goserver.init index 5ae86e4..b70b9a9 100644 --- a/debian/x2goserver.init +++ b/debian/x2goserver.init @@ -19,7 +19,7 @@ start() chmod 1777 $XSOCKDIR fi echo "Cleaning up stale X2Go sessions." - /usr/sbin/x2gocleansessions + x2gocleansessions } stop() hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2godesktopsharing.git - master (branch) updated: 3.1.0.6-1-g15b5380
by git-admin＠x2go.org 10 Jan '13

10 Jan '13

The branch, master has been updated via 15b5380060f8e54f984ff2bb9463c6f60ed28ac7 (commit) from 80355dd2505b656a8a77430a4097df92c5a890a7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 15b5380060f8e54f984ff2bb9463c6f60ed28ac7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jan 10 10:07:01 2013 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: VERSION.x2godesktopsharing | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index 5cb2a54..4094d5e 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.1.0.6 +3.1.0.7 diff --git a/debian/changelog b/debian/changelog index 128afcd..8306ba6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2godesktopsharing (3.1.0.7-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 10 Jan 2013 10:06:02 +0100 + x2godesktopsharing (3.1.0.6-0~x2go1) unstable; urgency=low [ Christoffer Krakou ] 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).

1 0

x2godesktopsharing.git - build-baikal (branch) created: 3.1.0.6
by git-admin＠x2go.org 10 Jan '13

10 Jan '13

The branch, build-baikal has been created at 80355dd2505b656a8a77430a4097df92c5a890a7 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- 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).

1 0

x2godesktopsharing.git - build-main (branch) updated: 3.1.0.6
by git-admin＠x2go.org 10 Jan '13

10 Jan '13

The branch, build-main has been updated via 80355dd2505b656a8a77430a4097df92c5a890a7 (commit) via e92d3877a7c39a7b3ca2cca1fdc0a129fc0a3965 (commit) via cf6ed21cd06ab29e96ef9f4ce76a7b886ceff2db (commit) via 24fc427bbbd2ee5cba544d70f148a3467fabaa7a (commit) via e35dd7c318dbaf227b5a127aa919452801cd9481 (commit) via 849390ae0aded35735b2305f8ca23ec82efb33ef (commit) via 55eb03e343db26040beeb3af2592e9be3f092e41 (commit) via b40f007de1db835fbda46497250654a8d9d454e5 (commit) via ef891ba6480d5407b7253bc1ca4bac4264d3163d (commit) via 93331c08a1798b3d21279f2cabbec0162faa09e9 (commit) via f063996331d57da837459753a20743b356cee3ed (commit) via 3c06a4b01e9fc5bca18034cfd13888b4bb750e85 (commit) via fbbbbe1c9990221e5e561f1ca28f3fa5665f0e09 (commit) via 946c16314e840f368434207d1c39063f2d2148ec (commit) via ed684f537643e3b50baf40d7c43d7f64a0c29c0f (commit) via db0b079d5320b0bc6b718428c9831775b3ba39a7 (commit) via 017240957d81f16d94aefd44c28ded2ce7d70864 (commit) via c5339813ca9eb31502f0dad88ee73a98239ee264 (commit) via 7fd08b098b20353034a1c9f3e406ecf73e9cd2cf (commit) from 1b6012ebd2fb6c6ff4808e2f19a218fc03e94a1c (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: VERSION.x2godesktopsharing | 2 +- debian/changelog | 42 +++++ debian/control | 3 +- debian/rules | 1 + main.cpp | 5 +- qt_da.qm | Bin 0 -> 118059 bytes qt_de.qm | Bin 157137 -> 328730 bytes qt_es.qm | Bin 0 -> 87843 bytes qt_fr.qm | Bin 0 -> 255035 bytes qt_ru.qm | Bin 60815 -> 288378 bytes qt_sv.qm | Bin 0 -> 71452 bytes qt_zh_tw.qm | Bin 0 -> 116231 bytes resources.rcc | 12 ++ sharetray.cpp | 2 +- x2godesktopsharing.pro | 29 +++- x2godesktopsharing_da.ts | 172 +++++++++++++++++++ x2godesktopsharing_de.qm | Bin 6816 -> 0 bytes x2godesktopsharing_de.ts | 58 ++++--- x2godesktopsharing_es.ts | 171 +++++++++++++++++++ x2godesktopsharing_fr.ts | 163 ++++++++++++++++++ x2godesktopsharing_nb_no.ts | 175 ++++++++++++++++++++ ...esktopsharing_de.ts => x2godesktopsharing_nl.ts | 116 ++++++------- x2godesktopsharing_ru.qm | Bin 6961 -> 0 bytes x2godesktopsharing_ru.ts | 58 ++++--- x2godesktopsharing_sv.ts | 172 +++++++++++++++++++ x2godesktopsharing_zh_tw | 163 ++++++++++++++++++ 26 files changed, 1228 insertions(+), 116 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 copy x2godesktopsharing_de.ts => x2godesktopsharing_nl.ts (64%) 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/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index 4913c2b..5cb2a54 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.0.1.5 +3.1.0.6 diff --git a/debian/changelog b/debian/changelog index 5d5a82e..128afcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,45 @@ +x2godesktopsharing (3.1.0.6-0~x2go1) unstable; urgency=low + + [ Christoffer Krakou ] + * New upstream version (3.1.0.6): + - Add Danish translation file. + + [ Dick Kniep ] + * New upstream version (3.1.0.6): + - Add Dutch translation file. + + [ Mike Gabriel ] + * 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). + - Update German translation file (not much to do). + - Fix TEMP path for finding the x2godesktopsharing socket. + Solves issues on setups where pam_tmpdir.so is in use. + (Fixes: #69). + * /debian/control: + + Add build dependency: qt4-dev-tools. + + [ Daniel Lindgren ] + * New upstream version (3.1.0.6): + - Add Swedish translation file. + + [ Ricardo Díaz Martín ] + * New upstream version (3.1.0.6): + - Add Spanish translation file. + + [ Terje Andersen ] + * New upstream version (3.1.0.6): + - Add Bokmal (Norway) translation file. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 30 Dec 2012 20:27:32 +0100 + +x2godesktopsharing (3.1.0.5-0~x2go1) unstable; urgency=low + + * Bump version to 3.1.0.5 as we did a naming error with + one of the release tarballs. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 13 Nov 2012 16:15:57 +0100 + x2godesktopsharing (3.0.1.5-0~x2go1) unstable; urgency=low [ Milan Knížek ] diff --git a/debian/control b/debian/control index 0f8fc51..70f365e 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>, Build-Depends: debhelper (>= 7), - libqt4-dev + libqt4-dev, + qt4-dev-tools, Standards-Version: 3.9.2 Homepage: http://code.x2go.org/releases/source/x2godesktopsharing Vcs-Git: git://code.x2go.org/x2godesktopsharing.git diff --git a/debian/rules b/debian/rules index 6add866..5d1039c 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,7 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. + lrelease-qt4 x2godesktopsharing.pro qmake-qt4 x2godesktopsharing.pro touch configure-stamp diff --git a/main.cpp b/main.cpp index d3733b5..68645f8 100644 --- a/main.cpp +++ b/main.cpp @@ -51,8 +51,9 @@ void client ( const QStringList & cmd ) cmd.join(" ").toAscii().data() <<std::endl; QString dispname=params[2]; - QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ - params[1]+"@"+dispname; + // QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ + // params[1]+"@"+dispname; + QString socketName="/tmp/x2godesktopsharing_@" + params[1]+"@"+dispname; QLocalSocket sock; sock.connectToServer ( socketName ); if ( !sock.waitForConnected ( 3000 ) ) diff --git a/qt_da.qm b/qt_da.qm new file mode 100644 index 0000000..9366c63 Binary files /dev/null and b/qt_da.qm differ diff --git a/qt_de.qm b/qt_de.qm index 6b76d7b..941a1ea 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..00e2ae9 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..a5ec99d Binary files /dev/null and b/qt_fr.qm differ diff --git a/qt_ru.qm b/qt_ru.qm index 63b7b8b..88bf39b 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..81c6d2c 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..bc15ed0 Binary files /dev/null and b/qt_zh_tw.qm differ diff --git a/resources.rcc b/resources.rcc index 0767149..eb74183 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,14 @@ <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_nl.qm</file> <file>x2godesktopsharing_ru.qm</file> + <file>x2godesktopsharing_sv.qm</file> + <file>x2godesktopsharing_zh_tw.qm</file> </qresource> </RCC> diff --git a/sharetray.cpp b/sharetray.cpp index 926a5ed..7c74d24 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -36,7 +36,7 @@ #include <QProcess> #define STAT_ACT_COUNT 10 -#define VERSION "3.0.1.5" +#define VERSION "3.0.1.6" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; diff --git a/x2godesktopsharing.pro b/x2godesktopsharing.pro index e8e821c..f727528 100644 --- a/x2godesktopsharing.pro +++ b/x2godesktopsharing.pro @@ -6,9 +6,36 @@ 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_nl.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..47e43b5 --- /dev/null +++ b/x2godesktopsharing_da.ts @@ -0,0 +1,172 @@ +<?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>Gem selektion for %1</translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation>Accepter %1 fra %2 ?</translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation>X2GO Skrivebordsdeling v</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>X2Go skrivebordsdelings applikatonen er allerede aktiv for dette display +hvis denne applikation ikke længere kører, fjern %1 +og start igen</translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation>Fejl</translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation>X2Go skrivebordsdelings applikation</translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation>Tildelte brugere...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation>Bandlyste brugere...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation>Aktiver skrivebordsdeling</translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation>Deaktiver skrivebordsdeling</translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation>Om X2Go Sharing</translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation>&Afslut</translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation>Kan ikke lytte til socket:</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation>Adgang tilladt</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation>%1(%2): adgang tilladt</translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation>Afbryd forbindelse %1(%2)</translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation>Fjernforbindelse</translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation>%1(%2) forbundet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation>Adgang nægtet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation>%1(%2): adgang nægtet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation>Bruger afbrød forbindelsen</translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation>%1(%2) forbindelse afbrudt</translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation>Bandlyste brugere</translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation>Tildelte brugere</translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation>X2Go Skrivebordsdeling</translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation>X2Go Skrivebordsdeling</translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation>fjern</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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + 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 + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation><!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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + 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 + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></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..0b6a298 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>X2GO DesktopSharing v</source> + <translation>X2GO DesktopSharing v</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>X2GO DesktopSharing V. </source> - <translation>X2GO Desktopfreigabe V. </translation> + <translation type="obsolete">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..07ef50c --- /dev/null +++ b/x2godesktopsharing_es.ts @@ -0,0 +1,171 @@ +<?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>Guardar selección para %1</translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation>¿Aceptar %1 desde %2?</translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation>X2GO DesktopSharing v</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>La aplicación X2Go DesktopSharing está ya activa para esta pantalla +si no está funcionando borra %1 e iníciala de nuevo</translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation>Error</translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation>aplicación X2Go DesktopSharing</translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation>Usuarios con acceso...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation>Usuarios bloqueados...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation>Activar compartir escritorio</translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation>Desactivar compartir escritorio</translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation>Acerca de X2Go DesktopSharing</translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation>&Salir</translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation>No se puede escuchar en el socket:</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation>Acceso concedido</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation>%1(%2): acceso concedido</translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation>Desconectar %1(%2)</translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation>Conexión remota</translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation>%1(%2) conectado</translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation>Acceso denegado</translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation>%1(%2) acceso denegado</translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation>Usuario desconectado</translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation>%1(%2) desconectado</translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation>Usuario bloqueados</translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation>Usuarios con acceso</translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation>X2Go Desktop Sharing</translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation>X2Go Desktop Sharing</translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation>borrar</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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + 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 + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation><!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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + Esta aplicación permite compartir la sesión X activa con otros usuarios sobre una red local o sobre internet. Tienes la opción de aceptar o rechazar las conexiones del resto de usuarios y guardar estas preferencias para futuros accesos. Un icono en la barra de notificaciones del sistema informa sobre la configuración actual y sobre los eventos relacionados con conexiones entrantes. Para más información visita + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></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>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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + 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 + +<a href="http://www.x2go.org">http://www.x2go.org</a></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..f8fc7d7 --- /dev/null +++ b/x2godesktopsharing_nb_no.ts @@ -0,0 +1,175 @@ +<?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>Lagre valget for %1</translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation>Akseptere %1 fra %2 ?</translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translatorcomment>Oversette, eller beholde "DesktopSharing"?</translatorcomment> + <translation type="unfinished">X2GO DesktopSharing v</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> + <translatorcomment>Må verifiseres: Er %1 en fil som filnavnet blir vist (med full sti)? Om ikke, må denne strengen fikses. </translatorcomment> + <translation type="unfinished">X2Go sin applikasjon for skrivebordsdeling er allerede aktiv for denne skjermen. Om applikasjonen ikke lenger kjører, vennligst fjern %1 og forsøk igjen </translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation type="unfinished">Feil</translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation>X2Go sin applikasjon for skrivebordsdeling</translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation>Innvilgede brukere...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translatorcomment>usikker på om "nektede", "utestengte", eller "svartelistede" er bedre.</translatorcomment> + <translation>Avviste brukere...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation>Aktiver skrivebordsdeling</translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation>Deaktiver skrivebordsdeling</translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translatorcomment>hm... bør rapportere at den engelske strengen er feil/mangelful</translatorcomment> + <translation type="unfinished">Om X2Go DesktopSharing</translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation>&Avslutt</translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation>Kan ikke lytte på sokkel:</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation>Tilgang tillatt</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation type="unfinished">%1(%2): tilgang tillatt</translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation type="unfinished">Frakoble %1(%2)</translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation>Ekstern tilkobling</translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation>%1(%2) tilkoblet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation>Tilgang nektet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation>%1(%2): tilgang nektet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation>Bruker frakoblet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation>%1(%2) frakoblet</translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation>Avviste brukere</translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation>Innvilgede brukere</translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation>X2Go Skrivebordsdeling</translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translatorcomment>Skal/skal ikke benytte "Desktop Sharing" som egennavn i oversettelsen (altså beholde)?</translatorcomment> + <translation type="unfinished">X2Go Skrivebordsdeling</translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation type="unfinished">fjern</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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + 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 + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation><!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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + Denne applikasjonen gir deg muligheten til å dele din kjørende X-sesjon med andre brukere over lokalt nettverk, eller internett. Du vil ha muligheten til å tillate, eller nekte brukere å koble seg til, samt å lagre innstillingene dine. Et ikon i systemkurven vil informere deg om valgt konfigurasjon, og den vil også informere deg om alle tilkoblingshendelser. For mer informasjon, vennligst besøk: + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></translation> + </message> +</context> +</TS> diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_nl.ts similarity index 64% copy from x2godesktopsharing_de.ts copy to x2godesktopsharing_nl.ts index b923fc9..5520335 100644 --- a/x2godesktopsharing_de.ts +++ b/x2godesktopsharing_nl.ts @@ -1,12 +1,11 @@ <?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> + <translation type="obsolete">verwijderen</translation> </message> </context> <context> @@ -14,134 +13,139 @@ <message> <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Verbindung von %1(%2) erlauben?</translation> + <translation>Verbinding van %1(%2) toestaan?</translation> </message> <message> <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Auswahl für Benutzer %1 speichern</translation> + <translation>Keuze voor gebruiker %1 opslaan</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="123"/> + <location filename="sharetray.cpp" line="160"/> <source>&Quit</source> - <translation>Be&enden</translation> + <translation>Be&eindigen</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> + <translation>Fout</translation> </message> <message> - <location filename="sharetray.cpp" line="102"/> + <location filename="sharetray.cpp" line="139"/> <source>Activate desktop sharing</source> - <translation>Desktopfreigabe aktivieren</translation> + <translation>Desktop delen aanzetten</translation> </message> <message> - <location filename="sharetray.cpp" line="105"/> + <location filename="sharetray.cpp" line="142"/> <source>Deactivate desktop sharing</source> - <translation>Desktopfreigabe deaktivieren</translation> + <translation>Desktop delen uitzetten</translation> </message> <message> - <location filename="sharetray.cpp" line="230"/> + <location filename="sharetray.cpp" line="403"/> <source>Access denied</source> - <translation>Zugriff verweigert</translation> + <translation>Toegang geweigerd</translation> </message> <message> - <location filename="sharetray.cpp" line="243"/> + <location filename="sharetray.cpp" line="396"/> <source>Remote connection</source> - <translation>Desktopverbindung</translation> + <translation>Desktop verbinding</translation> </message> <message> - <location filename="sharetray.cpp" line="318"/> + <location filename="sharetray.cpp" line="477"/> <source>User disconnected</source> - <translation>Verbindung getrennt</translation> + <translation>Verbinding verbroken</translation> </message> <message> - <location filename="sharetray.cpp" line="96"/> + <location filename="sharetray.cpp" line="133"/> <source>Granted users...</source> - <translation>Automatisch akzeptieren...</translation> + <translation>Toegestane gebruikers...</translation> </message> <message> - <location filename="sharetray.cpp" line="98"/> + <location filename="sharetray.cpp" line="135"/> <source>Banned users...</source> - <translation>Automatisch ablennen...</translation> + <translation>Geweigerde gebruikers...</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> + <translation>X2Go Desktop toegang</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> + <translation>Socket is niet te gebruiken:</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> - <translation>X2Go Desktopfreigabe läuft bereits -Falls beendet, %1 -entfernen und Dienst neu starten</translation> + <translation>X2Go Desktop loopt al +Indien de applicatie niet meer loopt, verwijder %1 +en start opnieuw</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> + <translation>%1(%2): Toegang geweigerd</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> + <translation>%1(%2) Verbreek verbinding</translation> </message> <message> - <location filename="sharetray.cpp" line="245"/> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation>X2GO DesktopSharing v</translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> <source>%1(%2) connected</source> - <translation>%1(%2) verbunden</translation> + <translation>%1(%2) verbonden</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> + <translation>%1(%2) verbroken</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="515"/> <source>Banned users</source> - <translation>Automatisch ablennen</translation> + <translation>Geweigerde gebruikers</translation> </message> <message> - <location filename="sharetray.cpp" line="364"/> + <location filename="sharetray.cpp" line="522"/> <source>Granted users</source> - <translation>Automatisch akzeptieren</translation> + <translation>Toegestane gebruikers</translation> </message> <message> - <location filename="sharetray.cpp" line="57"/> <source>X2GO DesktopSharing V. </source> - <translation>X2GO Desktopfreigabe V. </translation> + <translation type="obsolete">X2GO DesktopSharing 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> + <translation>Over X2Go desktopsharing</translation> </message> <message> - <location filename="sharetray.cpp" line="224"/> + <location filename="sharetray.cpp" line="371"/> <source>Access granted</source> - <translation>Zugriff erlaubt</translation> + <translation>Toegang toegestaan</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> + <translation>%1(%2): Toegang toegestaan</translation> </message> <message> - <location filename="sharetray.cpp" line="430"/> + <location filename="sharetray.cpp" line="587"/> <source>X2Go Desktop Sharing</source> - <translation>X2Go Desktopfreigabe</translation> + <translation>X2Go Desktop Sharing</translation> </message> </context> <context> @@ -149,12 +153,12 @@ entfernen und Dienst neu starten</translation> <message> <location filename="dlg.ui" line="22"/> <source>X2Go Desktop Sharing</source> - <translation>X2Go Desktopfreigabe</translation> + <translation>X2Go Desktop Sharing</translation> </message> <message> <location filename="dlg.ui" line="34"/> <source>remove</source> - <translation>entfernen</translation> + <translation>verwijderen</translation> </message> <message> <location filename="dlg.ui" line="75"/> 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>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>X2GO DesktopSharing V. </source> - <translation>Доступ к десктопу X2Go V.</translation> + <translation type="obsolete">Доступ к десктопу 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..116ed49 --- /dev/null +++ b/x2godesktopsharing_sv.ts @@ -0,0 +1,172 @@ +<?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>Spara urval för %1</translation> + </message> + <message> + <location filename="messagebox.cpp" line="24"/> + <source>Accept %1 from %2 ?</source> + <translation>Acceptera %1 från %2?</translation> + </message> +</context> +<context> + <name>ShareTray</name> + <message> + <location filename="sharetray.cpp" line="68"/> + <source>X2GO DesktopSharing v</source> + <translation>X2GO Skrivbordsdelning v</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>X2Go Skrivbordsdelning är redan aktiv på denna display +om applikationen inte längre körs, ta bort %1 +och starta igen</translation> + </message> + <message> + <location filename="sharetray.cpp" line="108"/> + <location filename="sharetray.cpp" line="337"/> + <source>Error</source> + <translation>Fel</translation> + </message> + <message> + <location filename="sharetray.cpp" line="128"/> + <source>X2Go desktop sharing application</source> + <translation>X2Go Skrivbordsdelning</translation> + </message> + <message> + <location filename="sharetray.cpp" line="133"/> + <source>Granted users...</source> + <translation>Beviljade användare...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="135"/> + <source>Banned users...</source> + <translation>Spärrade användare...</translation> + </message> + <message> + <location filename="sharetray.cpp" line="139"/> + <source>Activate desktop sharing</source> + <translation>Aktivera skrivbordsdelning</translation> + </message> + <message> + <location filename="sharetray.cpp" line="142"/> + <source>Deactivate desktop sharing</source> + <translation>Deaktivera skrivbordsdelning</translation> + </message> + <message> + <location filename="sharetray.cpp" line="147"/> + <source>About X2GO Sharing</source> + <translation>Om X2Go Skrivbordsdelning</translation> + </message> + <message> + <location filename="sharetray.cpp" line="160"/> + <source>&Quit</source> + <translation>&Avsluta</translation> + </message> + <message> + <location filename="sharetray.cpp" line="335"/> + <source>Can't listen on socket:</source> + <translation>Kan inte lyssna på socket:</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>Access granted</source> + <translation>Åtkomst beviljad</translation> + </message> + <message> + <location filename="sharetray.cpp" line="371"/> + <source>%1(%2): access granted</source> + <translation>%1(%2): åtkomst beviljad</translation> + </message> + <message> + <location filename="sharetray.cpp" line="391"/> + <source>Disconnect %1(%2)</source> + <translation>Koppla från %1(%2)</translation> + </message> + <message> + <location filename="sharetray.cpp" line="396"/> + <source>Remote connection</source> + <translation>Fjärranslutning</translation> + </message> + <message> + <location filename="sharetray.cpp" line="398"/> + <source>%1(%2) connected</source> + <translation>%1(%2) ansluten</translation> + </message> + <message> + <location filename="sharetray.cpp" line="403"/> + <source>Access denied</source> + <translation>Åtkomst nekad</translation> + </message> + <message> + <location filename="sharetray.cpp" line="404"/> + <source>%1(%2): access denied</source> + <translation>%1(%2): åtkomst nekad</translation> + </message> + <message> + <location filename="sharetray.cpp" line="477"/> + <source>User disconnected</source> + <translation>Användare frånkopplad</translation> + </message> + <message> + <location filename="sharetray.cpp" line="479"/> + <source>%1(%2) disconnected</source> + <translation>%1(%2) frånkopplad</translation> + </message> + <message> + <location filename="sharetray.cpp" line="515"/> + <source>Banned users</source> + <translation>Spärrade användare</translation> + </message> + <message> + <location filename="sharetray.cpp" line="522"/> + <source>Granted users</source> + <translation>Beviljade användare</translation> + </message> + <message> + <location filename="sharetray.cpp" line="587"/> + <source>X2Go Desktop Sharing</source> + <translation>X2Go Skrivbordsdelning</translation> + </message> +</context> +<context> + <name>mwnd</name> + <message> + <location filename="dlg.ui" line="22"/> + <source>X2Go Desktop Sharing</source> + <translation>X2Go Skrivbordsdelning</translation> + </message> + <message> + <location filename="dlg.ui" line="34"/> + <source>remove</source> + <translation>Ta bort</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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + 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 + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></source> + <translation><!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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + Denna applikation möjliggör skrivbordsdelning med andra användare på ett lokalt nätverk eller över internet. Du har möjligheten att tillåta eller neka anslutningar och att spara dina inställningar. En ikon i systemfältet visar vald konfiguration och du meddelas om anslutningshändelser. För vidare information, gå till: + +<a href="http://www.x2go.org">http://www.x2go.org</a></body></html></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>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;"> +(C. 2006-2010 obviously nice: Oleksandr Shneyder, Heinz-Markus Graesing) + 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 + +<a href="http://www.x2go.org">http://www.x2go.org</a></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).

1 0

x2goserver.git - master (branch) updated: 3.1.1.3-118-g9394f9b
by git-admin＠x2go.org 07 Jan '13

07 Jan '13

The branch, master has been updated via 9394f9bd9e433dab4d56496a037446e212374e17 (commit) from 560b64fc0bf8e511b6a52c81a6fecf42bf3da79e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9394f9bd9e433dab4d56496a037446e212374e17 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 8 00:44:54 2013 +0100 post-release addition of fix for #93 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 26bc045..5191c55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,7 +57,7 @@ x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] * New upstream version (4.0.0.0): - Fix SSHFS mounting from Ubuntu clients. - - Create /tmp/.X11-unix if not exists. + - Create /tmp/.X11-unix if not exists. (Fixes: #93). [ Reinhard Tartler ] * New upstream version (4.0.0.0): hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.0-1-gc1be0db
by git-admin＠x2go.org 07 Jan '13

07 Jan '13

The branch, release/4.0.0.x has been updated via c1be0db4c047e623650f3888ab9d9c767da38038 (commit) from 3bb58b5faea060b778de8a35d6f509f42a8a7e0d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1be0db4c047e623650f3888ab9d9c767da38038 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 8 00:44:54 2013 +0100 post-release addition of fix for #93 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 263eb22..08885e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,7 @@ x2goserver (4.0.0.0-0~x2go1) unstable; urgency=low [ Oleksandr Shneyder ] * New upstream version (4.0.0.0): - Fix SSHFS mounting from Ubuntu clients. - - Create /tmp/.X11-unix if not exists. + - Create /tmp/.X11-unix if not exists. (Fixes: #93). [ Reinhard Tartler ] * New upstream version (4.0.0.0): hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-3-gc8a5fdd
by git-admin＠x2go.org 07 Jan '13

07 Jan '13

The branch, master has been updated via c8a5fddf1a45e3f0c3f9047424cc259d515724e2 (commit) from b121300fde0496d06ce6bb9c58ae85a8e84cd09b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c8a5fddf1a45e3f0c3f9047424cc259d515724e2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jan 8 00:39:32 2013 +0100 replaces Closes: by Fixes: statements in changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 13b08e3..b7f95fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ nx-libs (2:3.5.0.17-0) unstable; urgency=low [ Alexander Wuerstlein ] * Add patch: 302_nxagent_configurable-keystrokes.full.patch, replaces the hardcoded nxagent keybindings by a configurable table of keybindings. - (Closes upstream issue: #74). + (Fixes: #74). * Follow-up commit for 302_nxagent_configurable-keystrokes.full.patch, fixes FTBFS problem with the first version of that patch. @@ -26,8 +26,7 @@ nx-libs (2:3.5.0.17-0) unstable; urgency=low value of CONFIGURE variable traversable through the Makefile tree. [ Orion Poplawski ] - * Add patches: 026_nxcomp*_honour-optflags.full*.patch. (Closes upstream - issue #84). + * Add patches: 026_nxcomp*_honour-optflags.full*.patch. (Fixes: #84). [ Reinhard Tartler ] * Install debug symbols for all packages in a new binary package @@ -101,8 +100,7 @@ nx-libs (2:3.5.0.15-0) unstable; urgency=low [ Oleksandr Shneyder ] * Add patch: 204-nxagent_repaint-solidpict.full.patch. Fixes repainting of - SolidFill pictures by nxagent/x2goagent on reconnects. Closes upstream - issue #16. + SolidFill pictures by nxagent/x2goagent on reconnects. (Fixes: #16). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 21 Sep 2012 10:02:16 +0200 hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-2-gb121300
by git-admin＠x2go.org 07 Jan '13

07 Jan '13

The branch, master has been updated via b121300fde0496d06ce6bb9c58ae85a8e84cd09b (commit) from 39e84229d6b5c744513fff3f37cd4685ecb4f74b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b121300fde0496d06ce6bb9c58ae85a8e84cd09b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jan 7 10:45:58 2013 +0100 Remove duplicate install of nxproxy from main Makefile. Spotted by Jan Engelhard. ----------------------------------------------------------------------- Summary of changes: debian/Makefile.nx-libs | 2 -- debian/changelog | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs index 5cfc96e..93c7627 100644 --- a/debian/Makefile.nx-libs +++ b/debian/Makefile.nx-libs @@ -58,8 +58,6 @@ install-lite: $(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done for d in nxcomp nxproxy; do \ $(MAKE) -C $$d install; done - $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin - $(INSTALL_PROGRAM) nxproxy/nxproxy $(DESTDIR)$(NXLIBDIR)/bin install-full: for f in nxagent nxauth x2goagent; do \ diff --git a/debian/changelog b/debian/changelog index 5fe3a88..13b08e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low - * Continue development... + * Remove duplicate install of nxproxy from main Makefile. Spotted by Jan + Engelhard. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100 hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

nx-libs.git - master (branch) updated: redist-server/3.5.0.17-1-g39e8422
by git-admin＠x2go.org 04 Jan '13

04 Jan '13

The branch, master has been updated via 39e84229d6b5c744513fff3f37cd4685ecb4f74b (commit) from 69c809af9659d1b429d832d05642beb78722f67c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 39e84229d6b5c744513fff3f37cd4685ecb4f74b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Jan 4 13:27:41 2013 +0100 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 52627bc..5fe3a88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nx-libs (2:3.5.0.18-0) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 04 Jan 2013 13:27:05 +0100 + nx-libs (2:3.5.0.17-0) unstable; urgency=low [ Jan Engelhardt ] hooks/post-receive -- nx-libs.git (NX (redistributed)) 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 "nx-libs.git" (NX (redistributed)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits