x2go-commits September 2011

x2go-commits@lists.x2go.org

1 participants
268 discussions

python-x2go.git - master (branch) updated: 0.1.1.4-53-g152e901
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 152e901ae69f36aa583b8b2d50509e3a9bed0c74 (commit) from cf6f644b5cbbe84d161d8adeae773dc2cb3e497c (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 152e901ae69f36aa583b8b2d50509e3a9bed0c74 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Sep 25 02:41:09 2011 +0200 Bugfix for: Test for existence of remote home directory on connect. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ x2go/backends/control/_stdout.py | 6 ++++-- x2go/client.py | 1 + x2go/x2go_exceptions.py | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ba8626b..d5d1e54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,14 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 +python-x2go (0.1.1.8-0-x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (0.1.1.8), bugfix release for 0.1.1.x series: + - Bugfix for: Test for existence of remote home directory on connect. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 + python-x2go (0.1.1.7-0-x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 542e3fe..5b5b63a 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -493,7 +493,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.session_died = False if not self.home_exists(): - raise x2go_exceptions.X2goControlSessionException('remote home directory does not exist') + self.disconnect() + raise x2go_exceptions.X2goRemoteHomeException('remote home directory does not exist') return (self.get_transport() is not None) @@ -550,7 +551,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): def home_exists(self): - if self._x2go_exec_command('stat -tL "%s"', loglevel=log.loglevel_DEBUG): + (_stdin, _stdout, _stderr) = self._x2go_exec_command('stat -tL "%s"' % self._x2go_remote_home, loglevel=log.loglevel_DEBUG) + if _stdout.read(): return True return False diff --git a/x2go/client.py b/x2go/client.py index 4258b46..4ff7cd1 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1102,6 +1102,7 @@ class X2goClient(object): self.session_registry.register_available_server_sessions(profile_name=self.get_session_profile_name(session_uuid), newly_connected=True, ) + return _success __connect_session = connect_session def disconnect_session(self, session_uuid): diff --git a/x2go/x2go_exceptions.py b/x2go/x2go_exceptions.py index 6e142a0..1cd86ca 100644 --- a/x2go/x2go_exceptions.py +++ b/x2go/x2go_exceptions.py @@ -45,6 +45,7 @@ class X2goClientPrintingException(_X2goException): pass class X2goClientSettingsException(_X2goException): pass class X2goSessionException(_X2goException): pass class X2goControlSessionException(_X2goException): pass +class X2goRemoteHomeException(_X2goException): pass class X2goHostKeyException(_X2goException): pass class X2goSSHProxyHostKeyException(_X2goException): pass class X2goTerminalSessionException(_X2goException): pass 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.6-45-g8298fa5
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 8298fa5fb3ef2553bf698d6cbd9c2bac7386a732 (commit) from 77de48a90bbcf8da8b417b44c833085228679c4a (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 8298fa5fb3ef2553bf698d6cbd9c2bac7386a732 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Sep 25 02:38:40 2011 +0200 i18n update ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 17848 -> 18072 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 16731 -> 16917 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15156 -> 15156 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 16228 -> 16228 bytes po/bg.po | 119 +++++++++++++++++--------------- po/de.po | 122 ++++++++++++++++++--------------- po/en.po | 121 +++++++++++++++++--------------- po/es.po | 119 +++++++++++++++++--------------- po/nl.po | 119 +++++++++++++++++--------------- po/pyhoca-gui.pot | 119 +++++++++++++++++--------------- 10 files changed, 387 insertions(+), 332 deletions(-) The diff of changes is: diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo index 69242fe..23fccb9 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 d1ce6dc..f890b85 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 28aebed..dfd9d00 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/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo index b6b3b42..2b745e0 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/po/bg.po b/po/bg.po index 537ea40..89c88dd 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: 2011-09-24 00:59+0200\n" +"POT-Creation-Date: 2011-09-25 02:37+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" @@ -92,7 +92,7 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:386 #: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 #: ../pyhoca/wxgui/frontend.py:421 #, python-format @@ -110,17 +110,26 @@ msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:354 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 +#, python-format +msgid "%s - missing home directory" +msgstr "" + +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 +msgid "The remote user's home directory does not exist." +msgstr "" + +#: ../pyhoca/wxgui/logon.py:363 #, python-format msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 +#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:442 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:364 +#: ../pyhoca/wxgui/logon.py:381 msgid "An unknown error occured during authentication!" msgstr "" @@ -609,7 +618,7 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "" @@ -673,27 +682,27 @@ msgstr "" msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:324 +#: ../pyhoca/wxgui/menus_taskbar.py:325 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:332 +#: ../pyhoca/wxgui/menus_taskbar.py:333 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/menus_taskbar.py:359 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:427 +#: ../pyhoca/wxgui/menus_taskbar.py:428 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Connect Server" msgstr "" @@ -720,47 +729,47 @@ msgstr "" msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:442 +#: ../pyhoca/wxgui/frontend.py:449 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:544 +#: ../pyhoca/wxgui/frontend.py:551 msgid "Cleaning X2go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 msgid "X2go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:586 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:606 +#: ../pyhoca/wxgui/frontend.py:613 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:627 +#: ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:705 +#: ../pyhoca/wxgui/frontend.py:712 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -769,105 +778,105 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:713 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 -#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:756 +#: ../pyhoca/wxgui/frontend.py:758 ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:749 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:751 +#: ../pyhoca/wxgui/frontend.py:758 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:785 ../pyhoca/wxgui/frontend.py:788 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:785 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:788 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:805 ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:798 +#: ../pyhoca/wxgui/frontend.py:805 #, python-format msgid "" "%s\n" @@ -875,7 +884,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "" "%s\n" @@ -883,74 +892,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:811 ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:804 +#: ../pyhoca/wxgui/frontend.py:811 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:819 ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:812 +#: ../pyhoca/wxgui/frontend.py:819 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/de.po b/po/de.po index 5816936..a5b787f 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-24 00:59+0200\n" -"PO-Revision-Date: 2011-09-24 00:58+0100\n" +"POT-Creation-Date: 2011-09-25 02:37+0200\n" +"PO-Revision-Date: 2011-09-25 02:37+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -91,7 +91,7 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:386 #: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 #: ../pyhoca/wxgui/frontend.py:421 #, python-format @@ -111,17 +111,27 @@ msgstr "" "Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer " "nicht akzeptiert" -#: ../pyhoca/wxgui/logon.py:354 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 +#, python-format +msgid "%s - missing home directory" +msgstr "%s - Benutzerverzeichnis nicht vorhanden" + +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 +msgid "The remote user's home directory does not exist." +msgstr "" +"Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht." + +#: ../pyhoca/wxgui/logon.py:363 #, python-format msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 +#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:442 #, python-format msgid "%s - auth error" msgstr "%s - Anmeldefehler" -#: ../pyhoca/wxgui/logon.py:364 +#: ../pyhoca/wxgui/logon.py:381 msgid "An unknown error occured during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" @@ -620,7 +630,7 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "&Beenden" @@ -684,27 +694,27 @@ msgstr "Alle Sitzungen beenden" msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:324 +#: ../pyhoca/wxgui/menus_taskbar.py:325 msgid "Shared &folders" msgstr "Freigegebene Ordner" -#: ../pyhoca/wxgui/menus_taskbar.py:332 +#: ../pyhoca/wxgui/menus_taskbar.py:333 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/menus_taskbar.py:359 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:427 +#: ../pyhoca/wxgui/menus_taskbar.py:428 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Connect Server" msgstr "Serververbindung aufbauen" @@ -735,47 +745,47 @@ msgstr "" msgid "%s - auth key error" msgstr "%s - ungültiger Benutzerschlüssel" -#: ../pyhoca/wxgui/frontend.py:442 +#: ../pyhoca/wxgui/frontend.py:449 msgid "An unknown error occurred during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" -#: ../pyhoca/wxgui/frontend.py:544 +#: ../pyhoca/wxgui/frontend.py:551 msgid "Cleaning X2go sessions..." msgstr "Beende X2go Sitzungen..." -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 #, python-format msgid "%s - disconnect" msgstr "%s - trennen" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 msgid "X2go Profile is now disconnected." msgstr "X2go Profil ist nun nicht mehr verbunden." -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:586 msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:606 +#: ../pyhoca/wxgui/frontend.py:613 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:627 +#: ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - lokalen Ordner für dieses Sitzungsprofile freigeben" -#: ../pyhoca/wxgui/frontend.py:705 +#: ../pyhoca/wxgui/frontend.py:712 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -788,17 +798,17 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:713 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -807,22 +817,22 @@ msgstr "" "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " "Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 -#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:756 +#: ../pyhoca/wxgui/frontend.py:758 ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:749 msgid "The session startup failed." msgstr "Der Start der Sitzung ist fehlgeschlagen." -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar." -#: ../pyhoca/wxgui/frontend.py:751 +#: ../pyhoca/wxgui/frontend.py:758 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -831,12 +841,12 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -845,7 +855,7 @@ msgstr "" "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " "wurde vom X2go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -854,37 +864,37 @@ msgstr "" "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " "verweigert. Die Sitzung konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "Das X2go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht " "verfügbar." -#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:785 ../pyhoca/wxgui/frontend.py:788 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:785 msgid "The X2go PulseAudio system could not be started." msgstr "Das X2go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:788 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Das X2go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -893,12 +903,12 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:805 ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:798 +#: ../pyhoca/wxgui/frontend.py:805 #, python-format msgid "" "%s\n" @@ -909,7 +919,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "" "%s\n" @@ -920,12 +930,12 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:811 ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:804 +#: ../pyhoca/wxgui/frontend.py:811 #, python-format msgid "" "New X2go session starting up...\n" @@ -934,7 +944,7 @@ msgstr "" "Neue X2go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "" "Another client started X2go session\n" @@ -943,12 +953,12 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:819 ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:812 +#: ../pyhoca/wxgui/frontend.py:819 #, python-format msgid "" "Resuming X2go session...\n" @@ -957,7 +967,7 @@ msgstr "" "X2go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "" "Another client resumed X2go session\n" @@ -966,12 +976,12 @@ msgstr "" "Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "" "Found already running session\n" @@ -980,12 +990,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "" "X2go Session has been suspended\n" @@ -994,12 +1004,12 @@ msgstr "" "X2go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/en.po b/po/en.po index caba909..ddc3887 100644 --- a/po/en.po +++ b/po/en.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-24 00:59+0200\n" -"PO-Revision-Date: 2011-09-24 00:59+0100\n" +"POT-Creation-Date: 2011-09-25 02:37+0200\n" +"PO-Revision-Date: 2011-09-25 02:36+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n" "Language: \n" @@ -91,7 +91,7 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:386 #: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 #: ../pyhoca/wxgui/frontend.py:421 #, python-format @@ -110,17 +110,26 @@ msgid "" msgstr "" "The remote server's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/logon.py:354 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 +#, python-format +msgid "%s - missing home directory" +msgstr "%s - missing home directory" + +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 +msgid "The remote user's home directory does not exist." +msgstr "The remote user's home directory does not exist." + +#: ../pyhoca/wxgui/logon.py:363 #, python-format msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 +#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:442 #, python-format msgid "%s - auth error" msgstr "%s - auth error" -#: ../pyhoca/wxgui/logon.py:364 +#: ../pyhoca/wxgui/logon.py:381 msgid "An unknown error occured during authentication!" msgstr "An unknown error occured during authentication!" @@ -620,7 +629,7 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "E&xit" @@ -684,27 +693,27 @@ msgstr "&Clean all sessions" msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:324 +#: ../pyhoca/wxgui/menus_taskbar.py:325 msgid "Shared &folders" msgstr "Shared &folders" -#: ../pyhoca/wxgui/menus_taskbar.py:332 +#: ../pyhoca/wxgui/menus_taskbar.py:333 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/menus_taskbar.py:359 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:427 +#: ../pyhoca/wxgui/menus_taskbar.py:428 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Start/Resume Session" msgstr "Start/Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Connect Server" msgstr "Connect Server" @@ -732,47 +741,47 @@ msgstr "Authentication protocol communication incomplete! Try again..." msgid "%s - auth key error" msgstr "%s - auth key error" -#: ../pyhoca/wxgui/frontend.py:442 +#: ../pyhoca/wxgui/frontend.py:449 msgid "An unknown error occurred during authentication!" msgstr "An unknown error occurred during authentication!" -#: ../pyhoca/wxgui/frontend.py:544 +#: ../pyhoca/wxgui/frontend.py:551 msgid "Cleaning X2go sessions..." msgstr "Cleaning X2go sessions..." -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 #, python-format msgid "%s - disconnect" msgstr "%s - disconnect" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 msgid "X2go Profile is now disconnected." msgstr "X2go Profile is now disconnected." -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:586 msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:606 +#: ../pyhoca/wxgui/frontend.py:613 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Really Delete Session Profile ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:627 +#: ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - share local folder with sessions of this profile" -#: ../pyhoca/wxgui/frontend.py:705 +#: ../pyhoca/wxgui/frontend.py:712 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -785,17 +794,17 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:713 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -804,22 +813,22 @@ msgstr "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." -#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 -#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:756 +#: ../pyhoca/wxgui/frontend.py:758 ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:749 msgid "The session startup failed." msgstr "The session startup failed." -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "The command ,,%s'' is not available on X2go server." -#: ../pyhoca/wxgui/frontend.py:751 +#: ../pyhoca/wxgui/frontend.py:758 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -828,12 +837,12 @@ msgstr "" "The command ,,%s'' is not available on X2go server\n" "%s." -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "%s - session warning" msgstr "%s - session warning" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -842,7 +851,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -851,36 +860,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "The X2go PulseAudio system is not available within Remote Desktop sessions." -#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:785 ../pyhoca/wxgui/frontend.py:788 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:785 msgid "The X2go PulseAudio system could not be started." msgstr "The X2go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:788 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "The X2go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -889,12 +898,12 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:805 ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:798 +#: ../pyhoca/wxgui/frontend.py:805 #, python-format msgid "" "%s\n" @@ -905,7 +914,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "" "%s\n" @@ -916,12 +925,12 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:811 ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:804 +#: ../pyhoca/wxgui/frontend.py:811 #, python-format msgid "" "New X2go session starting up...\n" @@ -930,7 +939,7 @@ msgstr "" "New X2go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "" "Another client started X2go session\n" @@ -939,12 +948,12 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:819 ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:812 +#: ../pyhoca/wxgui/frontend.py:819 #, python-format msgid "" "Resuming X2go session...\n" @@ -953,7 +962,7 @@ msgstr "" "Resuming X2go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "" "Another client resumed X2go session\n" @@ -962,12 +971,12 @@ msgstr "" "Another client resumed X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "" "Found already running session\n" @@ -976,12 +985,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "" "X2go Session has been suspended\n" @@ -990,12 +999,12 @@ msgstr "" "X2go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/es.po b/po/es.po index e894e8c..e47d248 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-24 00:59+0200\n" +"POT-Creation-Date: 2011-09-25 02:37+0200\n" "PO-Revision-Date: 2011-06-23 15:48+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: Spanish Team <oceanosoftlapalma(a)gmail.com>\n" @@ -91,7 +91,7 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:386 #: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 #: ../pyhoca/wxgui/frontend.py:421 #, python-format @@ -111,17 +111,26 @@ msgstr "" "La clave del servidor remoto no es válida o no ha sido aceptada por el " "usuario" -#: ../pyhoca/wxgui/logon.py:354 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 +#, python-format +msgid "%s - missing home directory" +msgstr "" + +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 +msgid "The remote user's home directory does not exist." +msgstr "" + +#: ../pyhoca/wxgui/logon.py:363 #, python-format msgid "%s - key error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 +#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:442 #, fuzzy, python-format msgid "%s - auth error" msgstr "%s - error en la clave de identificación" -#: ../pyhoca/wxgui/logon.py:364 +#: ../pyhoca/wxgui/logon.py:381 msgid "An unknown error occured during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" @@ -625,7 +634,7 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "S&alir" @@ -694,28 +703,28 @@ msgstr "&Limpiar el registro de sesiones" msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:324 +#: ../pyhoca/wxgui/menus_taskbar.py:325 #, fuzzy msgid "Shared &folders" msgstr "Compartir &Carpeta local" -#: ../pyhoca/wxgui/menus_taskbar.py:332 +#: ../pyhoca/wxgui/menus_taskbar.py:333 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/menus_taskbar.py:359 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:427 +#: ../pyhoca/wxgui/menus_taskbar.py:428 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Connect Server" msgstr "Conectar con el Servidor" @@ -745,49 +754,49 @@ msgstr "" msgid "%s - auth key error" msgstr "%s - error en la clave de identificación" -#: ../pyhoca/wxgui/frontend.py:442 +#: ../pyhoca/wxgui/frontend.py:449 #, fuzzy msgid "An unknown error occurred during authentication!" msgstr "" "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" -#: ../pyhoca/wxgui/frontend.py:544 +#: ../pyhoca/wxgui/frontend.py:551 msgid "Cleaning X2go sessions..." msgstr "Limpiando sesiones X2go..." -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 #, python-format msgid "%s - disconnect" msgstr "%s - desconectado" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 msgid "X2go Profile is now disconnected." msgstr "Se ha desconectado el Perfil X2go." -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:586 msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:606 +#: ../pyhoca/wxgui/frontend.py:613 #, fuzzy, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:627 +#: ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - compartir carpetas locales con las sesiones de este perfil" -#: ../pyhoca/wxgui/frontend.py:705 +#: ../pyhoca/wxgui/frontend.py:712 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -800,17 +809,17 @@ msgstr "" "\n" "¿Continuar con la conexión?" -#: ../pyhoca/wxgui/frontend.py:713 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Se confirma la autorización del equipo" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -819,25 +828,25 @@ msgstr "" "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 -#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:756 +#: ../pyhoca/wxgui/frontend.py:758 ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:749 #, fuzzy msgid "The session startup failed." msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:756 #, fuzzy, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:751 +#: ../pyhoca/wxgui/frontend.py:758 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -846,12 +855,12 @@ msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" "%s." -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "%s - session warning" msgstr "%s - advertencia durante la sesión" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -860,7 +869,7 @@ msgstr "" "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " "puerto %s del servidor X2go." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -869,37 +878,37 @@ msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " "servidor X2go/SSH . Fallo en el inicio de sesión." -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" "El sistema X2go PulseAudio no está disponible en las sesiones del tipo " "Remote Desktop" -#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:785 ../pyhoca/wxgui/frontend.py:788 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:785 msgid "The X2go PulseAudio system could not be started." msgstr "El sistema X2go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:788 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "El sistema X2go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -908,12 +917,12 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:805 ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:798 +#: ../pyhoca/wxgui/frontend.py:805 #, python-format msgid "" "%s\n" @@ -924,7 +933,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "" "%s\n" @@ -935,12 +944,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:811 ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:804 +#: ../pyhoca/wxgui/frontend.py:811 #, python-format msgid "" "New X2go session starting up...\n" @@ -949,7 +958,7 @@ msgstr "" "Iniciando nueva sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "" "Another client started X2go session\n" @@ -958,12 +967,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:819 ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:812 +#: ../pyhoca/wxgui/frontend.py:819 #, python-format msgid "" "Resuming X2go session...\n" @@ -972,7 +981,7 @@ msgstr "" "Retornando sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "" "Another client resumed X2go session\n" @@ -981,12 +990,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "" "Found already running session\n" @@ -995,12 +1004,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "" "X2go Session has been suspended\n" @@ -1009,12 +1018,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/nl.po b/po/nl.po index 1369210..9c30829 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: 2011-09-24 00:59+0200\n" +"POT-Creation-Date: 2011-09-25 02:37+0200\n" "PO-Revision-Date: 2011-07-14 08:07+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" @@ -91,7 +91,7 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:386 #: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 #: ../pyhoca/wxgui/frontend.py:421 #, python-format @@ -111,17 +111,26 @@ msgstr "" "De sleutel van de server is ongeldig of is niet geaccepteerd door de " "gebruiker" -#: ../pyhoca/wxgui/logon.py:354 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 +#, python-format +msgid "%s - missing home directory" +msgstr "" + +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 +msgid "The remote user's home directory does not exist." +msgstr "" + +#: ../pyhoca/wxgui/logon.py:363 #, python-format msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 +#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:442 #, python-format msgid "%s - auth error" msgstr "%s - authenticatie fout" -#: ../pyhoca/wxgui/logon.py:364 +#: ../pyhoca/wxgui/logon.py:381 msgid "An unknown error occured during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" @@ -620,7 +629,7 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "&Beëindigen" @@ -687,28 +696,28 @@ msgstr "Alle Sessies beëindigen" msgid "Customize &profile" msgstr "Sessieprofiel wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:324 +#: ../pyhoca/wxgui/menus_taskbar.py:325 #, fuzzy msgid "Shared &folders" msgstr "Delen lokale &map" -#: ../pyhoca/wxgui/menus_taskbar.py:332 +#: ../pyhoca/wxgui/menus_taskbar.py:333 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/menus_taskbar.py:359 msgid "Add Profile" msgstr "Profiel toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:427 +#: ../pyhoca/wxgui/menus_taskbar.py:428 msgid "No session profiles defined" msgstr "Geen Profiel gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Connect Server" msgstr "Verbinden met Server" @@ -737,47 +746,47 @@ msgstr "Authenticatie was niet volledig! Opnieuw proberen..." msgid "%s - auth key error" msgstr "%s - Verbindingsfout met auth. key" -#: ../pyhoca/wxgui/frontend.py:442 +#: ../pyhoca/wxgui/frontend.py:449 msgid "An unknown error occurred during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" -#: ../pyhoca/wxgui/frontend.py:544 +#: ../pyhoca/wxgui/frontend.py:551 msgid "Cleaning X2go sessions..." msgstr "Opschonen X2go sessies..." -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 #, python-format msgid "%s - disconnect" msgstr "%s - verbinding verbreken" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 msgid "X2go Profile is now disconnected." msgstr "X2go Profiel is nu niet meer verbonden." -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:586 msgid "New Session Profile" msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:606 +#: ../pyhoca/wxgui/frontend.py:613 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Verwijder sessie profiel ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - profile deleted" msgstr "%s - Profiel is verwijderd!" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 msgid "The session profile has been deleted." msgstr "Het sessie profiel is verwijderd." -#: ../pyhoca/wxgui/frontend.py:627 +#: ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profiel" -#: ../pyhoca/wxgui/frontend.py:705 +#: ../pyhoca/wxgui/frontend.py:712 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -790,17 +799,17 @@ msgstr "" "\n" "Weet u zeker dat u de verbinding wilt maken?" -#: ../pyhoca/wxgui/frontend.py:713 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bevestig dat de Host geautoriseerd is" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout (channel error)" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -809,25 +818,25 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 -#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:756 +#: ../pyhoca/wxgui/frontend.py:758 ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:749 #, fuzzy msgid "The session startup failed." msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:756 #, fuzzy, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:751 +#: ../pyhoca/wxgui/frontend.py:758 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -836,12 +845,12 @@ msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -850,7 +859,7 @@ msgstr "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " @@ -859,36 +868,36 @@ msgstr "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 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:778 ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:785 ../pyhoca/wxgui/frontend.py:788 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:785 msgid "The X2go PulseAudio system could not be started." msgstr "Het X2go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:788 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Het X2go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -897,12 +906,12 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:805 ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:798 +#: ../pyhoca/wxgui/frontend.py:805 #, python-format msgid "" "%s\n" @@ -913,7 +922,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "" "%s\n" @@ -924,12 +933,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:811 ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:804 +#: ../pyhoca/wxgui/frontend.py:811 #, python-format msgid "" "New X2go session starting up...\n" @@ -938,7 +947,7 @@ msgstr "" "Nieuwe X2go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "" "Another client started X2go session\n" @@ -947,12 +956,12 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:819 ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:812 +#: ../pyhoca/wxgui/frontend.py:819 #, python-format msgid "" "Resuming X2go session...\n" @@ -961,7 +970,7 @@ msgstr "" "X2go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "" "Another client resumed X2go session\n" @@ -970,12 +979,12 @@ msgstr "" "Een andere X2go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "" "Found already running session\n" @@ -984,12 +993,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "" "X2go Session has been suspended\n" @@ -998,12 +1007,12 @@ msgstr "" "X2go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "%s - terminate" msgstr "%s - beëindigen" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "" "X2go Session has terminated\n" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index db1daa2..a2eae7f 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: 2011-09-24 00:59+0200\n" +"POT-Creation-Date: 2011-09-25 02:37+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" @@ -88,7 +88,7 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "" #: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340 -#: ../pyhoca/wxgui/logon.py:363 ../pyhoca/wxgui/frontend.py:386 +#: ../pyhoca/wxgui/logon.py:380 ../pyhoca/wxgui/frontend.py:386 #: ../pyhoca/wxgui/frontend.py:407 ../pyhoca/wxgui/frontend.py:414 #: ../pyhoca/wxgui/frontend.py:421 #, python-format @@ -106,17 +106,26 @@ msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:354 +#: ../pyhoca/wxgui/logon.py:355 ../pyhoca/wxgui/frontend.py:435 +#, python-format +msgid "%s - missing home directory" +msgstr "" + +#: ../pyhoca/wxgui/logon.py:356 ../pyhoca/wxgui/frontend.py:435 +msgid "The remote user's home directory does not exist." +msgstr "" + +#: ../pyhoca/wxgui/logon.py:363 #, python-format msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:435 +#: ../pyhoca/wxgui/logon.py:372 ../pyhoca/wxgui/frontend.py:442 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:364 +#: ../pyhoca/wxgui/logon.py:381 msgid "An unknown error occured during authentication!" msgstr "" @@ -605,7 +614,7 @@ msgstr "" msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:485 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:486 msgid "E&xit" msgstr "" @@ -669,27 +678,27 @@ msgstr "" msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:324 +#: ../pyhoca/wxgui/menus_taskbar.py:325 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:332 +#: ../pyhoca/wxgui/menus_taskbar.py:333 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:358 +#: ../pyhoca/wxgui/menus_taskbar.py:359 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:427 +#: ../pyhoca/wxgui/menus_taskbar.py:428 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:458 +#: ../pyhoca/wxgui/menus_taskbar.py:459 msgid "Connect Server" msgstr "" @@ -716,47 +725,47 @@ msgstr "" msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:442 +#: ../pyhoca/wxgui/frontend.py:449 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:544 +#: ../pyhoca/wxgui/frontend.py:551 msgid "Cleaning X2go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:563 +#: ../pyhoca/wxgui/frontend.py:570 msgid "X2go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:586 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:606 +#: ../pyhoca/wxgui/frontend.py:613 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:612 +#: ../pyhoca/wxgui/frontend.py:619 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:627 +#: ../pyhoca/wxgui/frontend.py:634 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:705 +#: ../pyhoca/wxgui/frontend.py:712 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -765,105 +774,105 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:713 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:739 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 -#: ../pyhoca/wxgui/frontend.py:751 ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:756 +#: ../pyhoca/wxgui/frontend.py:758 ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:749 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "The command ,,%s'' is not available on X2go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:751 +#: ../pyhoca/wxgui/frontend.py:758 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:757 +#: ../pyhoca/wxgui/frontend.py:764 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/frontend.py:770 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2go/SSH server. Session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:775 +#: ../pyhoca/wxgui/frontend.py:782 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:778 ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:785 ../pyhoca/wxgui/frontend.py:788 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:778 +#: ../pyhoca/wxgui/frontend.py:785 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:781 +#: ../pyhoca/wxgui/frontend.py:788 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/frontend.py:791 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:798 ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:805 ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:798 +#: ../pyhoca/wxgui/frontend.py:805 #, python-format msgid "" "%s\n" @@ -871,7 +880,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:800 +#: ../pyhoca/wxgui/frontend.py:807 #, python-format msgid "" "%s\n" @@ -879,74 +888,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:804 ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:811 ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:804 +#: ../pyhoca/wxgui/frontend.py:811 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:808 +#: ../pyhoca/wxgui/frontend.py:815 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:812 ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:819 ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:812 +#: ../pyhoca/wxgui/frontend.py:819 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:816 +#: ../pyhoca/wxgui/frontend.py:823 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:827 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:824 +#: ../pyhoca/wxgui/frontend.py:831 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:840 +#: ../pyhoca/wxgui/frontend.py:847 #, python-format msgid "" "X2go Session has terminated\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

python-x2go.git - build-main (branch) updated: 0.1.1.6-22-g539ca3e
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, build-main has been updated via 539ca3ee9ed07ddfce6f2a6d90f876479c8f87a9 (commit) via a5ed9d2b9cb15374aa0e5205f728fd50efd04b6b (commit) via 142e587cb4bfe2b5a506ed20dac04eaba77f258a (commit) via 4d2df56dd9d1e5ef727dd8dd3ae861f09b8780b9 (commit) via 82e793ae95f1af4cb414147ee70e93fb5ea7ab42 (commit) via 38dbb697abfb29908554824ce34b000173322775 (commit) via 8e23ff85e4203e551a109d354284b86ee015d905 (commit) via … [View More]d1064100febd0837fa8b6d66b8efd13deb5780d0 (commit) via 396398819979ac483f7f48c5dbf18055767f2a9e (commit) via e150e61c74db05607e3f1c3e96440d65023e0b95 (commit) via 3a5ffa6774dc7a48eb20d20ca804a2cc702d7b25 (commit) via e61623461dc3e29676ca06c76197b692005a5695 (commit) via 40c62d9845b7933a16d078272c30ec67273e2f13 (commit) via d099f64c325f4a1971187bf681b40535063e023c (commit) via 343da76cc8807349013c715ab42cdac64ff0b952 (commit) via 3b26a3812c88d578e75e0d15e372bccc5e4e1f49 (commit) via 35cc30107306bb97af7b25b1f8ab9dfb9a32a801 (commit) via 3a4e5e374bbe43c4ebbbe56bd4ad526fac57a61c (commit) via 535521affad151325cfa4fe452542d358e974745 (commit) via 45c359a40ef64df8daded86e6e7328036f545e3f (commit) via 6fd557ede24430dac8b67b2341152969ad5b1584 (commit) via 1696e45dd9d579abeb65dcb26a45bde017a1629f (commit) from c20bb5b5be476562ddb64b7064a375986f8955bb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: README | 22 +++---- TODO | 2 +- debian/changelog | 23 +++++++ setup.py | 2 +- x2go/__init__.py | 2 +- x2go/backends/control/_stdout.py | 15 ++++ x2go/backends/proxy/base.py | 2 +- x2go/backends/terminal/_stdout.py | 91 ++++++++++++++++++++------ x2go/client.py | 132 +++++++++++++++++++++++++++++++++++- x2go/forward.py | 3 + x2go/rforward.py | 1 + x2go/session.py | 114 +++++++++++++++++++++++++++++--- x2go/utils.py | 22 +++++- 13 files changed, 376 insertions(+), 55 deletions(-) The diff of changes is: diff --git a/README b/README index 933f874..aa0b9bd 100644 --- a/README +++ b/README @@ -70,26 +70,22 @@ and wholeheartedness concerning this inner process. Ubuntu: ------- -create /etc/apt/sources.list.d/nwt.list and put the following line into it: +We use Launchpad for Ubuntu packaging: -<snip> -deb http://packages.das-netzwerkteam.de/ubuntu {lucid|maverick|natty} main -</snip> - -If you run a newer Ubuntu version, replace »lucid« with your version (»maverick«, ...) - -Then run the following commands: + $ add-apt-repository ppa:x2go/stable + $ apt-get update + $ apt-get install python-x2go - $ sudo apt-get update - $ sudo apt-get install python-x2go +From Ubuntu oneiric on python-x2go is also available as a part of the +Ubuntu GNU/Linux distribution. Debian: ------- -create /etc/apt/sources.list.d/nwt.list and put the following line into it: +create /etc/apt/sources.list.d/x2go.list and put the following line into it: <snip> -deb http://packages.das-netzwerkteam.de/debian {squeeze|wheezy|sid} main +deb http://packages.x2go.org/debian {squeeze|wheezy|sid} main </snip> Then run the following commands as super-user root: @@ -134,6 +130,6 @@ check if your issues have already been solved in the HEAD of python-x2go code. For now, bugs can be reported via mail to mike.gabriel(a)das-netzwerkteam.de -light+love, 20110701 +light+love, 20110718 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/TODO b/TODO index 52ceb74..6b44905 100644 --- a/TODO +++ b/TODO @@ -4,7 +4,7 @@ Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. -=== pyhton-x2go TODOs === +=== python-x2go TODOs === as of 20110701 -------------- diff --git a/debian/changelog b/debian/changelog index 858e98e..918594b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +python-x2go (0.1.1.7-0-x2go1) unstable; urgency=low + + [ Mike Gabriel ] + * New upstream version (0.1.1.7), bugfix+feature release for 0.1.1.x series: + - Add support for x2goumount-session calls. + - Differentiate between spool folders and data folders when unsharing + all folders, return exitcode from X2goTerminalSessionSTDOUT.unshare_* + methods. + - Use TCP_NODELAY socket option for audio rev forwarding tunnels. + - Use TCP_NODELAY socket option for graphics forwarding tunnels. + - Typo fixes in session.py, related to calling _X2goSession__disconnect + method. + - Compatibility fix for X2go folder sharing (session profile attribute: + export). + - Provide test method to query server if folder sharing is available. + - Test for existence of remote home directory on connect. + + [ Dick Kniep ] + * Fix for upstream version 0.1.1.7: + - Typo in utils.py (true instead of True). + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:01 +0200 + python-x2go (0.1.1.6-0~x2go1) unstable; urgency=low * New upstream version (0.1.1.6), bugfix release for 0.1.1.x series: diff --git a/setup.py b/setup.py index e8253b6..a0be2fa 100755 --- a/setup.py +++ b/setup.py @@ -30,5 +30,5 @@ setup( url = 'http://www.x2go.org', packages = find_packages('.'), package_dir = {'': '.'}, - install_requires = ['setuptools', "gevent", "paramiko" ] + install_requires = ['setuptools', 'gevent', 'paramiko', ] ) diff --git a/x2go/__init__.py b/x2go/__init__.py index 576547d..100a162 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -158,7 +158,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.1.1.6' +__VERSION__ = '0.1.1.7' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 4936189..e382493 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -256,6 +256,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): #return username in self._x2go_remote_group('x2gousers') return True + def is_folder_sharing_available(self): + if self.remote_username() in self._x2go_remote_group('fuse'): + return True + return False + def remote_username(self): """\ Returns the control session's remote username. @@ -486,6 +491,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if self.get_transport(): self.session_died = False + + if not self.home_exists(): + raise x2go_exceptions.X2goControlSessionException('remote home directory does not exist') + return (self.get_transport() is not None) def dissociate(self, terminal_session): @@ -540,6 +549,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): return False + def home_exists(self): + if self._x2go_exec_command('stat -tL "%s"', loglevel=log.loglevel_DEBUG): + return True + return False + + def is_alive(self): if self._x2go_exec_command('echo', loglevel=log.loglevel_DEBUG): return True diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 9558b83..da12d6a 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -242,7 +242,7 @@ class X2goProxyBASE(threading.Thread): the parent class method X2goProxyBASE.process_proxy_options() """ - # do the logging of remaining options, call + # do the logging of remaining options if self.proxy_options: self.logger('ignoring non-processed proxy options: %s' % self.proxy_options, loglevel=log.loglevel_INFO) diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 92dac9f..51bee99 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -444,7 +444,7 @@ class X2goTerminalSessionSTDOUT(object): Initialize Paramiko/SSH reverse forwarding tunnel for X2go folder sharing. """ - if self.session_info.username not in self.control_session._x2go_remote_group('fuse'): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) # start reverse SSH tunnel for sshfs (folder sharing, printing) @@ -499,7 +499,7 @@ class X2goTerminalSessionSTDOUT(object): spool_dir = os.path.join(self.session_info.local_container, 'spool') if not os.path.exists(spool_dir): os.mkdir(spool_dir) - self.share_local_folder(folder_name=spool_dir, folder_type='spool') + self.share_local_folder(local_path=spool_dir, folder_type='spool') self.print_queue = printqueue.X2goPrintQueue(profile_name=self.profile_name, session_name=self.session_info.name, spool_dir=spool_dir, @@ -542,7 +542,7 @@ class X2goTerminalSessionSTDOUT(object): mimebox_dir = os.path.join(self.session_info.local_container, 'mimebox') if not os.path.exists(mimebox_dir): os.mkdir(mimebox_dir) - self.share_local_folder(folder_name=mimebox_dir, folder_type='mimebox') + self.share_local_folder(local_path=mimebox_dir, folder_type='mimebox') self.mimebox_queue = mimebox.X2goMIMEboxQueue(profile_name=self.profile_name, session_name=self.session_info.name, mimebox_dir=mimebox_dir, @@ -576,13 +576,13 @@ class X2goTerminalSessionSTDOUT(object): """ return '%s/%s' % (self.session_info.remote_container, 'mimebox') - def share_local_folder(self, folder_name=None, folder_type='disk'): + def share_local_folder(self, local_path=None, folder_type='disk'): """\ Share a local folder with the X2go session. - @param folder_name: the full path to an existing folder on the local + @param local_path: the full path to an existing folder on the local file system - @type folder_name: str + @type local_path: str @param folder_type: one of 'disk' (a folder on your local hard drive), 'rm' (removeable device), 'cdrom' (CD/DVD Rom) or 'spool' (for X2go print spooling) @type folder_type: str @@ -591,23 +591,23 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.session_info.username not in self.control_session._x2go_remote_group('fuse'): + if self.control_session.is_folder_sharing_available(): raise x2go_exceptions.X2goUserException('remote user %s is not member of X2go server group fuse' % self.session_info.username) - if folder_name is None: + if local_path is None: self.logger('no folder name given...', log.loglevel_WARN) return False - if type(folder_name) not in (types.StringType, types.UnicodeType): + if type(local_path) not in (types.StringType, types.UnicodeType): self.logger('folder name needs to be of type StringType...', log.loglevel_WARN) return False - if not os.path.exists(folder_name): - self.logger('local folder does not exist: %s' % folder_name, log.loglevel_WARN) + if not os.path.exists(local_path): + self.logger('local folder does not exist: %s' % local_path, log.loglevel_WARN) return False - folder_name = os.path.normpath(folder_name) - self.logger('sharing local folder: %s' % folder_name, log.loglevel_INFO) + local_path = os.path.normpath(local_path) + self.logger('sharing local folder: %s' % local_path, log.loglevel_INFO) _auth_rsakey = self.control_session._x2go_session_auth_rsakey _host_rsakey = defaults.RSAHostKey @@ -628,9 +628,9 @@ class X2goTerminalSessionSTDOUT(object): _server_encoding = self.params.server_encoding if _X2GOCLIENT_OS == 'Windows': - folder_name = folder_name.replace('\\', '/') - folder_name = folder_name.replace(':', '') - folder_name = '/windrive/%s' % folder_name + local_path = local_path.replace('\\', '/') + local_path = local_path.replace(':', '') + local_path = '/windrive/%s' % local_path _convert_encoding = True _client_encoding = 'WINDOWS-1252' @@ -647,7 +647,7 @@ class X2goTerminalSessionSTDOUT(object): str(self.session_info.name), '"%s"' % _CURRENT_LOCAL_USER, _x2go_key_fname, - '%s__REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port), + '%s__REVERSESSH_PORT__%s; ' % (local_path, self.session_info.sshfs_port), 'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), ] @@ -659,7 +659,7 @@ class X2goTerminalSessionSTDOUT(object): str(self.session_info.name), '"%s"' % _CURRENT_LOCAL_USER, _x2go_key_fname, - '%s__PRINT_SPOOL___REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port), + '%s__PRINT_SPOOL___REVERSESSH_PORT__%s; ' % (local_path, self.session_info.sshfs_port), 'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), ] @@ -671,12 +671,63 @@ class X2goTerminalSessionSTDOUT(object): str(self.session_info.name), '"%s"' % _CURRENT_LOCAL_USER, _x2go_key_fname, - '%s__MIMEBOX_SPOOL___REVERSESSH_PORT__%s; ' % (folder_name, self.session_info.sshfs_port), + '%s__MIMEBOX_SPOOL___REVERSESSH_PORT__%s; ' % (local_path, self.session_info.sshfs_port), 'rm -f %s %s.ident' % (_x2go_key_fname, _x2go_key_fname), ] (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) - self.logger('x2gomountdirs output is : %s' % stdout.read().split('\n'), log.loglevel_NOTICE) + _stdout = stdout.read().split('\n') + self.logger('x2gomountdirs output is : %s' % _stdout, log.loglevel_NOTICE) + if _stdout[5].endswith('ok'): + return True + return False + + def unshare_all_local_folders(self): + """\ + Unshare all local folders mount in the X2go session. + + @return: returns C{True} if all local folders could be successfully unmounted from the X2go server session + @rtype: bool + + """ + self.logger('unsharing all local folders from session %s' % self.session_info, log.loglevel_INFO) + + cmd_line = [ 'export HOSTNAME &&', + 'x2goumount-session', + self.session_info.name, + ] + + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) + if not stderr.read(): + self.logger('x2goumount-session (all mounts) for session %s has been successful' % self.session_info, log.loglevel_NOTICE) + return True + else: + self.logger('x2goumount-session (all mounts) for session %s failed' % self.session_info, log.loglevel_ERROR) + return False + + def unshare_local_folder(self, local_path): + """\ + Unshare local folder given as <local_path> from X2go session. + + @return: returns C{True} if the local folder <local_path> could be successfully unmounted from the X2go server session + @rtype: bool + + """ + self.logger('unsharing local folder from session %s' % self.session_info, log.loglevel_INFO) + + cmd_line = [ 'export HOSTNAME &&', + 'x2goumount-session', + self.session_info.name, + local_path, + ] + + (stdin, stdout, stderr) = self.control_session._x2go_exec_command(cmd_line) + if not stderr.read(): + self.logger('x2goumount-session (%s) for session %s has been successful' % (local_path, self.session_info, ), log.loglevel_NOTICE) + return True + else: + self.logger('x2goumount-session (%s) for session %s failed' % (local_path, self.session_info, ), log.loglevel_ERROR) + return False def color_depth(self): """\ diff --git a/x2go/client.py b/x2go/client.py index 396757b..0d4061b 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1470,7 +1470,34 @@ class X2goClient(object): return session_name not in [ s for s in self.server_running_sessions(session_uuid) + self.server_suspended_sessions(session_uuid) ] __has_session_terminated = has_session_terminated - def share_local_folder_with_session(self, session_uuid=None, folder_name=_LOCAL_HOME, profile_name=None): + def is_folder_sharing_available(self, session_uuid=None, profile_name=None): + """\ + Test if local folder sharing is available for X2go session with unique ID <session_uuid> or + session profile <profile_name>. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + @param profile_name: alternatively, the profile name can be used to perform this query + @type profile_name: C{str} + + @return: returns C{True} if the profile/session supports local folder sharing + @rtype: C{bool} + + """ + if session_uuid is None and profile_name: + _connected = self._X2goClient__client_connected_sessions_of_profile_name(profile_name, return_objects=False) + if len(_connected) > 0: + session_uuid = _connected[0] + if session_uuid: + return self.session_registry(session_uuid).is_folder_sharing_available() + else: + self.logger('Cannot find a terminal session for profile ,,%s\'\' that can be used to query folder sharing capabilities' % profile_name, loglevel=log.loglevel_WARN) + return False + __is_folder_sharing_available = is_folder_sharing_available + __profile_is_folder_sharing_available = is_folder_sharing_available + __session_is_folder_sharing_available = is_folder_sharing_available + + def share_local_folder(self, session_uuid=None, local_path=None, profile_name=None, folder_name=None): """\ Share a local folder with the X2go session registered as C{session_uuid}. @@ -1480,8 +1507,10 @@ class X2goClient(object): @param session_uuid: the X2go session's UUID registry hash @type session_uuid: C{str} - @param folder_name: the full path to an existing folder on the local (client-side) + @param local_path: the full path to an existing folder on the local (client-side) file system + @type local_path: C{str} + @param folder_name: synonymous to C{local_path} @type folder_name: C{str} @param profile_name: alternatively, the profile name can be used to share local folders @type profile_name: C{str} @@ -1490,16 +1519,111 @@ class X2goClient(object): @rtype: C{bool} """ + # compat for Python-X2go (<=0.1.1.6) + if folder_name: local_path = folder_name + if session_uuid is None and profile_name: _associated = self._X2goClient__client_associated_sessions_of_profile_name(profile_name, return_objects=False) if len(_associated) > 0: session_uuid = _associated[0] if session_uuid: - return self.session_registry(session_uuid).share_local_folder(folder_name=folder_name) + return self.session_registry(session_uuid).share_local_folder(local_path=local_path) else: self.logger('Cannot find a terminal session for profile ,,%s\'\' to share a local folder with' % profile_name, loglevel=log.loglevel_WARN) return False - __share_local_folder_with_session = share_local_folder_with_session + __share_local_folder = share_local_folder + __share_local_folder_with_session = share_local_folder + __share_local_folder_with_profile = share_local_folder + + def unshare_all_local_folders(self, session_uuid=None, profile_name=None): + """\ + Unshare all local folders mounted in X2go session registered as + C{session_uuid}. + + When calling this method all client-side mounted folders on the X2go + server (via sshfs) for session with ID <session_uuid> will get + unmounted. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + @param profile_name: alternatively, the profile name can be used to unshare + mounted folders + @type profile_name: C{str} + + @return: returns C{True} if all local folders could be successfully unmounted + @rtype: C{bool} + + """ + if session_uuid is None and profile_name: + _associated = self._X2goClient__client_associated_sessions_of_profile_name(profile_name, return_objects=False) + if len(_associated) > 0: + session_uuid = _associated[0] + if session_uuid: + return self.session_registry(session_uuid).unshare_all_local_folders() + else: + self.logger('Cannot find a terminal session for profile ,,%s\'\' from which to unmount local folders' % profile_name, loglevel=log.loglevel_WARN) + return False + unshare_all_local_folders_from_session = unshare_all_local_folders + unshare_all_local_folders_from_profile = unshare_all_local_folders + __unshare_all_local_folders_from_session = unshare_all_local_folders + __unshare_all_local_folders_from_profile = unshare_all_local_folders + + def unshare_local_folder(self, session_uuid=None, profile_name=None, local_path=None): + """\ + Unshare local folder that is mounted in the X2go session registered as + C{session_uuid}. + + When calling this method the given client-side mounted folder on the X2go + server (via sshfs) for session with ID <session_uuid> will get + unmounted. + + @param session_uuid: the X2go session's UUID registry hash + @type session_uuid: C{str} + @param profile_name: alternatively, the profile name can be used to unshare + mounted folders + @type profile_name: C{str} + @param local_path: the full path of a local folder that is mounted within X2go + session with session ID <session_uuid> (or recognized via profile name) and that + shall be unmounted from that session. + @type local_path: C{str} + + @return: returns C{True} if all local folders could be successfully unmounted + @rtype: C{bool} + + """ + if session_uuid is None and profile_name: + _associated = self._X2goClient__client_associated_sessions_of_profile_name(profile_name, return_objects=False) + if len(_associated) > 0: + session_uuid = _associated[0] + if session_uuid: + return self.session_registry(session_uuid).unshare_local_folder(local_path=local_path) + else: + self.logger('Cannot find a terminal session for profile ,,%s\'\' from which to unmount local folders' % profile_name, loglevel=log.loglevel_WARN) + return False + unshare_local_folder_from_session = unshare_local_folder + unshare_local_folder_from_profile = unshare_local_folder + __unshare_local_folder_from_session = unshare_local_folder + __unshare_local_folder_from_profile = unshare_local_folder + + def get_shared_folders(self, session_uuid=None, profile_name=None): + """\ + Get a list of local folders mounted within X2go session with session hash <session_uuid> + from this client. + + @return: returns a C{list} of those local folder names that are mounted within X2go session <session_uuid>. + @rtype: C{list} + + """ + if session_uuid is None and profile_name: + _associated = self._X2goClient__client_associated_sessions_of_profile_name(profile_name, return_objects=False) + if len(_associated) > 0: + session_uuid = _associated[0] + if session_uuid: + return self.session_registry(session_uuid).get_shared_folders() + session_get_shared_folders = get_shared_folders + profile_get_shared_folders = get_shared_folders + __session_get_shared_folders = get_shared_folders + __profile_get_shared_folders = get_shared_folders ### ### Provide access to the X2goClient's session registry diff --git a/x2go/forward.py b/x2go/forward.py index f87e964..b6d0947 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -94,6 +94,9 @@ class X2goFwServer(StreamServer): """ self.fw_socket = fw_socket + # disable Nagle algorithm in TCP/IP protocol + self.fw_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + _success = False _count = 0 _maxwait = 20 diff --git a/x2go/rforward.py b/x2go/rforward.py index 0388b85..8dfa805 100644 --- a/x2go/rforward.py +++ b/x2go/rforward.py @@ -300,6 +300,7 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N """ fw_socket = socket.socket() + fw_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) if logger is None: def _dummy_logger(msg, l): pass diff --git a/x2go/session.py b/x2go/session.py index 7d1c95e..ed1e8b5 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -236,6 +236,7 @@ class X2goSession(object): self.terminal_params = {} self.sshproxy_params = {} self.update_params(params) + self.shared_folders = [] self.session_environment = {} @@ -878,7 +879,7 @@ class X2goSession(object): try: return self.control_session.list_sessions(raw=raw) except X2goControlSessionException: - self._X2goSession_disconnect() + self._X2goSession__disconnect() return None __list_sessions = list_sessions @@ -902,7 +903,7 @@ class X2goSession(object): else: return [] except X2goControlSessionException: - self._X2goSession_disconnect() + self._X2goSession__disconnect() return None __list_desktops = list_desktops @@ -1057,14 +1058,13 @@ class X2goSession(object): if self._SUPPORTED_MIMEBOX and self.allow_mimebox: self.terminal_session and not self.faulty and self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) - self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) + self.terminal_session and self.session_environment.update({'X2GO_MIMEBOX': self.terminal_session.get_mimebox_spooldir(), }) - if self._SUPPORTED_FOLDERSHARING and self.share_local_folders: + if self.share_local_folders and self.terminal_session and not self.faulty and self.is_folder_sharing_available(): if _control.get_transport().reverse_tunnels[self.terminal_session.get_session_name()]['sshfs'][1] is not None: for _folder in self.share_local_folders: self.share_local_folder(_folder) - self.virgin = False self.suspended = False self.running = True @@ -1179,6 +1179,10 @@ class X2goSession(object): """ if self.is_alive(): if self.has_terminal_session(): + + # unshare mounted folders + self.unshare_all_local_folders() + if self.terminal_session.suspend(): self.running = False @@ -1217,8 +1221,11 @@ class X2goSession(object): """ if self.is_alive(): if self.has_terminal_session(): - if self.terminal_session.terminate(): + # unmount shared folders + self.unshare_all_local_folders() + + if self.terminal_session.terminate(): self.running = False self.suspended = False self.terminated = True @@ -1381,12 +1388,28 @@ class X2goSession(object): return self.terminated __has_terminated = has_terminated - def share_local_folder(self, folder_name): + def is_folder_sharing_available(self): + """\ + Test if the remote session allows sharing of local folders with the session. + + @return: returns C{True} if local folder sharing is available in the remote session + @rtype: C{bool} + + """ + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: + if self.is_connected(): + return self.control_session.is_folder_sharing_available() + else: + self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) + + def share_local_folder(self, local_path=None, folder_name=None): """\ Share a local folder with this registered X2go session. - @param folder_name: the full path to an existing folder on the local + @param local_path: the full path to an existing folder on the local file system + @type local_path: C{str} + @param folder_name: synonymous to C{local_path} @type folder_name: C{str} @return: returns C{True} if the local folder has been successfully mounted within @@ -1394,15 +1417,86 @@ class X2goSession(object): @rtype: C{bool} """ + # compat for Python-X2go (<=0.1.1.6) + if folder_name: local_path=folder_name + if self.has_terminal_session(): - if self.allow_share_local_folders: - return self.terminal_session.share_local_folder(folder_name=folder_name) + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: + if self.terminal_session.share_local_folder(local_path=local_path): + self.shared_folders.append(local_path) + return True + return False else: self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) else: raise X2goSessionException('this X2goSession object does not have any associated terminal') __share_local_folder = share_local_folder + def unshare_all_local_folders(self, force_all=False): + """\ + Unshare all local folders mounted within this X2go session. + + @param force_all: Really unmount _all_ shared folders, including the print spool folder and + the MIME box spool dir (not recommended). + @type force_all: C{bool} + + @return: returns C{True} if all local folders could be successfully unmounted + inside this X2go session + @rtype: C{bool} + + """ + if self.has_terminal_session(): + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders: + if force_all: + self.shared_folders = [] + return self.terminal_session.unshare_all_local_folders() + else: + retval = 0 + for _shared_folder in self.shared_folders: + retval = retval | self.terminal_session.unshare_local_folder(_shared_folder) + self.shared_folders = [] + return retval + else: + self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) + else: + raise X2goSessionException('this X2goSession object does not have any associated terminal') + return False + __unshare_all_local_folders = unshare_all_local_folders + + def unshare_local_folder(self, local_path=None): + """\ + Unshare a local folder that is mounted within this X2go session. + + @param local_path: the full path to an existing folder on the local + file system that is mounted in this X2go session and shall be + unmounted + @type local_path: C{str} + @return: returns C{True} if all local folders could be successfully unmounted + inside this X2go session + @rtype: C{bool} + + """ + if self.has_terminal_session(): + if self._SUPPORTED_FOLDERSHARING and self.allow_share_local_folders and local_path in self.shared_folders: + self.shared_folders.remove(local_path) + return self.terminal_session.unshare_local_folder(local_path=local_path) + else: + self.logger('local folder sharing is disabled for this session profile', loglevel=log.loglevel_WARN) + else: + raise X2goSessionException('this X2goSession object does not have any associated terminal') + __unshare_local_folder = unshare_local_folder + + def get_shared_folders(self): + """\ + Get a list of local folders mounted within this X2go session from this client. + + @return: returns a C{list} of those folder names that are mounted with this X2go session. + @rtype: C{list} + + """ + return self.shared_folders + __get_shared_folders = get_shared_folders + def is_locked(self): """\ Query session if it is locked by some command being processed. diff --git a/x2go/utils.py b/x2go/utils.py index 5d023d9..9af2ef1 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -144,7 +144,6 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): 'speed': 'link', 'sshport': 'port', 'useexports': 'allow_share_local_folders', - 'export': 'share_local_folders', 'usemimebox': 'allow_mimebox', 'mimeboxextensions': 'mimebox_extensions', 'mimeboxaction': 'mimebox_action', @@ -204,8 +203,22 @@ def _convert_SessionProfileOptions_2_SessionParams(_options): del _params['fstunnel'] - if _params.has_key('share_local_folders'): - _params['share_local_folders'] = [ f for f in _params['share_local_folders'].split(',') if f ] + if _params.has_key('export'): + + _export = _params['export'] + del _params['export'] + # fix for wrong export field usage in PyHoca-GUI/CLI and python-x2go before 20110923 + _export = _export.replace(",", ";") + + _export = _export.strip().strip('"').strip().strip(';').strip() + _export_list = [ f for f in _export.split(';') if f ] + + _params['share_local_folders'] = [] + for _shared_folder in _export_list: + # fix for wrong export field usage in PyHoca-GUI/CLI and python-x2go before 20110923 + if not ":" in _shared_folder: _shared_folder = "%s:1" % _shared_folder + if _shared_folder.split(":")[1] == "1": + _params['share_local_folders'].append(_shared_folder.split(":")[0]) if not _options['fullscreen']: _params['geometry'] = '%sx%s' % (_options['width'], _options['height']) @@ -444,5 +457,6 @@ def is_color_depth_ok(depth_session, depth_local): if depth_session == depth_local: return True if ( ( depth_session == 24 or depth_session == 32 ) and ( depth_local == 24 or depth_local == 32 ) ): - return true; + return True; return False + 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-52-gcf6f644
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via cf6f644b5cbbe84d161d8adeae773dc2cb3e497c (commit) via 31346860849fa3cff91be43916c517864c2e97a4 (commit) from 7f9ddc015a568643482b87467b247f86454a4abe (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 cf6f644b5cbbe84d161d8adeae773dc2cb3e497c … [View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 02:10:34 2011 +0200 re-add version 0.1.2.0 header to changelog commit 31346860849fa3cff91be43916c517864c2e97a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 02:08:47 2011 +0200 release 0.1.1.7 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 990531d..ba8626b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,12 +2,12 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low * License change upstream: GPLv3+ -> AGPLv3+ - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 18 Jul 2011 13:51:09 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:11 +0200 -python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low +python-x2go (0.1.1.7-0-x2go1) unstable; urgency=low [ Mike Gabriel ] - * New upstream version (0.1.1.7), bugfix release for 0.1.1.x series: + * New upstream version (0.1.1.7), bugfix+feature release for 0.1.1.x series: - Add support for x2goumount-session calls. - Differentiate between spool folders and data folders when unsharing all folders, return exitcode from X2goTerminalSessionSTDOUT.unshare_* @@ -25,7 +25,7 @@ python-x2go (0.1.1.7-0-x2go1) UNRELEASED; urgency=low * Fix for upstream version 0.1.1.7: - Typo in utils.py (true instead of True). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 14 Sep 2011 21:35:54 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 25 Sep 2011 02:08:01 +0200 python-x2go (0.1.1.6-0~x2go1) unstable; urgency=low 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 - release/0.1.1.x (branch) updated: 0.1.1.6-22-g539ca3e
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, release/0.1.1.x has been updated via 539ca3ee9ed07ddfce6f2a6d90f876479c8f87a9 (commit) from a5ed9d2b9cb15374aa0e5205f728fd50efd04b6b (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 539ca3ee9ed07ddfce6f2a6d90f876479c8f87a9 Author: Mike Gabriel <mike.gabriel(a)das-… [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-301-g79768a5
by git-admin＠x2go.org 25 Sep '11

25 Sep '11

The branch, master has been updated via 79768a516c661c7c8c4607bd4fda1290b19ddd28 (commit) from 55e547b1526b674a7d60ff42c5b3e49b6a7861f5 (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 79768a516c661c7c8c4607bd4fda1290b19ddd28 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Sep 25 02:04:32 2011 +0200 Makefile update for including x2gofeature scripts into installation, minor fixes to x2goserver core package Makefile. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver-compat/Makefile | 4 ++++ x2goserver-extensions/Makefile | 4 ++++ x2goserver-printing/Makefile | 5 ++++- x2goserver/Makefile | 8 ++++++-- 5 files changed, 20 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9793cd4..ab03327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -84,6 +84,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low x2goserver-printing. * Add x2gofeature man page. * Move x2goversion into x2goserver core package. + * Makefile update for including x2gofeature scripts into installation, minor fixes + to x2goserver core package Makefile. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index e1bc30f..576f9ce 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) #SBIN_SCRIPTS=$(shell cd sbin && ls) #LIB_FILES=$(shell cd lib && ls) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) man_pages = `cd man && find * -type f` @@ -53,9 +54,11 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) # $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) # $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ # $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ # $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ + $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: # $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) @@ -79,6 +82,7 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done + for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done # for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done # for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done # $(RM_DIR) $(DESTDIR)$(LIBDIR) || true diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index b234c16..591a598 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) #SBIN_SCRIPTS=$(shell cd sbin && ls) #LIB_FILES=$(shell cd lib && ls) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) man_pages = `cd man && find * -type f` @@ -53,9 +54,11 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) # $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) # $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ # $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ # $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ + $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: # $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) @@ -82,6 +85,7 @@ uninstall_scripts: # for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done # for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done # $(RM_DIR) $(DESTDIR)$(LIBDIR) || true + for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: # $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index e41ff98..04f93bf 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) #SBIN_SCRIPTS=$(shell cd sbin && ls) #LIB_FILES=$(shell cd lib && ls) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) man_pages = `cd man && find * -type f` @@ -53,9 +54,11 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) # $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) # $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ # $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ # $(INSTALL_FILE) lib/* $(DESTDIR)$(LIBDIR)/ + $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ install_config: # $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) @@ -81,7 +84,7 @@ uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done # for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done # for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done -# $(RM_DIR) $(DESTDIR)$(LIBDIR) || true + for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done uninstall_config: # $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf diff --git a/x2goserver/Makefile b/x2goserver/Makefile index 0bf496c..2cc1bbd 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -22,6 +22,7 @@ SHAREDIR=$(PREFIX)/share/x2go BIN_SCRIPTS=$(shell cd bin && ls) SBIN_SCRIPTS=$(shell cd sbin && ls) LIB_FILES=$(shell cd lib && ls) +FEATURE_SCRIPTS=$(shell cd share/x2gofeature.d && ls *.features) man_pages = `cd man && find * -type f` @@ -59,15 +60,15 @@ install_scripts: $(INSTALL_DIR) $(DESTDIR)$(BINDIR) $(INSTALL_DIR) $(DESTDIR)$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d $(INSTALL_PROGRAM) bin/* $(DESTDIR)$(BINDIR)/ $(INSTALL_PROGRAM) sbin/* $(DESTDIR)$(SBINDIR)/ $(INSTALL_PROGRAM) x2gosqlitewrapper $(DESTDIR)$(LIBDIR)/ $(INSTALL_PROGRAM) lib/* $(DESTDIR)$(LIBDIR)/ + $(INSTALL_PROGRAM) share/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/ chmod a-x $(DESTDIR)$(LIBDIR)/*.pm chown root:x2gouser $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper chmod 2755 $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper - chown root:x2goprint $(DESTDIR)$(BINDIR)/x2goprint - chmod 2755 $(DESTDIR)$(BINDIR)/x2goprint install_config: $(INSTALL_DIR) $(DESTDIR)$(ETCDIR) @@ -93,8 +94,11 @@ uninstall_scripts: for file in $(BIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(BINDIR)/$$file; done for file in $(SBIN_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SBINDIR)/$$file; done for file in $(LIB_FILES); do $(RM_FILE) $(DESTDIR)$(LIBDIR)/$$file; done + for file in $(FEATURE_SCRIPTS); do $(RM_FILE) $(DESTDIR)$(SHAREDIR)/x2gofeature.d/$$file; done $(RM_FILE) $(DESTDIR)$(LIBDIR)/x2gosqlitewrapper $(RM_DIR) $(DESTDIR)$(LIBDIR) || true + $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d || true + $(RM_DIR) $(DESTDIR)$(SHAREDIR) || true uninstall_config: $(RM_FILE) $(DESTDIR)$(ETCDIR)/x2goserver.conf hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-300-g55e547b
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 55e547b1526b674a7d60ff42c5b3e49b6a7861f5 (commit) from 5b9cf0a0e8c1a15e13d0e024af63ace3cb51737b (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 55e547b1526b674a7d60ff42c5b3e49b6a7861f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-299-g5b9cf0a
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 5b9cf0a0e8c1a15e13d0e024af63ace3cb51737b (commit) via 9e36fbc3021da3b86aa5e1e3f0f3b8e30c007ce6 (commit) via 5da0e9ad200529a210b7e41c1eb8b6dc9b934d8d (commit) from b74e5b69112cc355828974e651dd7f27bdc106a1 (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 -----------------------------------------------------… [View More]------------ commit 5b9cf0a0e8c1a15e13d0e024af63ace3cb51737b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 01:44:48 2011 +0200 add more features to x2gofeature commit 9e36fbc3021da3b86aa5e1e3f0f3b8e30c007ce6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 01:43:48 2011 +0200 Move x2goversion into x2goserver core package. commit 5da0e9ad200529a210b7e41c1eb8b6dc9b934d8d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Sep 25 01:42:42 2011 +0200 update of x2golistmount man page ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2goserver-extensions/man/man8/x2golistmounts.8 | 37 ++++++++++++++++++++ .../x2gofeature.d/x2goserver-extensions.features | 1 + .../bin/x2goversion | 0 .../man/man8/x2goversion.8 | 0 x2goserver/share/x2gofeature.d/x2goserver.features | 3 ++ 6 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 x2goserver-extensions/man/man8/x2golistmounts.8 rename {x2goserver-extensions => x2goserver}/bin/x2goversion (100%) rename {x2goserver-extensions => x2goserver}/man/man8/x2goversion.8 (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 19438b2..9793cd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -83,6 +83,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions and x2goserver-printing. * Add x2gofeature man page. + * Move x2goversion into x2goserver core package. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver-extensions/man/man8/x2golistmounts.8 b/x2goserver-extensions/man/man8/x2golistmounts.8 new file mode 100644 index 0000000..1263a55 --- /dev/null +++ b/x2goserver-extensions/man/man8/x2golistmounts.8 @@ -0,0 +1,37 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2golistmounts 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2golistmounts \- List Mounted Shares for an X2go Session +.SH SYNOPSIS +'nh +.fi +.ad l +x2golistmounts <session_id> + +.SH DESCRIPTION +\fBx2golistmounts\fR returns a list of mounted client-side folders or devices for X2go +session <session_id>. +.PP +\fBx2golistmounts\fR is run with normal user privileges and it is used by X2go clients to render +a list of SSHFS mounts for a given X2go sessions. +.SH RETURN VALUES +A line-by-line list of mounted shares is returned by \fBx2golistmounts\fR. Each line consists of +two mount point attribute fields separated by the pipe symbol (,,|''). +.PP +The meanings of these mount point attributes are: + + field 01: <sshfs_target_host_ip> + field 02: <mount_point_path_on_server> + +As exitcode \fBx2golistmounts\fR always returns 0. +.SH SEE ALSO +x2gomountdirs(8), x2goumount-session(8) +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). diff --git a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features index 879e71b..b2e384f 100755 --- a/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features +++ b/x2goserver-extensions/share/x2gofeature.d/x2goserver-extensions.features @@ -29,6 +29,7 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in + "X2GO_SET_KEYBOARD") echo "ok"; exit 0;; "X2GO_LIST_MOUNTS") echo "ok"; exit 0;; *) exit -1;; diff --git a/x2goserver-extensions/bin/x2goversion b/x2goserver/bin/x2goversion similarity index 100% rename from x2goserver-extensions/bin/x2goversion rename to x2goserver/bin/x2goversion diff --git a/x2goserver-extensions/man/man8/x2goversion.8 b/x2goserver/man/man8/x2goversion.8 similarity index 100% rename from x2goserver-extensions/man/man8/x2goversion.8 rename to x2goserver/man/man8/x2goversion.8 diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features index eebdf2b..44458d9 100755 --- a/x2goserver/share/x2gofeature.d/x2goserver.features +++ b/x2goserver/share/x2gofeature.d/x2goserver.features @@ -29,6 +29,9 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in + "X2GO_LIST_DESKTOPS") echo "ok"; exit 0;; + "X2GO_MOUNTDIRS") echo "ok"; exit 0;; + "X2GO_UMOUNTSESSION_ALL") echo "ok"; exit 0;; "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;; *) exit -1;; hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-296-gb74e5b6
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via b74e5b69112cc355828974e651dd7f27bdc106a1 (commit) from 6ac202a1dcd441658d9bcf9dd5e4721a3612e9ed (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 b74e5b69112cc355828974e651dd7f27bdc106a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-295-g6ac202a
by git-admin＠x2go.org 24 Sep '11

24 Sep '11

The branch, master has been updated via 6ac202a1dcd441658d9bcf9dd5e4721a3612e9ed (commit) from 8f3a378b553e214b6324653dcb6e335c40cd9ca8 (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 6ac202a1dcd441658d9bcf9dd5e4721a3612e9ed Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2011