x2go-commits April 2012

x2go-commits@lists.x2go.org

1 participants
194 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-215-gc23d9f4
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via c23d9f46f3b6fd8c4155db7af689e15f76096a24 (commit) from ef4ae509162b4b5a13c319e7e87e584f3837b53b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c23d9f46f3b6fd8c4155db7af689e15f76096a24 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 18:25:37 2012 +0200 Provide X2goSession.get_session_type() method. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 7 +++++++ x2go/session.py | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2b9f7cb..8bdba1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -111,6 +111,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low around faulty abortion of client implementations. - Handle detection of free TCP/IP X display port far more intelligently. - On unused port detection bind to 127.0.0.1 by default. + - Provide X2goSession.get_session_type() method. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 9e9b801..095445e 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -407,6 +407,13 @@ class X2goTerminalSessionSTDOUT(object): """ return self.params.cmd + def get_session_type(self) + """\ + STILL UNDOCUMENTED + + """ + return self.session_type + def start_sound(self): """\ Initialize Paramiko/SSH reverse forwarding tunnel for X2Go sound. diff --git a/x2go/session.py b/x2go/session.py index d3d7d9e..3e134d8 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -791,6 +791,24 @@ class X2goSession(object): return None __get_session_cmd = get_session_cmd + def get_session_type(self): + """\ + Retrieve the session type of a session (R, D, S or P). + + R: rootless session + D: desktop session + S: shadow session + P: session in published applications mode + + @return: session type + @rtype: C{str} + + """ + if self.has_terminal_session(): + return self.terminal_session.get_session_type() + else: + return None + def get_session_title(self): """\ Retrieve the session window title of this hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API). [View Less]

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-215-g3bdee18
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via 3bdee1820a55752899982778a828e1b912786df2 (commit) from c3eefb060d951a15a0362b7fe9ffc03b736ba849 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3bdee1820a55752899982778a828e1b912786df2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-214-gc3eefb0
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via c3eefb060d951a15a0362b7fe9ffc03b736ba849 (commit) from d7e5809e0a9165ce9dc20c1f4298784da377470d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c3eefb060d951a15a0362b7fe9ffc03b736ba849 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 17:33:02 2012 +0200 rebuilt .mo files ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 23334 -> 23334 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 21856 -> 21856 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 17738 -> 17738 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 18323 -> 18323 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 21512 -> 22247 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 20767 -> 20767 bytes po/PyHoca-GUI.pot | 2 +- po/bg.po | 2 +- po/de.po | 2 +- po/en.po | 2 +- po/es.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 201 ++++++++++++++--------------- po/sv.po | 2 +- 15 files changed, 104 insertions(+), 111 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index 0816a2a..006169f 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 7a5983a..3d6cd9e 100644 Binary files a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo index 7476d6e..cf89b31 100644 Binary files a/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/en/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index 9002bc0..c1a6ea6 100644 Binary files a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index c5c3eda..a8b8f8d 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo index 2f8bea3..52f279f 100644 Binary files a/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index 11b4938..8425080 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 5077f3b..913e92c 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" diff --git a/po/bg.po b/po/bg.po index c5f7c0b..68bb45b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati(a)yahoo.com>\n" diff --git a/po/de.po b/po/de.po index 98e51ce..1227f6b 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: 2012-04-16 17:07+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" diff --git a/po/en.po b/po/en.po index ac63afe..0f7d393 100644 --- a/po/en.po +++ b/po/en.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: 2012-04-16 17:04+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" diff --git a/po/es.po b/po/es.po index 998f615..b63fb69 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: 2011-11-30 15:59+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish <x2go-dev(a)lists.berlios.de>\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index fdad886..8b5c51e 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: 2012-02-19 23:16+0100\n" "Last-Translator: Terje Andersen <teranders(a)gmail.com>\n" "Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n" diff --git a/po/nl.po b/po/nl.po index b7c89a5..c017067 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: 2012-04-18 17:30+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 -#: ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Gebruiker" -#: ../pyhoca/wxgui/logon.py:86 -#: ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Wachtwoord" @@ -51,28 +49,23 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 -#: ../pyhoca/wxgui/profilemanager.py:310 -#: ../pyhoca/wxgui/messages.py:109 -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:277 -#: ../pyhoca/wxgui/logon.py:319 +#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 #: ../pyhoca/wxgui/frontend.py:469 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:469 +#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:469 msgid "User is not allowed to start X2Go sessions!" msgstr "Gebruiker mag geen X2Go sessie starten!" -#: ../pyhoca/wxgui/logon.py:283 -#: ../pyhoca/wxgui/frontend.py:476 +#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:476 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -98,38 +91,35 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:343 -#: ../pyhoca/wxgui/frontend.py:517 +#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:517 #, python-format msgid "%s - DNS error" msgstr "%s - DNS fout" -#: ../pyhoca/wxgui/logon.py:350 -#: ../pyhoca/wxgui/frontend.py:524 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:524 #, python-format msgid "%s - socket error" msgstr "%s - socket fout" -#: ../pyhoca/wxgui/logon.py:357 -#: ../pyhoca/wxgui/frontend.py:503 +#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:503 #: ../pyhoca/wxgui/frontend.py:510 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:358 -#: ../pyhoca/wxgui/frontend.py:503 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker" +#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:503 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de server is ongeldig of is niet geaccepteerd door de " +"gebruiker" -#: ../pyhoca/wxgui/logon.py:365 -#: ../pyhoca/wxgui/frontend.py:545 +#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:545 #, python-format msgid "%s - missing home directory" msgstr "%s - home directory niet aanwezig" -#: ../pyhoca/wxgui/logon.py:366 -#: ../pyhoca/wxgui/frontend.py:545 +#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:545 msgid "The remote user's home directory does not exist." msgstr "De home directory op afstand van de gebruiker bestaat niet" @@ -138,14 +128,12 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:381 -#: ../pyhoca/wxgui/frontend.py:552 +#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:552 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" -#: ../pyhoca/wxgui/logon.py:389 -#: ../pyhoca/wxgui/frontend.py:496 +#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:496 #, python-format msgid "%s - SSH error" msgstr "%s - sleutel fout" @@ -232,28 +220,23 @@ msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminalserver (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:84 -#: ../pyhoca/wxgui/profilemanager.py:200 +#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200 msgid "Custom command" msgstr "Speciaal Commando" -#: ../pyhoca/wxgui/profilemanager.py:87 -#: ../pyhoca/wxgui/menus_taskbar.py:355 +#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:355 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:88 -#: ../pyhoca/wxgui/menus_taskbar.py:356 +#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:356 msgid "Email Client" msgstr "E-Mail Programma" -#: ../pyhoca/wxgui/profilemanager.py:89 -#: ../pyhoca/wxgui/menus_taskbar.py:357 +#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:90 -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" msgstr "Terminal" @@ -393,8 +376,7 @@ msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 -#: ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 msgid "User" msgstr "Gebruiker" @@ -519,8 +501,7 @@ msgstr "Delen van lokale mappen" msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:285 -#: ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 msgid "Add" msgstr "Toevoegen" @@ -642,8 +623,7 @@ msgstr "Kies een map om te delen" #: ../pyhoca/wxgui/profilemanager.py:1601 #: ../pyhoca/wxgui/profilemanager.py:1604 #: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 -#: ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profiel manager" @@ -664,10 +644,12 @@ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." #: ../pyhoca/wxgui/profilemanager.py:1619 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale SSH proxy.\n" +"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " +"SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." #: ../pyhoca/wxgui/profilemanager.py:1639 @@ -717,8 +699,7 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:144 -#: ../pyhoca/wxgui/menus_taskbar.py:728 +#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 #: ../pyhoca/wxgui/menus_taskbar.py:890 msgid "E&xit" msgstr "&Beeindigen" @@ -727,8 +708,7 @@ msgstr "&Beeindigen" msgid "Window title" msgstr "Scherm titel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 -#: ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 msgid "Resume Session" msgstr "Sessie hervatten" @@ -744,38 +724,31 @@ msgstr "Sessie overnemen" msgid "Transfer Session (not possible)" msgstr "Sessie overnemen (niet mogelijk)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 -#: ../pyhoca/wxgui/menus_taskbar.py:544 +#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect/exit)" msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:230 -#: ../pyhoca/wxgui/menus_taskbar.py:546 +#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session (and disconnect)" msgstr "Suspend Sessie (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:232 -#: ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:238 -#: ../pyhoca/wxgui/menus_taskbar.py:557 +#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect/exit)" msgstr "Sessie beëindigen (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:240 -#: ../pyhoca/wxgui/menus_taskbar.py:559 +#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session (and disconnect)" msgstr "Sessie beëindigen (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:242 -#: ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Terminate Session" msgstr "Sessie beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:246 -#: ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 msgid "Refresh menu tree" msgstr "Ververs menu" @@ -848,17 +821,19 @@ msgid "still loading" msgstr "nog aan het laden" #: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "On slow connections, the loading of the application menu can take a couple of seconds." -msgstr "Bij een langzame verbinding kan het laden van het menu met de applicaties enige seconden duren" +msgid "" +"On slow connections, the loading of the application menu can take a couple " +"of seconds." +msgstr "" +"Bij een langzame verbinding kan het laden van het menu met de applicaties " +"enige seconden duren" -#: ../pyhoca/wxgui/menus_taskbar.py:435 -#: ../pyhoca/wxgui/menus_taskbar.py:492 +#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 #: ../pyhoca/wxgui/menus_taskbar.py:631 msgid "Retrieving Application Menu..." msgstr "Bezig met ophalen applicatiemenu..." -#: ../pyhoca/wxgui/menus_taskbar.py:467 -#: ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 #, python-format msgid "Connect %s" msgstr "Verbind %s" @@ -871,8 +846,7 @@ msgstr "Nu aan het verbinden..." msgid "Start &new Desktop Session" msgstr "&Nieuwe Desktop Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:496 -#: ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 msgid "Retrieve Application Menu" msgstr "Haal applicatiemenu op" @@ -936,8 +910,7 @@ msgstr "Sessie starten/hervatten" msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/about.py:55 -#: ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -969,8 +942,11 @@ msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." #: ../pyhoca/wxgui/frontend.py:510 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " +"gebruiker" #: ../pyhoca/wxgui/frontend.py:531 #, python-format @@ -1055,13 +1031,15 @@ msgstr "%s - Verbindingsfout (channel error)" #: ../pyhoca/wxgui/frontend.py:937 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " +"opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:947 -#: ../pyhoca/wxgui/frontend.py:954 -#: ../pyhoca/wxgui/frontend.py:956 -#: ../pyhoca/wxgui/frontend.py:968 +#: ../pyhoca/wxgui/frontend.py:947 ../pyhoca/wxgui/frontend.py:954 +#: ../pyhoca/wxgui/frontend.py:956 ../pyhoca/wxgui/frontend.py:968 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" @@ -1091,13 +1069,21 @@ msgstr "%s - sessie waarschuwing" #: ../pyhoca/wxgui/frontend.py:962 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." #: ../pyhoca/wxgui/frontend.py:968 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +msgstr "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:980 #, python-format @@ -1105,11 +1091,12 @@ msgid "%s - audio warning" msgstr "%s - audio waarschuwing" #: ../pyhoca/wxgui/frontend.py:980 -msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" +msgid "" +"The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "" +"Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:983 -#: ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:983 ../pyhoca/wxgui/frontend.py:986 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" @@ -1188,8 +1175,7 @@ msgstr "" "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1015 -#: ../pyhoca/wxgui/frontend.py:1017 +#: ../pyhoca/wxgui/frontend.py:1015 ../pyhoca/wxgui/frontend.py:1017 #, python-format msgid "%s - print error" msgstr "%s - Printfout" @@ -1216,8 +1202,7 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1021 -#: ../pyhoca/wxgui/frontend.py:1025 +#: ../pyhoca/wxgui/frontend.py:1021 ../pyhoca/wxgui/frontend.py:1025 #, python-format msgid "%s - start" msgstr "%s - Start" @@ -1240,8 +1225,7 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1029 -#: ../pyhoca/wxgui/frontend.py:1033 +#: ../pyhoca/wxgui/frontend.py:1029 ../pyhoca/wxgui/frontend.py:1033 #, python-format msgid "%s - resume" msgstr "%s - hervatten" @@ -1338,8 +1322,7 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:103 -#: ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1444,8 +1427,10 @@ msgstr "OK" #~ msgid "Disconnect and E&xit" #~ msgstr "Verbreek verbinding en e&xit" + #~ msgid "%s - connect error" #~ msgstr "%s - Verbindingsfout" + #~ msgid "new session profile" #~ msgstr "Nieuw Profiel" @@ -1456,26 +1441,34 @@ msgstr "OK" #, fuzzy #~ msgid "Retrieving Application menu..." #~ msgstr "Enkelvoudige Applicatie" + #~ msgid "RDP settings" #~ msgstr "RDP instellingen" + #~ msgid "Session Profile" #~ msgstr "Sessie Profiel" + #~ msgid "Icon" #~ msgstr "Icon" + #~ msgid "All session profiles are connected" #~ msgstr "Alle profielen zijn verbonden" + #~ msgid "New Profile" #~ msgstr "Profiel" + #~ msgid "%s - print job" #~ msgstr "%s - print job" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "De Print job dialog is nog niet geimplementeerd!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profile icon" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/sv.po b/po/sv.po index c166d9d..9197e42 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:08+0200\n" +"POT-Creation-Date: 2012-04-18 17:32+0200\n" "PO-Revision-Date: 2012-04-06 09:56+0100\n" "Last-Translator: Daniel Lindgren <bd.dali(a)gmail.com>\n" "Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n" hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)). [View Less]

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-213-gd7e5809
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via d7e5809e0a9165ce9dc20c1f4298784da377470d (commit) from f37c235acd7491deb742e38f469c2461f9ec8b52 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d7e5809e0a9165ce9dc20c1f4298784da377470d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 17:31:45 2012 +0200 Dutch i18n update ----------------------------------------------------------------------- Summary of changes: po/nl.po | 223 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 112 insertions(+), 111 deletions(-) The diff of changes is: diff --git a/po/nl.po b/po/nl.po index 92f9fde..b7c89a5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-04-16 17:08+0200\n" -"PO-Revision-Date: 2012-04-15 16:05+0100\n" +"PO-Revision-Date: 2012-04-18 17:30+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" "Language: \n" @@ -25,11 +25,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:96 msgid "Username" msgstr "Gebruiker" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98 +#: ../pyhoca/wxgui/logon.py:86 +#: ../pyhoca/wxgui/logon.py:98 msgid "Password" msgstr "Wachtwoord" @@ -49,23 +51,28 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:310 -#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/logon.py:121 +#: ../pyhoca/wxgui/profilemanager.py:310 +#: ../pyhoca/wxgui/messages.py:109 +#: ../pyhoca/wxgui/printingprefs.py:138 #: ../pyhoca/wxgui/sessiontitle.py:75 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319 +#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:319 #: ../pyhoca/wxgui/frontend.py:469 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:469 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:469 msgid "User is not allowed to start X2Go sessions!" msgstr "Gebruiker mag geen X2Go sessie starten!" -#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:476 +#: ../pyhoca/wxgui/logon.py:283 +#: ../pyhoca/wxgui/frontend.py:476 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,35 +98,38 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:343 ../pyhoca/wxgui/frontend.py:517 +#: ../pyhoca/wxgui/logon.py:343 +#: ../pyhoca/wxgui/frontend.py:517 #, python-format msgid "%s - DNS error" msgstr "%s - DNS fout" -#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:524 +#: ../pyhoca/wxgui/logon.py:350 +#: ../pyhoca/wxgui/frontend.py:524 #, python-format msgid "%s - socket error" msgstr "%s - socket fout" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:503 +#: ../pyhoca/wxgui/logon.py:357 +#: ../pyhoca/wxgui/frontend.py:503 #: ../pyhoca/wxgui/frontend.py:510 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:503 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"De sleutel van de server is ongeldig of is niet geaccepteerd door de " -"gebruiker" +#: ../pyhoca/wxgui/logon.py:358 +#: ../pyhoca/wxgui/frontend.py:503 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker" -#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:545 +#: ../pyhoca/wxgui/logon.py:365 +#: ../pyhoca/wxgui/frontend.py:545 #, python-format msgid "%s - missing home directory" msgstr "%s - home directory niet aanwezig" -#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:545 +#: ../pyhoca/wxgui/logon.py:366 +#: ../pyhoca/wxgui/frontend.py:545 msgid "The remote user's home directory does not exist." msgstr "De home directory op afstand van de gebruiker bestaat niet" @@ -128,12 +138,14 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet" msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:552 +#: ../pyhoca/wxgui/logon.py:381 +#: ../pyhoca/wxgui/frontend.py:552 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" -#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:496 +#: ../pyhoca/wxgui/logon.py:389 +#: ../pyhoca/wxgui/frontend.py:496 #, python-format msgid "%s - SSH error" msgstr "%s - sleutel fout" @@ -220,23 +232,28 @@ msgid "Windows Terminal Server (RDP-proxy)" msgstr "Windows Terminalserver (RDP-proxy)" #. 'DirectRDP': 'Windows Terminal Server (RDP-direct)', -#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:200 +#: ../pyhoca/wxgui/profilemanager.py:84 +#: ../pyhoca/wxgui/profilemanager.py:200 msgid "Custom command" msgstr "Speciaal Commando" -#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:355 +#: ../pyhoca/wxgui/profilemanager.py:87 +#: ../pyhoca/wxgui/menus_taskbar.py:355 msgid "Internet Browser" msgstr "Internetbrowser" -#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:356 +#: ../pyhoca/wxgui/profilemanager.py:88 +#: ../pyhoca/wxgui/menus_taskbar.py:356 msgid "Email Client" msgstr "E-Mail Programma" -#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357 +#: ../pyhoca/wxgui/profilemanager.py:89 +#: ../pyhoca/wxgui/menus_taskbar.py:357 msgid "Office" msgstr "Office" -#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/profilemanager.py:90 +#: ../pyhoca/wxgui/menus_taskbar.py:358 msgid "Terminal" msgstr "Terminal" @@ -376,7 +393,8 @@ msgstr "Menu met gepubliceerde applicaties" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:215 ../pyhoca/wxgui/profilemanager.py:225 +#: ../pyhoca/wxgui/profilemanager.py:215 +#: ../pyhoca/wxgui/profilemanager.py:225 msgid "User" msgstr "Gebruiker" @@ -501,7 +519,8 @@ msgstr "Delen van lokale mappen" msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:285 ../pyhoca/wxgui/profilemanager.py:304 +#: ../pyhoca/wxgui/profilemanager.py:285 +#: ../pyhoca/wxgui/profilemanager.py:304 msgid "Add" msgstr "Toevoegen" @@ -623,7 +642,8 @@ msgstr "Kies een map om te delen" #: ../pyhoca/wxgui/profilemanager.py:1601 #: ../pyhoca/wxgui/profilemanager.py:1604 #: ../pyhoca/wxgui/profilemanager.py:1609 -#: ../pyhoca/wxgui/profilemanager.py:1619 ../pyhoca/wxgui/menus_taskbar.py:106 +#: ../pyhoca/wxgui/profilemanager.py:1619 +#: ../pyhoca/wxgui/menus_taskbar.py:106 msgid "Profile Manager" msgstr "Profiel manager" @@ -644,12 +664,10 @@ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." #: ../pyhoca/wxgui/profilemanager.py:1619 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " -"SSH proxy.\n" +"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." #: ../pyhoca/wxgui/profilemanager.py:1639 @@ -699,7 +717,8 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:728 +#: ../pyhoca/wxgui/menus_taskbar.py:144 +#: ../pyhoca/wxgui/menus_taskbar.py:728 #: ../pyhoca/wxgui/menus_taskbar.py:890 msgid "E&xit" msgstr "&Beeindigen" @@ -708,7 +727,8 @@ msgstr "&Beeindigen" msgid "Window title" msgstr "Scherm titel" -#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:553 +#: ../pyhoca/wxgui/menus_taskbar.py:209 +#: ../pyhoca/wxgui/menus_taskbar.py:553 msgid "Resume Session" msgstr "Sessie hervatten" @@ -724,35 +744,38 @@ msgstr "Sessie overnemen" msgid "Transfer Session (not possible)" msgstr "Sessie overnemen (niet mogelijk)" -#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:544 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:228 +#: ../pyhoca/wxgui/menus_taskbar.py:544 msgid "Suspend Session (and disconnect/exit)" -msgstr "Suspend Sessie en e&xit" +msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:546 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:230 +#: ../pyhoca/wxgui/menus_taskbar.py:546 msgid "Suspend Session (and disconnect)" -msgstr "Suspend Sessie en e&xit" +msgstr "Suspend Sessie (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:548 +#: ../pyhoca/wxgui/menus_taskbar.py:232 +#: ../pyhoca/wxgui/menus_taskbar.py:548 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:557 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:238 +#: ../pyhoca/wxgui/menus_taskbar.py:557 msgid "Terminate Session (and disconnect/exit)" -msgstr "Sessie beëindigen" +msgstr "Sessie beëindigen (en Verbinding verbreken / e&xit)" -#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:559 -#, fuzzy +#: ../pyhoca/wxgui/menus_taskbar.py:240 +#: ../pyhoca/wxgui/menus_taskbar.py:559 msgid "Terminate Session (and disconnect)" -msgstr "Sessie beëindigen" +msgstr "Sessie beëindigen (en Verbinding verbreken)" -#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:561 +#: ../pyhoca/wxgui/menus_taskbar.py:242 +#: ../pyhoca/wxgui/menus_taskbar.py:561 msgid "Terminate Session" msgstr "Sessie beëindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:541 +#: ../pyhoca/wxgui/menus_taskbar.py:246 +#: ../pyhoca/wxgui/menus_taskbar.py:541 msgid "Refresh menu tree" msgstr "Ververs menu" @@ -825,19 +848,17 @@ msgid "still loading" msgstr "nog aan het laden" #: ../pyhoca/wxgui/menus_taskbar.py:433 -msgid "" -"On slow connections, the loading of the application menu can take a couple " -"of seconds." -msgstr "" -"Bij een langzame verbinding kan het laden van het menu met de applicaties " -"enige seconden duren" +msgid "On slow connections, the loading of the application menu can take a couple of seconds." +msgstr "Bij een langzame verbinding kan het laden van het menu met de applicaties enige seconden duren" -#: ../pyhoca/wxgui/menus_taskbar.py:435 ../pyhoca/wxgui/menus_taskbar.py:492 +#: ../pyhoca/wxgui/menus_taskbar.py:435 +#: ../pyhoca/wxgui/menus_taskbar.py:492 #: ../pyhoca/wxgui/menus_taskbar.py:631 msgid "Retrieving Application Menu..." msgstr "Bezig met ophalen applicatiemenu..." -#: ../pyhoca/wxgui/menus_taskbar.py:467 ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:467 +#: ../pyhoca/wxgui/menus_taskbar.py:479 #, python-format msgid "Connect %s" msgstr "Verbind %s" @@ -850,7 +871,8 @@ msgstr "Nu aan het verbinden..." msgid "Start &new Desktop Session" msgstr "&Nieuwe Desktop Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:496 ../pyhoca/wxgui/menus_taskbar.py:634 +#: ../pyhoca/wxgui/menus_taskbar.py:496 +#: ../pyhoca/wxgui/menus_taskbar.py:634 msgid "Retrieve Application Menu" msgstr "Haal applicatiemenu op" @@ -891,14 +913,12 @@ msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" #: ../pyhoca/wxgui/menus_taskbar.py:720 -#, fuzzy msgid "Suspend Session and E&xit application" -msgstr "Bezig met suspend van sessie en afsluiten van applicatie" +msgstr "Suspend Sessie en e&xit" #: ../pyhoca/wxgui/menus_taskbar.py:724 -#, fuzzy msgid "Disconnect and E&xit application" -msgstr "Bezig met verbreken verbinding %s en afsluiten applicatie ..." +msgstr "verbinding verbreken en e&xit" #: ../pyhoca/wxgui/menus_taskbar.py:753 msgid "Add Profile" @@ -916,7 +936,8 @@ msgstr "Sessie starten/hervatten" msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -926,9 +947,9 @@ msgid "Suspending sessions and exiting application..." msgstr "Bezig met suspend van sessie en afsluiten van applicatie" #: ../pyhoca/wxgui/frontend.py:364 -#, fuzzy, python-format +#, python-format msgid "Disconnecting %s and exiting application..." -msgstr "Bezig met verbreken verbinding %s en afsluiten applicatie ..." +msgstr "Bezig met verbreken verbinding %s en afsluiten applicatie..." #: ../pyhoca/wxgui/frontend.py:366 msgid "Exiting application..." @@ -948,11 +969,8 @@ msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." #: ../pyhoca/wxgui/frontend.py:510 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " -"gebruiker" +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker" #: ../pyhoca/wxgui/frontend.py:531 #, python-format @@ -1037,15 +1055,13 @@ msgstr "%s - Verbindingsfout (channel error)" #: ../pyhoca/wxgui/frontend.py:937 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " -"opnieuw aan te melden..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:947 ../pyhoca/wxgui/frontend.py:954 -#: ../pyhoca/wxgui/frontend.py:956 ../pyhoca/wxgui/frontend.py:968 +#: ../pyhoca/wxgui/frontend.py:947 +#: ../pyhoca/wxgui/frontend.py:954 +#: ../pyhoca/wxgui/frontend.py:956 +#: ../pyhoca/wxgui/frontend.py:968 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" @@ -1075,21 +1091,13 @@ msgstr "%s - sessie waarschuwing" #: ../pyhoca/wxgui/frontend.py:962 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." -msgstr "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." #: ../pyhoca/wxgui/frontend.py:968 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:980 #, python-format @@ -1097,12 +1105,11 @@ msgid "%s - audio warning" msgstr "%s - audio waarschuwing" #: ../pyhoca/wxgui/frontend.py:980 -msgid "" -"The X2Go PulseAudio system is not available within Remote Desktop sessions." -msgstr "" -"Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" +msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions." +msgstr "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:983 ../pyhoca/wxgui/frontend.py:986 +#: ../pyhoca/wxgui/frontend.py:983 +#: ../pyhoca/wxgui/frontend.py:986 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" @@ -1181,7 +1188,8 @@ msgstr "" "Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1015 ../pyhoca/wxgui/frontend.py:1017 +#: ../pyhoca/wxgui/frontend.py:1015 +#: ../pyhoca/wxgui/frontend.py:1017 #, python-format msgid "%s - print error" msgstr "%s - Printfout" @@ -1208,7 +1216,8 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1021 ../pyhoca/wxgui/frontend.py:1025 +#: ../pyhoca/wxgui/frontend.py:1021 +#: ../pyhoca/wxgui/frontend.py:1025 #, python-format msgid "%s - start" msgstr "%s - Start" @@ -1231,7 +1240,8 @@ msgstr "" "Een andere X2Go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:1029 ../pyhoca/wxgui/frontend.py:1033 +#: ../pyhoca/wxgui/frontend.py:1029 +#: ../pyhoca/wxgui/frontend.py:1033 #, python-format msgid "%s - resume" msgstr "%s - hervatten" @@ -1328,7 +1338,8 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133 +#: ../pyhoca/wxgui/messages.py:103 +#: ../pyhoca/wxgui/printingprefs.py:133 msgid "Ok" msgstr "Ok" @@ -1433,10 +1444,8 @@ msgstr "OK" #~ msgid "Disconnect and E&xit" #~ msgstr "Verbreek verbinding en e&xit" - #~ msgid "%s - connect error" #~ msgstr "%s - Verbindingsfout" - #~ msgid "new session profile" #~ msgstr "Nieuw Profiel" @@ -1447,34 +1456,26 @@ msgstr "OK" #, fuzzy #~ msgid "Retrieving Application menu..." #~ msgstr "Enkelvoudige Applicatie" - #~ msgid "RDP settings" #~ msgstr "RDP instellingen" - #~ msgid "Session Profile" #~ msgstr "Sessie Profiel" - #~ msgid "Icon" #~ msgstr "Icon" - #~ msgid "All session profiles are connected" #~ msgstr "Alle profielen zijn verbonden" - #~ msgid "New Profile" #~ msgstr "Profiel" - #~ msgid "%s - print job" #~ msgstr "%s - print job" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "De Print job dialog is nog niet geimplementeerd!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Profile icon" - #~ msgid "Arts" #~ msgstr "Arts" + hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-214-gef4ae50
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via ef4ae509162b4b5a13c319e7e87e584f3837b53b (commit) from ac5b31be15371c87eb335b54df50fe277000d580 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ef4ae509162b4b5a13c319e7e87e584f3837b53b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 17:25:13 2012 +0200 finally fix last 2-3 commits ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 2 ++ x2go/xserver.py | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index 468ce08..e371471 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -325,9 +325,11 @@ class X2goClient(object): # FIXME: this trick is nasty, client implementation should rather cleanly shutdown launch X-server processes # # re-use a left behind X-server instance of a previous/crashed run of Python X2Go Client + self.logger('found a running (and maybe stray) X-server, trying to re-use it on X DISPLAY port: %s' % _last_display, loglevel=log.loglevel_WARN) os.environ.update({'DISPLAY': str(_last_display)}) else: # presume the running XServer listens on :0 + self.logger('using fallback display for X-server: localhost:0', loglevel=log.loglevel_WARN) os.environ.update({'DISPLAY': 'localhost:0'}) if _X2GOCLIENT_OS == 'Windows' and start_pulseaudio: diff --git a/x2go/xserver.py b/x2go/xserver.py index c97c2ee..ee29d5c 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -226,7 +226,12 @@ class X2goClientXConfig(inifiles.X2goIniFile): # if the port changed, let's write it to our configuration file if _detect_xserver_port != _last_xserver_port: - self.update_value(xserver_name, 'last_display', _last_display.replace(_last_xserver_port, _detect_xserver_port)) + _new_display = _last_display.replace(str(_last_xserver_port -6000), str(_detect_xserver_port -6000)) + self.logger('cannot used configured X DISPLAY, the new available DISPLAY port %s has been detected' % _new_display, loglevel=log.loglevel_NOTICE) + self.update_value(xserver_name, 'last_display', _new_display) + _parameters = self.get_value(xserver_name, 'parameters') + _parameters[0] = ":%s" % (_detect_xserver_port -6000) + self.update_value(xserver_name, 'parameters', tuple(_parameters)) self.write_user_config = True self.write() @@ -275,10 +280,10 @@ class X2goXServer(threading.Thread): self.xserver_config = xserver_config self.hProcess = None - if self.xserver_config.has_key('display'): + if self.xserver_config.has_key('last_display'): - self.logger('setting DISPLAY environment variable to %s' % self.xserver_config['display'], loglevel=log.loglevel_NOTICE) - os.environ.update({'DISPLAY': str(self.xserver_config['display'])}) + self.logger('setting DISPLAY environment variable to %s' % self.xserver_config['last_display'], loglevel=log.loglevel_NOTICE) + os.environ.update({'DISPLAY': str(self.xserver_config['last_display'])}) threading.Thread.__init__(self) self.daemon = True self.start() hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-213-gac5b31b
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via ac5b31be15371c87eb335b54df50fe277000d580 (commit) from 5fd75e3eb8928b85866c6ccb97fd9d43c67f1f5e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ac5b31be15371c87eb335b54df50fe277000d580 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 16:22:19 2012 +0200 On unused port detection bind to 127.0.0.1 by default. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/proxy/base.py | 2 +- x2go/utils.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index fa200d6..2b9f7cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low a previous instance of Python X2Go Client. This trick is nasty, but works around faulty abortion of client implementations. - Handle detection of free TCP/IP X display port far more intelligently. + - On unused port detection bind to 127.0.0.1 by default. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index c507c55..0c1586c 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -180,7 +180,7 @@ class X2goProxyBASE(threading.Thread): local_graphics_port += 10000 except socket.error: raise x2go_exceptions.X2goControlSessionException('The control session has died unexpectedly.') - local_graphics_port = utils.detect_unused_port(bind_address='', preferred_port=local_graphics_port) + local_graphics_port = utils.detect_unused_port(preferred_port=local_graphics_port) self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port, remote_port=self.session_info.graphics_port, diff --git a/x2go/utils.py b/x2go/utils.py index e367881..cb8637a 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -354,7 +354,7 @@ def patiently_remove_file(dirname, filename): # file is probably locked gevent.sleep(5) -def detect_unused_port(bind_address='', preferred_port=None): +def detect_unused_port(bind_address='127.0.0.1', preferred_port=None): """\ Detect an unused IP socket. hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-212-g5fd75e3
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via 5fd75e3eb8928b85866c6ccb97fd9d43c67f1f5e (commit) from 392629ed845770798e10870494951c64f4e86aca (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5fd75e3eb8928b85866c6ccb97fd9d43c67f1f5e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 16:14:37 2012 +0200 fix syntax and attribute errors ----------------------------------------------------------------------- Summary of changes: x2go/client.py | 2 +- x2go/xserver.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/client.py b/x2go/client.py index a5c4e63..468ce08 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -307,7 +307,7 @@ class X2goClient(object): p_xs_name = self.client_xconfig.preferred_xserver_names[0] _last_display = self.client_xconfig.get_xserver_config(p_xs_name)['last_display'] self.client_xconfig.detect_unused_xdisplay_port(p_xs_name) - p_xs = self.client_xconfig.get_xserver_config(p_xs_name) + p_xs = (p_xs_name, self.client_xconfig.get_xserver_config(p_xs_name)) elif type(start_xserver) is types.StringType: _last_display = self.client_xconfig.get_xserver_config(start_xserver)['last_display'] self.client_xconfig.detect_unused_xdisplay_port(start_xserver) diff --git a/x2go/xserver.py b/x2go/xserver.py index 859b1c8..c97c2ee 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -203,10 +203,10 @@ class X2goClientXConfig(inifiles.X2goIniFile): """ _default_display = self.get_xserver_config(xserver_name)['display'] - _last_display = self.xserver_config(xserver_name)['last_display'] + _last_display = self.get_xserver_config(xserver_name)['last_display'] try: - _default_xserver_port = int(_display.split(":")[1].split(".")[0]) + 6000 + _default_xserver_port = int(_default_display.split(":")[1].split(".")[0]) + 6000 _last_xserver_port = int(_last_display.split(":")[1].split(".")[0]) + 6000 # try the last used $DISPLAY first... hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-211-g392629e
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via 392629ed845770798e10870494951c64f4e86aca (commit) from 98ba5f24c29ce9ac2ae4129b2ade74dbb515cd21 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 392629ed845770798e10870494951c64f4e86aca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 15:24:45 2012 +0200 Handle detection of free TCP/IP X display port far more intelligently. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/client.py | 12 +++++++-- x2go/defaults.py | 5 ++++ x2go/xserver.py | 66 +++++++++++++++++++++++++++++++++++++++++------------ 4 files changed, 66 insertions(+), 18 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 87e643a..fa200d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Re-use a left behind stray X-server that might have not get killed by a previous instance of Python X2Go Client. This trick is nasty, but works around faulty abortion of client implementations. + - Handle detection of free TCP/IP X display port far more intelligently. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/client.py b/x2go/client.py index 4ee4c00..a5c4e63 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -302,9 +302,15 @@ class X2goClient(object): self.HOOK_no_known_xserver_found() else: + _last_display = None if type(start_xserver) is types.BooleanType: - p_xs = self.client_xconfig.preferred_xserver + p_xs_name = self.client_xconfig.preferred_xserver_names[0] + _last_display = self.client_xconfig.get_xserver_config(p_xs_name)['last_display'] + self.client_xconfig.detect_unused_xdisplay_port(p_xs_name) + p_xs = self.client_xconfig.get_xserver_config(p_xs_name) elif type(start_xserver) is types.StringType: + _last_display = self.client_xconfig.get_xserver_config(start_xserver)['last_display'] + self.client_xconfig.detect_unused_xdisplay_port(start_xserver) p_xs = (start_xserver, self.client_xconfig.get_xserver_config(start_xserver)) if not self.client_xconfig.running_xservers: @@ -314,12 +320,12 @@ class X2goClient(object): else: - if p_xs is not None: + if p_xs is not None and _last_display is not None: # # FIXME: this trick is nasty, client implementation should rather cleanly shutdown launch X-server processes # # re-use a left behind X-server instance of a previous/crashed run of Python X2Go Client - os.environ.update({'DISPLAY': str(p_xs[1]['display'])}) + os.environ.update({'DISPLAY': str(_last_display)}) else: # presume the running XServer listens on :0 os.environ.update({'DISPLAY': 'localhost:0'}) diff --git a/x2go/defaults.py b/x2go/defaults.py index 095a162..f9b8bf6 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -243,6 +243,7 @@ if X2GOCLIENT_OS == 'Windows': }, 'Cygwin-X': { 'display': 'localhost:40', + 'last_display': 'localhost:40', 'process_name': 'XWin.exe', 'test_installed': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'), 'run_command': os.path.join(os.environ['SystemDrive'], '\\', 'cygwin', 'bin', 'XWin.exe'), @@ -250,6 +251,7 @@ if X2GOCLIENT_OS == 'Windows': }, 'VcXsrv': { 'display': 'localhost:40', + 'last_display': 'localhost:40', 'process_name': 'vcxsrv.exe', 'test_installed': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'), 'run_command': os.path.join(os.environ['ProgramFiles'], 'VcXsrv', 'vcxsrv.exe'), @@ -257,6 +259,7 @@ if X2GOCLIENT_OS == 'Windows': }, 'VcXsrv_shipped': { 'display': 'localhost:40', + 'last_display': 'localhost:40', 'process_name': 'vcxsrv.exe', 'test_installed': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 'run_command': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), @@ -264,6 +267,7 @@ if X2GOCLIENT_OS == 'Windows': }, 'VcXsrv_development': { 'display': 'localhost:40', + 'last_display': 'localhost:40', 'process_name': 'vcxsrv.exe', 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), @@ -271,6 +275,7 @@ if X2GOCLIENT_OS == 'Windows': }, 'Xming': { 'display': 'localhost:40', + 'last_display': 'localhost:40', 'process_name': 'Xming.exe', 'test_installed': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'), 'run_command': os.path.join(os.environ['ProgramFiles'], 'Xming', 'Xming.exe'), diff --git a/x2go/xserver.py b/x2go/xserver.py index b2b5a37..859b1c8 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -175,7 +175,10 @@ class X2goClientXConfig(inifiles.X2goIniFile): @property def preferred_xserver(self): """\ - Renders a list of preferred XServer names (most preferred on top). + Returns a tuple of (<xserver_name>, <xserver_config>). + + return: (<xserver_name>, <xserver_config>) + rtype: C{tuple} """ if self.xserver_launch_possible: @@ -183,6 +186,53 @@ class X2goClientXConfig(inifiles.X2goIniFile): else: return None + @property + def preferred_xserver_names(self): + """\ + Returns the list of preferred XServer names (most preferred first). + + """ + return self.installed_xservers + + def detect_unused_xdisplay_port(self, xserver_name): + """\ + Get an unused TCP/IP port for the to-be-launched X server. + + @param xserver_name: name of the XServer application + @type xserver_name: C{str} + + """ + _default_display = self.get_xserver_config(xserver_name)['display'] + _last_display = self.xserver_config(xserver_name)['last_display'] + + try: + _default_xserver_port = int(_display.split(":")[1].split(".")[0]) + 6000 + _last_xserver_port = int(_last_display.split(":")[1].split(".")[0]) + 6000 + + # try the last used $DISPLAY first... + if utils.detect_unused_port(preferred_port=_last_xserver_port) == _last_xserver_port: + _detect_xserver_port = _last_xserver_port + + # then try the default $DISPLAY... + elif utils.detect_unused_port(preferred_port=_default_xserver_port) == _default_xserver_port: + _detect_xserver_port = _default_xserver_port + + # otherwise use a detection algorithm to find a free TCP/IP port + else: + _xserver_port = _default_xserver_port +1 + while utils.detect_unused_port(preferred_port=_xserver_port) != _xserver_port: + _xserver_port += 1 + _detect_xserver_port = _xserver_port + + # if the port changed, let's write it to our configuration file + if _detect_xserver_port != _last_xserver_port: + self.update_value(xserver_name, 'last_display', _last_display.replace(_last_xserver_port, _detect_xserver_port)) + self.write_user_config = True + self.write() + + except TypeError: + pass + class X2goXServer(threading.Thread): """ @@ -227,20 +277,6 @@ class X2goXServer(threading.Thread): if self.xserver_config.has_key('display'): - try: - _configured_display_no = int(self.xserver_config['display'].split(":")[1].split(".")[0]) - _xserver_port = _configured_display_no + 6000 - while utils.detect_unused_port(preferred_port=_xserver_port) != _xserver_port: - _xserver_port += 1 - _display_no = _xserver_port - 6000 - - if _configured_display_no != _display_no: - self.xserver_config['display'] = self.xserver_config['display'].replace(_configured_display_no, _display_no) - self.xserver_config['parameters'] = self.xserver_config['parameters'].replace(_configured_display_no, _display_no) - - except TypeError: - pass - self.logger('setting DISPLAY environment variable to %s' % self.xserver_config['display'], loglevel=log.loglevel_NOTICE) os.environ.update({'DISPLAY': str(self.xserver_config['display'])}) threading.Thread.__init__(self) hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-210-g98ba5f2
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via 98ba5f24c29ce9ac2ae4129b2ade74dbb515cd21 (commit) from 38a2aa49b61bb51a1fbcb700de9bf1d58560e0d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 98ba5f24c29ce9ac2ae4129b2ade74dbb515cd21 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-209-g38a2aa4
by git-admin＠x2go.org 18 Apr '12

18 Apr '12

The branch, master has been updated via 38a2aa49b61bb51a1fbcb700de9bf1d58560e0d1 (commit) from 393c1297895e723167977505e45df18e4f903b5a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 38a2aa49b61bb51a1fbcb700de9bf1d58560e0d1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Wed Apr 18 10:30:53 2012 +0200 Re-use a left behind stray X-server that might have not get killed by a previous instance of Python X2Go Client. This trick is nasty, but works around faulty abortion of client implementations. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ x2go/client.py | 27 +++++++++++++++++++++------ x2go/xserver.py | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1042ea1..87e643a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -106,6 +106,9 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low the next available display number. - Make transitions of master sessions more robust. Only allow local folder sharing for running sessions. + - Re-use a left behind stray X-server that might have not get killed by + a previous instance of Python X2Go Client. This trick is nasty, but works + around faulty abortion of client implementations. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/client.py b/x2go/client.py index c64259e..3968bb1 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -292,22 +292,37 @@ class X2goClient(object): self.client_printing = self.printing_backend(client_instance=self, logger=self.logger) if _X2GOCLIENT_OS == 'Windows' and start_xserver: + if self.client_rootdir: self.client_xconfig = X2goClientXConfig(config_files=[_xconfig_config_file], logger=self.logger) else: self.client_xconfig = X2goClientXConfig(logger=self.logger) + if not self.client_xconfig.known_xservers: self.HOOK_no_known_xserver_found() - elif not self.client_xconfig.running_xservers: + else: + if type(start_xserver) is types.BooleanType: p_xs = self.client_xconfig.preferred_xserver elif type(start_xserver) is types.StringType: p_xs = (start_xserver, self.client_xconfig.get_xserver_config(start_xserver)) - if p_xs is not None: - self.xserver = X2goXServer(p_xs[0], p_xs[1], logger=self.logger) - else: - # presume the running XServer listens on :0 - os.environ.update({'DISPLAY': 'localhost:0'}) + + if not self.client_xconfig.running_xservers: + + if p_xs is not None: + self.xserver = X2goXServer(p_xs[0], p_xs[1], logger=self.logger) + + else: + + if p_xs is not None: + # + # FIXME: this trick is nasty, client implementation should rather cleanly shutdown launch X-server processes + # + # re-use a left behind X-server instance of a previous/crashed run of Python X2Go Client + os.environ.update({'DISPLAY': p_xs[1]['display']}) + else: + # presume the running XServer listens on :0 + os.environ.update({'DISPLAY': 'localhost:0'}) if _X2GOCLIENT_OS == 'Windows' and start_pulseaudio: self.pulseaudio = X2goPulseAudio(path=self.pulseaudio_installdir, client_instance=self, logger=self.logger) diff --git a/x2go/xserver.py b/x2go/xserver.py index 0ed3476..b2b5a37 100644 --- a/x2go/xserver.py +++ b/x2go/xserver.py @@ -178,7 +178,7 @@ class X2goClientXConfig(inifiles.X2goIniFile): Renders a list of preferred XServer names (most preferred on top). """ - if self.xserver_launch_possible and self.xserver_launch_needed: + if self.xserver_launch_possible: return (self.installed_xservers[0], self.get_xserver_config(self.installed_xservers[0])) else: return None hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API). [View Less]

1 0

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2012