This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from 419e41e accessdialog.cpp: re-enable Qt4 compatibility. new 3220224 Re-generate .ts translation files (run Qt5's lupdate). new 0ea9811 dlg.ui: Update the about dialog. new 3819ba7 Fix copyright headers (development started in 2006, not 2009). - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No work contributed by them. new 5643947 Update Oleksandr's mail address in all headers etc. new 202742c rebase l10n new f4454a4 i18n: Update German translation. new 5413d7c Update upstream version string in man page and sharetray.cpp. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: accessaction.cpp | 2 +- accessaction.h | 4 +- debian/changelog | 8 ++ debian/control | 2 +- debian/copyright | 12 +- dlg.ui | 12 +- listdialog.cpp | 2 +- main.cpp | 4 +- man/man1/x2godesktopsharing.1 | 2 +- share/x2gofeature.d/x2godesktopsharing.features | 4 +- sharetray.cpp | 4 +- sharetray.h | 4 +- simplelocalsocket.cpp | 2 +- simplelocalsocket.h | 4 +- x2godesktopsharing_da.ts | 138 +++++++++++++++------- x2godesktopsharing_de.ts | 144 ++++++++++++++++------- x2godesktopsharing_es.ts | 138 +++++++++++++++------- x2godesktopsharing_et.ts | 138 +++++++++++++++------- x2godesktopsharing_fi.ts | 138 +++++++++++++++------- x2godesktopsharing_fr.ts | 63 ++++++++-- x2godesktopsharing_nb_no.ts | 138 +++++++++++++++------- x2godesktopsharing_nl.ts | 131 +++++++++++++++------ x2godesktopsharing_pt.ts | 104 ++++++++++------- x2godesktopsharing_ru.ts | 131 +++++++++++++++------ x2godesktopsharing_sv.ts | 138 +++++++++++++++------- x2godesktopsharing_tr.ts | 148 ++++++++++++++++-------- x2godesktopsharing_zh_tw.ts | 104 ++++++++++------- 27 files changed, 1168 insertions(+), 551 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 56439478291d468b48e21d24e52aaea02c26e48f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 11:17:06 2018 +0100 Update Oleksandr's mail address in all headers etc. --- accessaction.cpp | 2 +- accessaction.h | 4 ++-- debian/changelog | 1 + debian/control | 2 +- debian/copyright | 8 ++++---- listdialog.cpp | 2 +- main.cpp | 2 +- sharetray.cpp | 2 +- sharetray.h | 4 ++-- simplelocalsocket.cpp | 2 +- simplelocalsocket.h | 4 ++-- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/accessaction.cpp b/accessaction.cpp index 941af2e..13e9e9b 100644 --- a/accessaction.cpp +++ b/accessaction.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 +// Author: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/accessaction.h b/accessaction.h index 6a2ea0d..00d3ab4 100644 --- a/accessaction.h +++ b/accessaction.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 +// Author: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // @@ -15,7 +15,7 @@ #include <QAction> /** - @author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + @author Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> */ class AccessAction : public QAction { diff --git a/debian/changelog b/debian/changelog index 3419b9f..c3e4dc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium - Fix copyright headers (development started in 2006, not 2009). - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No work contributed by them. + - Update Oleksandr's mail address in all headers etc. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/debian/control b/debian/control index 70e0c0d..582df4a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: X2Go Developers <x2go-dev@lists.x2go.org> Uploaders: - Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, + Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, Mihai Moldovan <ionic@ionic.de>, Build-Depends: diff --git a/debian/copyright b/debian/copyright index b616b37..f7a3778 100644 --- a/debian/copyright +++ b/debian/copyright @@ -73,12 +73,12 @@ Files: main.cpp listdialog.cpp simplelocalsocket.cpp simplelocalsocket.h -Copyright: 2006-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Copyright: 2006-2015, Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> License: GPL-2+ Files: sharetray.cpp sharetray.h -Copyright: 2006-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Copyright: 2006-2015, Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> 2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ @@ -87,13 +87,13 @@ Files: bin/x2goresume-desktopsharing bin/x2goterminate-desktopsharing share/x2gofeature.d/x2godesktopsharing.features Copyright: 2007-2015, X2Go Project - http:wiki.x2go.org - 2006-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2006-2015, Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> 2006-2015, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> 2006-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ Files: debian/* -Copyright: 2007-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Copyright: 2007-2015, Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> 2011-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ diff --git a/listdialog.cpp b/listdialog.cpp index 1fb7a62..46f994d 100644 --- a/listdialog.cpp +++ b/listdialog.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 +// Author: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/main.cpp b/main.cpp index ade535f..13d0f56 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2006-2015 by Oleksandr Shneyder * - * oleksandr.shneyder@obviously-nice.de * + * o.schneydr@phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/sharetray.cpp b/sharetray.cpp index 2290d7f..79de551 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 +// Author: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, (C) 2006-2015 // Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2011-2018 // // Copyright: See COPYING file that comes with this distribution diff --git a/sharetray.h b/sharetray.h index 67a2e17..c949ed9 100644 --- a/sharetray.h +++ b/sharetray.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 +// Author: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, (C) 2006-2015 // Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2011-2018 // // Copyright: See COPYING file that comes with this distribution @@ -25,7 +25,7 @@ class QAction; class QSocketNotifier; /** - @author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + @author Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> */ class ShareTray : public QMainWindow { diff --git a/simplelocalsocket.cpp b/simplelocalsocket.cpp index 8962de5..9bf955d 100644 --- a/simplelocalsocket.cpp +++ b/simplelocalsocket.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 +// Author: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/simplelocalsocket.h b/simplelocalsocket.h index 7994aef..ad76ee6 100644 --- a/simplelocalsocket.h +++ b/simplelocalsocket.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 +// Author: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // @@ -15,7 +15,7 @@ #include <QObject> /** - @author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + @author Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> */ class QLocalSocket; class ShareTray; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 32202240b4a4c130b1aceb0a4e21fa617b22e199 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 10:39:56 2018 +0100 Re-generate .ts translation files (run Qt5's lupdate). --- debian/changelog | 1 + x2godesktopsharing_da.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_de.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_es.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_et.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_fi.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_fr.ts | 78 ++++++++++++++++++--- x2godesktopsharing_nb_no.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_nl.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_pt.ts | 104 +++++++++++++++++----------- x2godesktopsharing_ru.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_sv.ts | 134 +++++++++++++++++++++++++++--------- x2godesktopsharing_tr.ts | 164 +++++++++++++++++++++++++++++++------------- x2godesktopsharing_zh_tw.ts | 104 +++++++++++++++++----------- 14 files changed, 1214 insertions(+), 443 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21730ca..08adbca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium Regression fix for Git commit ef3dfac2. - Drop forgotten-to-remove man8 man pages (moved over to x2goserver src:pkg). + - Re-generate .ts translation files (run Qt5's lupdate). * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/x2godesktopsharing_da.ts b/x2godesktopsharing_da.ts index 174eff6..c81767c 100644 --- a/x2godesktopsharing_da.ts +++ b/x2godesktopsharing_da.ts @@ -2,27 +2,48 @@ <!DOCTYPE TS> <TS version="2.0" language="da_DK"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Gem valg for %1</translation> + <translation type="obsolete">Gem valg for %1</translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Accepter %1 fra %2 ?</translation> + <translation type="obsolete">Accepter %1 fra %2 ?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go Skrivebords Deling v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -31,108 +52,138 @@ 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="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Fejl</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go skrivebords deling program</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Bevilliget brugere...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Bandlyste brugere...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Aktiver skrivebords deling</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Deaktiver skrivebords deling</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>Om X2Go Skrivebords Deling</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Afslut</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Kan ikke lytte til socket:</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Adgang bevilget</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> <source>%1(%2): access granted</source> - <translation>%1(%2): adgang bevilget</translation> + <translation type="obsolete">%1(%2): adgang bevilget</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>Forbindelse afbrudt %1(%2)</translation> + <translation type="obsolete">Forbindelse afbrudt %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Fjern forbindelse</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) forbundet</translation> + <translation type="obsolete">%1(%2) forbundet</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Adgang nægtet</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2): adgang nægtet</translation> + <translation type="obsolete">%1(%2): adgang nægtet</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Bruger afbrød forbindelsen</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) forbindelse afbrudt</translation> + <translation type="obsolete">%1(%2) forbindelse afbrudt</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Bandlyste brugere</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Bevilget brugere</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go Skrivebords Deling</translation> </message> @@ -155,11 +206,26 @@ og start igen</translation> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="obsolete"><!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;"> diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_de.ts index be5cd76..666c8dc 100644 --- a/x2godesktopsharing_de.ts +++ b/x2godesktopsharing_de.ts @@ -2,6 +2,29 @@ <!DOCTYPE TS> <TS version="2.0" language="de"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ListDialog</name> <message> <source>remove</source> @@ -11,76 +34,109 @@ <context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Verbindung von %1(%2) erlauben?</translation> + <translation type="obsolete">Verbindung von %1(%2) erlauben?</translation> </message> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Auswahl für Benutzer %1 speichern</translation> + <translation type="obsolete">Auswahl für Benutzer %1 speichern</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>Be&enden</translation> </message> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Desktopfreigabe aktivieren</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Desktopfreigabe deaktivieren</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Zugriff verweigert</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Desktopverbindung</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Verbindung getrennt</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Automatisch akzeptieren...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Automatisch ablennen...</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go Desktopfreigabe</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Socket nicht erreichbar:</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <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,37 +145,33 @@ Falls beendet, %1 entfernen und Dienst neu starten</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2): Zugriff verweigert</translation> + <translation type="obsolete">%1(%2): Zugriff verweigert</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>%1(%2) trennen</translation> + <translation type="obsolete">%1(%2) trennen</translation> </message> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go Desktop Sharing v</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) verbunden</translation> + <translation type="obsolete">%1(%2) verbunden</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) getrennt</translation> + <translation type="obsolete">%1(%2) getrennt</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Automatisch ablennen</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Automatisch akzeptieren</translation> </message> @@ -128,22 +180,21 @@ entfernen und Dienst neu starten</translation> <translation type="obsolete"><b>X2GO Desktopfreigabe V. </translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>Über X2Go Desktopfreigabe</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Zugriff erlaubt</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> <source>%1(%2): access granted</source> - <translation>%1(%2): Zugriff erlaubt</translation> + <translation type="obsolete">%1(%2): Zugriff erlaubt</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go Desktopfreigabe</translation> </message> @@ -166,11 +217,26 @@ entfernen und Dienst neu starten</translation> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "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 [...] + <translation type="obsolete"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "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:0p [...] </message> </context> </TS> diff --git a/x2godesktopsharing_es.ts b/x2godesktopsharing_es.ts index 107484d..91bb23b 100644 --- a/x2godesktopsharing_es.ts +++ b/x2godesktopsharing_es.ts @@ -2,27 +2,48 @@ <!DOCTYPE TS> <TS version="2.0" language="es_ES"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Guardar selección para %1</translation> + <translation type="obsolete">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> + <translation type="obsolete">¿Aceptar %1 desde %2?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go Desktop Sharing v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -30,108 +51,138 @@ and start again</source> 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="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>aplicación X2Go DesktopSharing</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Usuarios con acceso...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Usuarios bloqueados...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Activar compartir escritorio</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Desactivar compartir escritorio</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>Acerca de X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Salir</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>No se puede escuchar en el socket:</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Acceso concedido</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> <source>%1(%2): access granted</source> - <translation>%1(%2): acceso concedido</translation> + <translation type="obsolete">%1(%2): acceso concedido</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>Desconectar %1(%2)</translation> + <translation type="obsolete">Desconectar %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Conexión remota</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) conectado</translation> + <translation type="obsolete">%1(%2) conectado</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Acceso denegado</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2) acceso denegado</translation> + <translation type="obsolete">%1(%2) acceso denegado</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Usuario desconectado</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) desconectado</translation> + <translation type="obsolete">%1(%2) desconectado</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Usuario bloqueados</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Usuarios con acceso</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go Desktop Sharing</translation> </message> @@ -154,11 +205,26 @@ si no está funcionando borra %1 e iníciala de nuevo</translation> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="obsolete"><!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;"> diff --git a/x2godesktopsharing_et.ts b/x2godesktopsharing_et.ts index 69d12bf..06c843c 100644 --- a/x2godesktopsharing_et.ts +++ b/x2godesktopsharing_et.ts @@ -2,27 +2,48 @@ <!DOCTYPE TS> <TS version="2.0" language="et_EE"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Salvesta selektsioon %1 jaoks</translation> + <translation type="obsolete">Salvesta selektsioon %1 jaoks</translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Kas kinnitan %1 %2-st ?</translation> + <translation type="obsolete">Kas kinnitan %1 %2-st ?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go Töölaua jagamine v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -31,108 +52,138 @@ Kui see rakendus ei ole enam kasutusel, eemalda %1 ja alusta uuesti</translation> </message> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go töölaua jagamine</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Lubatud kasutajad ...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Keelatud kasutajad ...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Aktiveeri töölaua jagaja</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Deaktiveeri töölaua jagaja</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>Info X2Go Töölaua jagamisest</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Lõpeta</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Ei saa seda socket'it kasutada:</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Ligipääs lubatud</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> <source>%1(%2): access granted</source> - <translation>%1 (%2): ligipääs lubatud</translation> + <translation type="obsolete">%1 (%2): ligipääs lubatud</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>Lõpeta ühendus %1 (%2)</translation> + <translation type="obsolete">Lõpeta ühendus %1 (%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Kaugühendus</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1 (%2) on ühendatud</translation> + <translation type="obsolete">%1 (%2) on ühendatud</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Ligipääs keelatud</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1 (%2): ligipääs keelatud</translation> + <translation type="obsolete">%1 (%2): ligipääs keelatud</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Kasutaja ühendus lõpetatud</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1 (%2) ühendus lõpetatud</translation> + <translation type="obsolete">%1 (%2) ühendus lõpetatud</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Keelatud kasutajad</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Lubatud kasutajad</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go töölaua jagamine</translation> </message> @@ -155,11 +206,26 @@ ja alusta uuesti</translation> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="obsolete"><!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;"> diff --git a/x2godesktopsharing_fi.ts b/x2godesktopsharing_fi.ts index 44829fc..23f3017 100644 --- a/x2godesktopsharing_fi.ts +++ b/x2godesktopsharing_fi.ts @@ -2,27 +2,48 @@ <!DOCTYPE TS> <TS version="2.0" language="fi_FI"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Talleta tämä valinta %1</translation> + <translation type="obsolete">Talleta tämä valinta %1</translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Hyväksy %1 osoittesta %2?</translation> + <translation type="obsolete">Hyväksy %1 osoittesta %2?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go Työpöydän jako v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -31,108 +52,138 @@ jos sovellus ei enää ole käytössä, poista %1 ja käynnistä uudelleen</translation> </message> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go Työpöydänjako</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Valtuutetut käyttäjät...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Estetyt käyttäjät...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Aktivoi työpöydänjako</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Lopeta työpöydänjako</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>Tietoja X2Go työpöydänjaosta</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Lopeta</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Tämän soketin käyttö ei onnistu:</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Käyttöoikeus myönnetty</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> <source>%1(%2): access granted</source> - <translation>%1(%2): käytttöoikeus myönnetty</translation> + <translation type="obsolete">%1(%2): käytttöoikeus myönnetty</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>Katkais tämä yhteys %1(%2)</translation> + <translation type="obsolete">Katkais tämä yhteys %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Etäyhteys</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) yhdistetty</translation> + <translation type="obsolete">%1(%2) yhdistetty</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Käyttö kielletty</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2): käyttö kielletty</translation> + <translation type="obsolete">%1(%2): käyttö kielletty</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Käyttäjä poistui</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) poistui</translation> + <translation type="obsolete">%1(%2) poistui</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Estetyt käyttäjät</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Sallitut käyttäjät</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go työpöydänjako</translation> </message> @@ -155,11 +206,26 @@ ja käynnistä uudelleen</translation> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="obsolete"><!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;"> diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts index f4658d4..6e6c7a3 100644 --- a/x2godesktopsharing_fr.ts +++ b/x2godesktopsharing_fr.ts @@ -2,14 +2,33 @@ <!DOCTYPE TS> <TS version="2.0"> <context> + <name>AccessWindow</name> + <message> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> <source>Save selection for %1</source> - <translation>Sauver la selection de %1</translation> + <translation type="obsolete">Sauver la selection de %1</translation> </message> <message> <source>Accept %1 from %2 ?</source> - <translation>Accepter %1 de %2 ?</translation> + <translation type="obsolete">Accepter %1 de %2 ?</translation> </message> </context> <context> @@ -67,11 +86,11 @@ Si cette application n'est plus en cours d'execution, effacez le fichi </message> <message> <source>%1(%2): access granted</source> - <translation>%1(%2): accès autorisé</translation> + <translation type="obsolete">%1(%2): accès autorisé</translation> </message> <message> <source>Disconnect %1(%2)</source> - <translation>Déconnecté %1(%2)</translation> + <translation type="obsolete">Déconnecté %1(%2)</translation> </message> <message> <source>Remote connection</source> @@ -79,7 +98,7 @@ Si cette application n'est plus en cours d'execution, effacez le fichi </message> <message> <source>%1(%2) connected</source> - <translation>%1(%2) connecté</translation> + <translation type="obsolete">%1(%2) connecté</translation> </message> <message> <source>Access denied</source> @@ -87,7 +106,7 @@ Si cette application n'est plus en cours d'execution, effacez le fichi </message> <message> <source>%1(%2): access denied</source> - <translation>%1(%2): accès refusé</translation> + <translation type="obsolete">%1(%2): accès refusé</translation> </message> <message> <source>User disconnected</source> @@ -95,7 +114,7 @@ Si cette application n'est plus en cours d'execution, effacez le fichi </message> <message> <source>%1(%2) disconnected</source> - <translation>%1(%2) déconnecté</translation> + <translation type="obsolete">%1(%2) déconnecté</translation> </message> <message> <source>Banned users</source> @@ -109,6 +128,34 @@ Si cette application n'est plus en cours d'execution, effacez le fichi <source>X2Go Desktop Sharing</source> <translation>X2Go Desktop Sharing</translation> </message> + <message> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>mwnd</name> @@ -129,7 +176,7 @@ p, li { white-space: pre-wrap; } <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="obsolete"><!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;"> @@ -138,5 +185,20 @@ p, li { white-space: pre-wrap; } <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></translation> </message> + <message> + <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.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 index d366861..70c0639 100644 --- a/x2godesktopsharing_nb_no.ts +++ b/x2godesktopsharing_nb_no.ts @@ -2,28 +2,49 @@ <!DOCTYPE TS> <TS version="2.0" language="nb_NO"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Lagre valget for %1</translation> + <translation type="obsolete">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> + <translation type="obsolete">Akseptere %1 fra %2 ?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translatorcomment>Oversette, eller beholde "DesktopSharing"?</translatorcomment> <translation type="unfinished"><b>X2Go Desktop Sharing v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -31,110 +52,140 @@ and start again</source> <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="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation type="unfinished">Feil</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go sin applikasjon for skrivebordsdeling</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Innvilgede brukere...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <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"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Aktiver skrivebordsdeling</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Deaktiver skrivebordsdeling</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translatorcomment>hm... bør rapportere at den engelske strengen er feil/mangelful</translatorcomment> <translation type="unfinished">Om X2Go Desktop Sharing</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Avslutt</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Kan ikke lytte på sokkel:</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Tilgang tillatt</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> <source>%1(%2): access granted</source> - <translation type="unfinished">%1(%2): tilgang tillatt</translation> + <translation type="obsolete">%1(%2): tilgang tillatt</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation type="unfinished">Frakoble %1(%2)</translation> + <translation type="obsolete">Frakoble %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Ekstern tilkobling</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) tilkoblet</translation> + <translation type="obsolete">%1(%2) tilkoblet</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Tilgang nektet</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2): tilgang nektet</translation> + <translation type="obsolete">%1(%2): tilgang nektet</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Bruker frakoblet</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) frakoblet</translation> + <translation type="obsolete">%1(%2) frakoblet</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Avviste brukere</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Innvilgede brukere</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go Skrivebordsdeling</translation> </message> @@ -158,11 +209,26 @@ and start again</source> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="obsolete"><!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;"> diff --git a/x2godesktopsharing_nl.ts b/x2godesktopsharing_nl.ts index f44e262..84cf14e 100644 --- a/x2godesktopsharing_nl.ts +++ b/x2godesktopsharing_nl.ts @@ -2,6 +2,29 @@ <!DOCTYPE TS> <TS version="2.0" language="nl_NL"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ListDialog</name> <message> <source>remove</source> @@ -11,76 +34,109 @@ <context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Verbinding van %1(%2) toestaan?</translation> + <translation type="obsolete">Verbinding van %1(%2) toestaan?</translation> </message> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Keuze voor gebruiker %1 opslaan</translation> + <translation type="obsolete">Keuze voor gebruiker %1 opslaan</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Beëindigen</translation> </message> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Desktop delen inschakelen</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Desktop delen uitschakelen</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Toegang geweigerd</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Remote verbinding</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Verbinding verbroken</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Toegestane gebruikers...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Geweigerde gebruikers...</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go applicatie voor desktop delen</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Socket is niet te bereiken:</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <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,37 +145,33 @@ Indien deze applicatie niet langer in gebruik is, verwijder %1 en start opnieuw</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2): Toegang geweigerd</translation> + <translation type="obsolete">%1(%2): Toegang geweigerd</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>%1(%2) Verbreek verbinding</translation> + <translation type="obsolete">%1(%2) Verbreek verbinding</translation> </message> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go desktop delen v</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) verbonden</translation> + <translation type="obsolete">%1(%2) verbonden</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) verbroken</translation> + <translation type="obsolete">%1(%2) verbroken</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Geweigerde gebruikers</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Toegestane gebruikers</translation> </message> @@ -128,22 +180,21 @@ en start opnieuw</translation> <translation type="obsolete"><b>X2GO DesktopSharing V. </translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>Over X2Go desktop delen</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Toegang toegestaan</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> <source>%1(%2): access granted</source> - <translation>%1(%2): Toegang toegestaan</translation> + <translation type="obsolete">%1(%2): Toegang toegestaan</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go desktop delen</translation> </message> @@ -166,11 +217,26 @@ en start opnieuw</translation> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "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 [...] + <translation type="obsolete"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "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:0p [...] </message> </context> </TS> diff --git a/x2godesktopsharing_pt.ts b/x2godesktopsharing_pt.ts index dd315c1..f6db0a5 100644 --- a/x2godesktopsharing_pt.ts +++ b/x2godesktopsharing_pt.ts @@ -2,135 +2,155 @@ <!DOCTYPE TS> <TS version="2.0" language="pt_PT"> <context> - <name>MessageBox</name> + <name>AccessWindow</name> <message> - <location filename="messagebox.cpp" line="20"/> - <source>Save selection for %1</source> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> - <source>Accept %1 from %2 ?</source> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> <translation type="unfinished"></translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <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="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> - <source>%1(%2): access granted</source> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> - <source>Disconnect %1(%2)</source> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> - <source>Remote connection</source> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> - <source>%1(%2) connected</source> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> - <source>Access denied</source> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> - <source>%1(%2): access denied</source> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> - <source>User disconnected</source> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="440"/> + <source>Remote connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> - <source>%1(%2) disconnected</source> + <location filename="sharetray.cpp" line="447"/> + <source>Access denied</source> <translation type="unfinished"></translation> </message> <message> <location filename="sharetray.cpp" line="536"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation type="unfinished"></translation> </message> @@ -153,10 +173,14 @@ and start again</source> <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, 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> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> </context> diff --git a/x2godesktopsharing_ru.ts b/x2godesktopsharing_ru.ts index e245b9d..45b6838 100644 --- a/x2godesktopsharing_ru.ts +++ b/x2godesktopsharing_ru.ts @@ -2,6 +2,29 @@ <!DOCTYPE TS> <TS version="2.0" language="ru"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ListDialog</name> <message> <source>remove</source> @@ -11,76 +34,109 @@ <context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Запомнить выбор для %1</translation> + <translation type="obsolete">Запомнить выбор для %1</translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>Разрешить доступ %1(%2)?</translation> + <translation type="obsolete">Разрешить доступ %1(%2)?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Автоматически разрешать доступ...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Автоматически запрещать доступ...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Активировать доступ к десктопу</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Деактивировать доступ к десктопу</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>В доступе отказано</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Удаленное соединение</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Пользователь отсоединился</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>Доступ к десктопу X2Go</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Ошибка открытия сокета:</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <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,37 +145,33 @@ and start again</source> и перезапустите приложение</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2): в доступе отказано</translation> + <translation type="obsolete">%1(%2): в доступе отказано</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>Отсоединить %1(%2)</translation> + <translation type="obsolete">Отсоединить %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) присоединился</translation> + <translation type="obsolete">%1(%2) присоединился</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) отсоединился</translation> + <translation type="obsolete">%1(%2) отсоединился</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Автоматически запрещать доступ</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Автоматически разрешать доступ</translation> </message> @@ -128,22 +180,21 @@ and start again</source> <translation type="obsolete"><b>Доступ к десктопу X2Go V.</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>О программе</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Доступ разрешён</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> <source>%1(%2): access granted</source> - <translation>%1(%2): доступ разрешён</translation> + <translation type="obsolete">%1(%2): доступ разрешён</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>Доступ к десктопу X2Go</translation> </message> @@ -166,11 +217,26 @@ and start again</source> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//RU" "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-bo [...] + <translation type="obsolete"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//RU" "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-to [...] </message> </context> </TS> diff --git a/x2godesktopsharing_sv.ts b/x2godesktopsharing_sv.ts index f52303c..a40d765 100644 --- a/x2godesktopsharing_sv.ts +++ b/x2godesktopsharing_sv.ts @@ -2,27 +2,48 @@ <!DOCTYPE TS> <TS version="2.0" language="sv_SE"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Spara urval för %1</translation> + <translation type="obsolete">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> + <translation type="obsolete">Acceptera %1 från %2?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go Skrivbordsdelning v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -31,108 +52,138 @@ 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="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Fel</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go Skrivbordsdelning</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Beviljade användare...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Spärrade användare...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Aktivera skrivbordsdelning</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Deaktivera skrivbordsdelning</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>Om X2Go Skrivbordsdelning</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Avsluta</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation>Kan inte lyssna på socket:</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Åtkomst beviljad</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> <source>%1(%2): access granted</source> - <translation>%1(%2): åtkomst beviljad</translation> + <translation type="obsolete">%1(%2): åtkomst beviljad</translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> <source>Disconnect %1(%2)</source> - <translation>Koppla från %1(%2)</translation> + <translation type="obsolete">Koppla från %1(%2)</translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Fjärranslutning</translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> <source>%1(%2) connected</source> - <translation>%1(%2) ansluten</translation> + <translation type="obsolete">%1(%2) ansluten</translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Åtkomst nekad</translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> <source>%1(%2): access denied</source> - <translation>%1(%2): åtkomst nekad</translation> + <translation type="obsolete">%1(%2): åtkomst nekad</translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Användare frånkopplad</translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) frånkopplad</translation> + <translation type="obsolete">%1(%2) frånkopplad</translation> </message> <message> - <location filename="sharetray.cpp" line="536"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Spärrade användare</translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Beviljade användare</translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go Skrivbordsdelning</translation> </message> @@ -155,11 +206,26 @@ och starta igen</translation> <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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, 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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="obsolete"><!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;"> diff --git a/x2godesktopsharing_tr.ts b/x2godesktopsharing_tr.ts index f3ec2e8..ffd5de6 100644 --- a/x2godesktopsharing_tr.ts +++ b/x2godesktopsharing_tr.ts @@ -1,28 +1,49 @@ -<?xml version='1.0' encoding='utf-8'?> +<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> <TS version="2.0" language="tr"> <context> + <name>AccessWindow</name> + <message> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>MessageBox</name> <message> - <location filename="messagebox.cpp" line="20"/> <source>Save selection for %1</source> - <translation>Seçimi %1 için kaydet</translation> + <translation type="obsolete">Seçimi %1 için kaydet</translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> <source>Accept %1 from %2 ?</source> - <translation>%2 kişisinden %1 kabul edilsin mi?</translation> + <translation type="obsolete">%2 kişisinden %1 kabul edilsin mi?</translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation><b>X2Go Desktop Sharing v</translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <source>X2Go desktop sharing application is already active for this display if this application is no longer running, remove %1 and start again</source> @@ -30,108 +51,138 @@ and start again</source> eğer bu uygulama artık çalışmıyorsa, %1 silinip\tekrar başlatılmalıdır</translation> </message> <message> - <location filename="sharetray.cpp" line="108"/> - <location filename="sharetray.cpp" line="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation>Hata</translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation>X2Go masaüstü paylaşım uygulaması</translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation>Tanınan kullanıcılar...</translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation>Engelli kullanıcılar...</translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation>Masaüstü paylaşımını etkinleştir</translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation>Masaüstü paylaşımını kapat</translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation>X2Go Paylaşımı Hakkında</translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation>&Çıkış</translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> - <source>Can't listen on socket:</source> + <location filename="sharetray.cpp" line="376"/> + <source>Can't listen on socket:</source> <translation>Soket dinlenemiyor:</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation>Erişim sağlandı</translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> <source>%1(%2): access granted</source> - <translation>%1(%2): erişim sağlandı</translation> + <translation type="obsolete">%1(%2): erişim sağlandı</translation> </message> <message> - <location filename="sharetray.cpp" line="415"/> <source>Disconnect %1(%2)</source> - <translation>%1(%2) bağlantısını kes</translation> + <translation type="obsolete">%1(%2) bağlantısını kes</translation> </message> <message> - <location filename="sharetray.cpp" line="420"/> + <location filename="sharetray.cpp" line="440"/> <source>Remote connection</source> <translation>Uzak bağlantı</translation> </message> <message> - <location filename="sharetray.cpp" line="422"/> <source>%1(%2) connected</source> - <translation>%1(%2) bağlandı</translation> + <translation type="obsolete">%1(%2) bağlandı</translation> </message> <message> - <location filename="sharetray.cpp" line="427"/> + <location filename="sharetray.cpp" line="447"/> <source>Access denied</source> <translation>Erişim engellendi</translation> </message> <message> - <location filename="sharetray.cpp" line="428"/> <source>%1(%2): access denied</source> - <translation>%1(%2): erişim engellendi</translation> + <translation type="obsolete">%1(%2): erişim engellendi</translation> </message> <message> - <location filename="sharetray.cpp" line="501"/> + <location filename="sharetray.cpp" line="536"/> <source>User disconnected</source> <translation>Kullanıcı bağlantısı kesildi</translation> </message> <message> - <location filename="sharetray.cpp" line="503"/> <source>%1(%2) disconnected</source> - <translation>%1(%2) bağlantısı kesildi</translation> + <translation type="obsolete">%1(%2) bağlantısı kesildi</translation> </message> <message> - <location filename="sharetray.cpp" line="539"/> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation>Engelli kullanıcılar</translation> </message> <message> - <location filename="sharetray.cpp" line="546"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation>Tanınan kullanıcılar</translation> </message> <message> - <location filename="sharetray.cpp" line="611"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation>X2Go Masaüstü Paylaşımı</translation> </message> @@ -150,22 +201,37 @@ eğer bu uygulama artık çalışmıyorsa, %1 silinip\tekrar başlatılmalıdır </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"> + <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <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><!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"> +</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, 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="obsolete"><!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;">açıkça iyi</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 />Bu uygulama çalışan X oturumunuzu yerel ağınızdaki veya internetteki kullanıcılarla paylaşabilmenizi sağlar. Kullanıcı bağlantılarını kabul veya reddedebilir ve ayarlarınızı kaydedebilirsiniz. Sistem tepsisinde bir simge sizi seçilen yapılandırma ve bağlantı eylemleri hakkında bilgilendirecektir. Ayrıntılı bilgi için lütfen sayfamızı ziyaret edin </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></translation> +</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;">açıkça iyi</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 />Bu uygulama çalışan X oturumunuzu yerel ağınızdaki veya internetteki kullanıcılarla paylaşabilmenizi sağlar. Kullanıcı bağlantılarını kabul veya reddedebilir ve ayarlarınızı kaydedebilirsiniz. Sistem tepsisinde bir simge sizi seçilen yapılandırma ve bağlantı eylemleri hakkında bilgilendirecektir. Ayrıntılı bilgi için lütfen sayfamızı ziyaret e [...] +<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></translation> </message> </context> </TS> diff --git a/x2godesktopsharing_zh_tw.ts b/x2godesktopsharing_zh_tw.ts index 1dcf06f..52f8369 100644 --- a/x2godesktopsharing_zh_tw.ts +++ b/x2godesktopsharing_zh_tw.ts @@ -2,135 +2,155 @@ <!DOCTYPE TS> <TS version="2.0" language="zh_CN"> <context> - <name>MessageBox</name> + <name>AccessWindow</name> <message> - <location filename="messagebox.cpp" line="20"/> - <source>Save selection for %1</source> + <location filename="accessdialog.cpp" line="34"/> + <source>Accept user "%1" from host [%2]?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="messagebox.cpp" line="24"/> - <source>Accept %1 from %2 ?</source> + <location filename="accessdialog.cpp" line="39"/> + <source>Remember selection for user "%1".</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="44"/> + <source>Grant access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="accessdialog.cpp" line="46"/> + <source>Deny access</source> <translation type="unfinished"></translation> </message> </context> <context> <name>ShareTray</name> <message> - <location filename="sharetray.cpp" line="68"/> + <location filename="sharetray.cpp" line="85"/> <source><b>X2Go Desktop Sharing v</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="101"/> + <location filename="sharetray.cpp" line="118"/> <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="358"/> + <location filename="sharetray.cpp" line="125"/> + <location filename="sharetray.cpp" line="378"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="128"/> + <location filename="sharetray.cpp" line="145"/> <source>X2Go desktop sharing application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="133"/> + <location filename="sharetray.cpp" line="150"/> <source>Granted users...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="135"/> + <location filename="sharetray.cpp" line="152"/> <source>Banned users...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="139"/> + <location filename="sharetray.cpp" line="156"/> <source>Activate desktop sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="142"/> + <location filename="sharetray.cpp" line="159"/> <source>Deactivate desktop sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="147"/> + <location filename="sharetray.cpp" line="164"/> <source>About X2Go Desktop Sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="160"/> + <location filename="sharetray.cpp" line="177"/> <source>&Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="356"/> + <location filename="sharetray.cpp" line="376"/> <source>Can't listen on socket:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> + <location filename="sharetray.cpp" line="412"/> <source>Access granted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="392"/> - <source>%1(%2): access granted</source> + <location filename="sharetray.cpp" line="412"/> + <source>User "%1" ([%2]): Access granted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="412"/> - <source>Disconnect %1(%2)</source> + <location filename="sharetray.cpp" line="435"/> + <source>Disconnect "%1" (on host [%2])</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="417"/> - <source>Remote connection</source> + <location filename="sharetray.cpp" line="442"/> + <source>User "%1" ([%2]) is now connected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="419"/> - <source>%1(%2) connected</source> + <location filename="sharetray.cpp" line="448"/> + <source>User "%1" ([%2]): Access denied.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="424"/> - <source>Access denied</source> + <location filename="sharetray.cpp" line="472"/> + <source>User has been disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="425"/> - <source>%1(%2): access denied</source> + <location filename="sharetray.cpp" line="474"/> + <source>User "%1" ([%2]) is now disconnected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="498"/> - <source>User disconnected</source> + <location filename="sharetray.cpp" line="538"/> + <source>User "%1" ([%2]) disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="440"/> + <source>Remote connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="500"/> - <source>%1(%2) disconnected</source> + <location filename="sharetray.cpp" line="447"/> + <source>Access denied</source> <translation type="unfinished"></translation> </message> <message> <location filename="sharetray.cpp" line="536"/> + <source>User disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="sharetray.cpp" line="574"/> <source>Banned users</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="543"/> + <location filename="sharetray.cpp" line="581"/> <source>Granted users</source> <translation type="unfinished"></translation> </message> <message> - <location filename="sharetray.cpp" line="608"/> + <location filename="sharetray.cpp" line="715"/> <source>X2Go Desktop Sharing</source> <translation type="unfinished"></translation> </message> @@ -153,10 +173,14 @@ and start again</source> <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, 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> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> </context> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 0ea98113111b76bb6fbe6b1204ff34facc7cdd2b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 11:03:04 2018 +0100 dlg.ui: Update the about dialog. --- debian/changelog | 1 + dlg.ui | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08adbca..1721724 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium - Drop forgotten-to-remove man8 man pages (moved over to x2goserver src:pkg). - Re-generate .ts translation files (run Qt5's lupdate). + - dlg.ui: Update the about dialog. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/dlg.ui b/dlg.ui index 356917b..8ed2792 100644 --- a/dlg.ui +++ b/dlg.ui @@ -76,10 +76,14 @@ <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></string> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></string> </property> <property name="wordWrap" > <bool>true</bool> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 3819ba7032f649d131ad90e5e200e37553831c82 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 11:05:39 2018 +0100 Fix copyright headers (development started in 2006, not 2009). - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No work contributed by them. --- accessaction.cpp | 2 +- accessaction.h | 2 +- debian/changelog | 3 +++ debian/copyright | 10 +++++----- listdialog.cpp | 2 +- main.cpp | 2 +- share/x2gofeature.d/x2godesktopsharing.features | 4 +--- sharetray.cpp | 2 +- sharetray.h | 2 +- simplelocalsocket.cpp | 2 +- simplelocalsocket.h | 2 +- 11 files changed, 17 insertions(+), 16 deletions(-) diff --git a/accessaction.cpp b/accessaction.cpp index 55bca8c..941af2e 100644 --- a/accessaction.cpp +++ b/accessaction.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/accessaction.h b/accessaction.h index 0f8f5cb..6a2ea0d 100644 --- a/accessaction.h +++ b/accessaction.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/debian/changelog b/debian/changelog index 1721724..3419b9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,9 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium src:pkg). - Re-generate .ts translation files (run Qt5's lupdate). - dlg.ui: Update the about dialog. + - Fix copyright headers (development started in 2006, not 2009). + - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No + work contributed by them. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/debian/copyright b/debian/copyright index 913147d..b616b37 100644 --- a/debian/copyright +++ b/debian/copyright @@ -73,12 +73,12 @@ Files: main.cpp listdialog.cpp simplelocalsocket.cpp simplelocalsocket.h -Copyright: 2009-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Copyright: 2006-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> License: GPL-2+ Files: sharetray.cpp sharetray.h -Copyright: 2009-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Copyright: 2006-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> 2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ @@ -87,9 +87,9 @@ Files: bin/x2goresume-desktopsharing bin/x2goterminate-desktopsharing share/x2gofeature.d/x2godesktopsharing.features Copyright: 2007-2015, X2Go Project - http:wiki.x2go.org - 2011-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - 2011-2015, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> - 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + 2006-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2006-2015, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + 2006-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-2+ Files: debian/* diff --git a/listdialog.cpp b/listdialog.cpp index e582ab0..1fb7a62 100644 --- a/listdialog.cpp +++ b/listdialog.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/main.cpp b/main.cpp index d33a0ec..ade535f 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2015 by Oleksandr Shneyder * + * Copyright (C) 2006-2015 by Oleksandr Shneyder * * oleksandr.shneyder@obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/share/x2gofeature.d/x2godesktopsharing.features b/share/x2gofeature.d/x2godesktopsharing.features index 26e2518..baa85f9 100755 --- a/share/x2gofeature.d/x2godesktopsharing.features +++ b/share/x2gofeature.d/x2godesktopsharing.features @@ -1,6 +1,7 @@ #!/bin/bash # Copyright (C) 2007-2015 X2Go Project - http://wiki.x2go.org +# Copyright (C) 2011-2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,9 +17,6 @@ # along with this program; if not, write to the # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Copyright (C) 2011-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> X2GO_LIB_PATH=`x2gopath libexec` diff --git a/sharetray.cpp b/sharetray.cpp index c0e34c2..2290d7f 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 // Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2011-2018 // // Copyright: See COPYING file that comes with this distribution diff --git a/sharetray.h b/sharetray.h index 8a76b78..67a2e17 100644 --- a/sharetray.h +++ b/sharetray.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 // Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2011-2018 // // Copyright: See COPYING file that comes with this distribution diff --git a/simplelocalsocket.cpp b/simplelocalsocket.cpp index d8e6f00..8962de5 100644 --- a/simplelocalsocket.cpp +++ b/simplelocalsocket.cpp @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // diff --git a/simplelocalsocket.h b/simplelocalsocket.h index ad831ff..7994aef 100644 --- a/simplelocalsocket.h +++ b/simplelocalsocket.h @@ -4,7 +4,7 @@ // Description: // // -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2006-2015 // // Copyright: See COPYING file that comes with this distribution // -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 202742ccc6413e504801193a4069567aa3c16a92 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 11:20:48 2018 +0100 rebase l10n --- x2godesktopsharing_da.ts | 18 ------------------ x2godesktopsharing_es.ts | 18 ------------------ x2godesktopsharing_et.ts | 18 ------------------ x2godesktopsharing_fi.ts | 18 ------------------ x2godesktopsharing_fr.ts | 15 --------------- x2godesktopsharing_nb_no.ts | 18 ------------------ x2godesktopsharing_nl.ts | 11 ----------- x2godesktopsharing_ru.ts | 11 ----------- x2godesktopsharing_sv.ts | 18 ------------------ x2godesktopsharing_tr.ts | 18 ------------------ 10 files changed, 163 deletions(-) diff --git a/x2godesktopsharing_da.ts b/x2godesktopsharing_da.ts index c81767c..4f51933 100644 --- a/x2godesktopsharing_da.ts +++ b/x2godesktopsharing_da.ts @@ -216,23 +216,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!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 />Denne program tillader dig at dele dine igangværende X-Sessioner med andre bruger over et lokalt netværk eller internet adgang. Du vil have chancen at bevilge eller benægte bruger forbindelser og gemme dine prreferencer. En værktøjs Ikon vil informere dig om valgte konfiguration og informere dig om forbindelses begivenheder. For mere informati [...] -<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></translation> - </message> </context> </TS> diff --git a/x2godesktopsharing_es.ts b/x2godesktopsharing_es.ts index 91bb23b..9979f6d 100644 --- a/x2godesktopsharing_es.ts +++ b/x2godesktopsharing_es.ts @@ -215,23 +215,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!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 />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 [...] -<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></translation> - </message> </context> </TS> diff --git a/x2godesktopsharing_et.ts b/x2godesktopsharing_et.ts index 06c843c..e4da75d 100644 --- a/x2godesktopsharing_et.ts +++ b/x2godesktopsharing_et.ts @@ -216,23 +216,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!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 />See rakendus võimaldab töölaua jagamist teiste kasutajatega internetis või lokaalvõrgus. Võid keelata või lubada ühendusedja salvestada oma seaded. Tööriba ikoon informeerib Sind valitud konfiguratsioonist ja olekutest. Lisainformatsiooni saad : </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></translation> - </message> </context> </TS> diff --git a/x2godesktopsharing_fi.ts b/x2godesktopsharing_fi.ts index 23f3017..21fff10 100644 --- a/x2godesktopsharing_fi.ts +++ b/x2godesktopsharing_fi.ts @@ -216,23 +216,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!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 />Tämä sovellus mahdollistaa työpöydänjaon muiden käyttäjien kanssa paikallisverkossa tai internetin kauttat. Voit sallia tai kieltää yhteydenottoja ja tallentaa pysyvästi asetuksesi. Kuvake järjestelmäruudussa näyttää valitun asetuskokoonpanon ja sinulle tulee ilmoitus yhteydenotoista. Saadaksesi lisätietoja, katso: </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></translation> - </message> </context> </TS> diff --git a/x2godesktopsharing_fr.ts b/x2godesktopsharing_fr.ts index 6e6c7a3..b944512 100644 --- a/x2godesktopsharing_fr.ts +++ b/x2godesktopsharing_fr.ts @@ -185,20 +185,5 @@ p, li { white-space: pre-wrap; } <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></translation> </message> - <message> - <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;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></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 X11 session with other users over a local network or internet.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />On incoming sharing requests you can allow or deny user connections and save your preferences.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.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 index 70c0639..c047607 100644 --- a/x2godesktopsharing_nb_no.ts +++ b/x2godesktopsharing_nb_no.ts @@ -219,23 +219,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!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 />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 tilkob [...] -<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></translation> - </message> </context> </TS> diff --git a/x2godesktopsharing_nl.ts b/x2godesktopsharing_nl.ts index 84cf14e..cc19897 100644 --- a/x2godesktopsharing_nl.ts +++ b/x2godesktopsharing_nl.ts @@ -227,16 +227,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "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:0p [...] - </message> </context> </TS> diff --git a/x2godesktopsharing_ru.ts b/x2godesktopsharing_ru.ts index 45b6838..660a81f 100644 --- a/x2godesktopsharing_ru.ts +++ b/x2godesktopsharing_ru.ts @@ -227,16 +227,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//RU" "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-to [...] - </message> </context> </TS> diff --git a/x2godesktopsharing_sv.ts b/x2godesktopsharing_sv.ts index a40d765..ae24f33 100644 --- a/x2godesktopsharing_sv.ts +++ b/x2godesktopsharing_sv.ts @@ -216,23 +216,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!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 />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: </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></translation> - </message> </context> </TS> diff --git a/x2godesktopsharing_tr.ts b/x2godesktopsharing_tr.ts index ffd5de6..4d22336 100644 --- a/x2godesktopsharing_tr.ts +++ b/x2godesktopsharing_tr.ts @@ -215,23 +215,5 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> <translation type="unfinished"></translation> </message> - <message> - <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, 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="obsolete"><!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;">açıkça iyi</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 />Bu uygulama çalışan X oturumunuzu yerel ağınızdaki veya internetteki kullanıcılarla paylaşabilmenizi sağlar. Kullanıcı bağlantılarını kabul veya reddedebilir ve ayarlarınızı kaydedebilirsiniz. Sistem tepsisinde bir simge sizi seçilen yapılandırma ve bağlantı eylemleri hakkında bilgilendirecektir. Ayrıntılı bilgi için lütfen sayfamızı ziyaret e [...] -<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></translation> - </message> </context> </TS> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit f4454a4c1ec9acd2074986fd197d7dcd0de624f1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 11:21:17 2018 +0100 i18n: Update German translation. --- debian/changelog | 1 + x2godesktopsharing_de.ts | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3e4dc9..b64673d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium - Drop Oleksandr and Heinz from the x2godesktopsharing.features file. No work contributed by them. - Update Oleksandr's mail address in all headers etc. + - i18n: Update German translation. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/x2godesktopsharing_de.ts b/x2godesktopsharing_de.ts index 666c8dc..b8d226d 100644 --- a/x2godesktopsharing_de.ts +++ b/x2godesktopsharing_de.ts @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="de"> +<TS version="2.1" language="de"> <context> <name>AccessWindow</name> <message> <location filename="accessdialog.cpp" line="34"/> <source>Accept user "%1" from host [%2]?</source> - <translation type="unfinished"></translation> + <translation>Benutzer "%1" von Rechner [%2] zulassen?</translation> </message> <message> <location filename="accessdialog.cpp" line="39"/> <source>Remember selection for user "%1".</source> - <translation type="unfinished"></translation> + <translation>Auswahl für Benutzer "%1" erinnern.</translation> </message> <message> <location filename="accessdialog.cpp" line="44"/> <source>Grant access</source> - <translation type="unfinished"></translation> + <translation>Zugriff gewähren</translation> </message> <message> <location filename="accessdialog.cpp" line="46"/> <source>Deny access</source> - <translation type="unfinished"></translation> + <translation>Zugriff verweigern</translation> </message> </context> <context> @@ -68,17 +68,17 @@ <message> <location filename="sharetray.cpp" line="412"/> <source>User "%1" ([%2]): Access granted.</source> - <translation type="unfinished"></translation> + <translation>Benutzer "%1" ([%2]): Zugriff gewährt.</translation> </message> <message> <location filename="sharetray.cpp" line="435"/> <source>Disconnect "%1" (on host [%2])</source> - <translation type="unfinished"></translation> + <translation>Trenne "%1" (auf Rechner [%2])</translation> </message> <message> <location filename="sharetray.cpp" line="442"/> <source>User "%1" ([%2]) is now connected.</source> - <translation type="unfinished"></translation> + <translation>Benutzer "%1" ([%2]) ist jetzt verbunden.</translation> </message> <message> <location filename="sharetray.cpp" line="447"/> @@ -88,7 +88,7 @@ <message> <location filename="sharetray.cpp" line="538"/> <source>User "%1" ([%2]) disconnected</source> - <translation type="unfinished"></translation> + <translation>Benutzer "%1" ([%2]) getrennt</translation> </message> <message> <location filename="sharetray.cpp" line="440"/> @@ -98,17 +98,17 @@ <message> <location filename="sharetray.cpp" line="448"/> <source>User "%1" ([%2]): Access denied.</source> - <translation type="unfinished"></translation> + <translation>Benutzer "%1" ([%2]): Zugriff verweigert.</translation> </message> <message> <location filename="sharetray.cpp" line="472"/> <source>User has been disconnected</source> - <translation type="unfinished"></translation> + <translation>Der Benutzer wurde getrennt.</translation> </message> <message> <location filename="sharetray.cpp" line="474"/> <source>User "%1" ([%2]) is now disconnected.</source> - <translation type="unfinished"></translation> + <translation>Benutzer "%1" ([%2]) ist jetzt getrennt.</translation> </message> <message> <location filename="sharetray.cpp" line="536"/> @@ -225,18 +225,18 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />A system tray icon will inform you about the chosen configuration and you'll be informed about connect and disconnect events.</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />For further information, please visit </p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></source> - <translation type="unfinished"></translation> - </message> - <message> - <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">; + <translation type="unfinished"><!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, 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="obsolete"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "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:0p [...] +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />(C) 2006-2015, <span style=" font-weight:600;">Oleksandr Schneyder</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2006-2015, <span style=" font-weight:600;">Heinz-Markus Graesing</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(C) 2011-2018, <span style=" font-weight:600;">Mike Gabriel</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />Dieses Applet ermöglicht die Freigabe der laufenden X11 Sitzung, um anderen Benutzern darauf über das lokale Netzwerk oder über das Internet Zugriff zu gewähren.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />Bei Eingehen einer Anfrage zur Desktopfreigabe kann man der Verbindungsanfrage zustimmen oder diese ablehnen und die Entscheidung als Voreinstellung speichern.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />Ein Symol im System-Tray informiert über die aktuell gewählte Konfiguration und benachrichtigt den Nutzer über eingehende Verbindungen oder das Trennen von bestehenden Verbindungen.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />Weitere Informationen finden Sie unter:</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://wiki.x2go.org"><span style=" text-decoration: underline; color:#0000ff;">https://wiki.x2go.org</span></a></p></body></html></translation> </message> </context> </TS> -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 5413d7c6af2cef4733b05886ac43f5986d470bd6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 17 11:32:16 2018 +0100 Update upstream version string in man page and sharetray.cpp. --- debian/changelog | 1 + man/man1/x2godesktopsharing.1 | 2 +- sharetray.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b64673d..baaaa8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,7 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium work contributed by them. - Update Oleksandr's mail address in all headers etc. - i18n: Update German translation. + - Update upstream version string in man page and sharetray.cpp. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/man/man1/x2godesktopsharing.1 b/man/man1/x2godesktopsharing.1 index 4309387..0ca70ed 100644 --- a/man/man1/x2godesktopsharing.1 +++ b/man/man1/x2godesktopsharing.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2godesktopsharing 1 "Nov 2017" "Version 3.1.1.5" "X2Go Application" +.TH x2godesktopsharing 1 "Nov 2018" "Version 3.2.0.0" "X2Go Application" .SH NAME x2godesktopsharing \- Share an X2Go desktop with other clients and users. .SH SYNOPSIS diff --git a/sharetray.cpp b/sharetray.cpp index 79de551..8df1100 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -40,7 +40,7 @@ #include <stdint.h> #define STAT_ACT_COUNT 10 -#define VERSION "3.1.1.5" +#define VERSION "3.2.0.0" //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org