x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

python-x2go.git - master (branch) updated: 0.1.0.3-49-gaab4248
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via aab424884da4f4dc1a188afc3bfa7194b9836ea6 (commit) from fe00a4d4a04d28fe242e054879d9a5a9ceaad357 (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 aab424884da4f4dc1a188afc3bfa7194b9836ea6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 21:11:34 2011 +0200 property fix... ----------------------------------------------------------------------- Summary of changes: x2go/backends/proxy/base.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 4bbac10..9558b83 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -136,7 +136,7 @@ class X2goProxyBASE(threading.Thread): try: self.proxy.kill() except OSError, e: - self.logger('X2go proxy shutdown gave a message that we may ignore: %s' % str(e), loglevel=log.loglevel_WARNING) + self.logger('X2go proxy shutdown gave a message that we may ignore: %s' % str(e), loglevel=log.loglevel_WARN) self.proxy = None if self.fw_tunnel is not None: self.logger('Shutting down Paramiko/SSH forwarding tunnel', loglevel=log.loglevel_DEBUG) hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.3-5-g0eff903
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via 0eff903c5a644d674ce31a6d8730a0a19aa5fcc1 (commit) from f0a005a720805404e60144556ef44900a8f99b61 (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 0eff903c5a644d674ce31a6d8730a0a19aa5fcc1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 21:05:04 2011 +0200 updates Dutch translation, rebuilt i18n files ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 16445 -> 16445 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 15407 -> 15407 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15225 -> 15225 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 15334 -> 15643 bytes po/de.po | 141 +++++++++++++++++--------------- po/en.po | 130 +++++++++++++++--------------- po/es.po | 142 +++++++++++++++++---------------- po/nl.po | 136 ++++++++++++++++--------------- po/pyhoca-gui.pot | 3 +- 9 files changed, 285 insertions(+), 267 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 d85d93e..f2a230e 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 68777c3..59e1a62 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 46b80b4..688b396 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 d94483f..1cee8c5 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/de.po b/po/de.po index 151d32e..77b401d 100644 --- a/po/de.po +++ b/po/de.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:41+0200\n" +"POT-Creation-Date: 2011-06-23 21:04+0200\n" "PO-Revision-Date: 2011-06-23 15:43+0100\n" "Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <m.gabriel(a)das-netzwerkteam.de>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:87 -#: ../pyhoca/wxgui/logon.py:97 +#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Benutzername" -#: ../pyhoca/wxgui/logon.py:89 -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Kennwort" @@ -51,27 +49,22 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:120 -#: ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Abbrechen" -#: ../pyhoca/wxgui/logon.py:251 -#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284 #: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:252 -#: ../pyhoca/wxgui/frontend.py:341 +#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "Benutzer darf keine X2go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:257 -#: ../pyhoca/wxgui/frontend.py:348 +#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -97,28 +90,26 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:307 -#: ../pyhoca/wxgui/logon.py:314 -#: ../pyhoca/wxgui/logon.py:333 -#: ../pyhoca/wxgui/frontend.py:364 -#: ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392 #: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/logon.py:321 -#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371 #: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:322 -#: ../pyhoca/wxgui/frontend.py:371 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" +#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer " +"nicht akzeptiert" #: ../pyhoca/wxgui/logon.py:328 #, python-format @@ -195,8 +186,7 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:72 -#: ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -315,8 +305,7 @@ msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "Benutzer" @@ -441,8 +430,7 @@ msgstr "Lokale Ordnerfreigabe verwenden" msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:239 -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Hinzufügen" @@ -541,8 +529,7 @@ msgstr "Ordner zur Freigabe für Sitzungen auswählen" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profilmanager" @@ -558,14 +545,19 @@ msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" #: ../pyhoca/wxgui/profilemanager.py:1383 msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." +msgstr "" +"Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." -msgstr "Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy Einstellungen entsprechend ändern." +msgstr "" +"Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um " +"einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " +"Einstellungen entsprechend ändern." #: ../pyhoca/wxgui/profilemanager.py:1413 #, python-format @@ -606,8 +598,7 @@ msgstr "Druckeinstellungen" msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "&Beenden" @@ -671,8 +662,7 @@ msgstr "Sitzung starten/fortsetzen" msgid "Connect Server" msgstr "Serververbindung aufbauen" -#: ../pyhoca/wxgui/about.py:55 -#: ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Über %s ..." @@ -682,12 +672,17 @@ msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." #: ../pyhoca/wxgui/frontend.py:378 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " +"Benutzer nicht akzeptiert" #: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal versuchen..." +msgstr "" +"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " +"versuchen..." #: ../pyhoca/wxgui/frontend.py:406 #, python-format @@ -759,11 +754,14 @@ msgstr "%s - Verbindungsfehler" #: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen Sie, sich neu am Server anzumelden..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " +"Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:687 -#: ../pyhoca/wxgui/frontend.py:699 +#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" @@ -784,13 +782,21 @@ msgstr "%s - Sitzungsfunktion eingeschränkt" #: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s wurde vom X2go Server abgelehnt." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " +"wurde vom X2go Server abgelehnt." #: ../pyhoca/wxgui/frontend.py:699 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -msgstr "SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server verweigert. Die Sitzung konnte nicht gestartet werden." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +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:711 #, python-format @@ -798,11 +804,13 @@ msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" #: ../pyhoca/wxgui/frontend.py:711 -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." +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:714 -#: ../pyhoca/wxgui/frontend.py:717 +#: ../pyhoca/wxgui/frontend.py:714 ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" @@ -829,8 +837,7 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 -#: ../pyhoca/wxgui/frontend.py:736 +#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" @@ -857,8 +864,7 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:740 -#: ../pyhoca/wxgui/frontend.py:744 +#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - starten" @@ -881,8 +887,7 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:748 -#: ../pyhoca/wxgui/frontend.py:752 +#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" @@ -965,8 +970,7 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../pyhoca/wxgui/messages.py:99 -#: ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "OK" @@ -1054,8 +1058,10 @@ msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" #, fuzzy #~ msgid "New Profile" #~ msgstr "Profil" + #~ msgid "%s - print job" #~ msgstr "%s - Druckauftrag" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" @@ -1063,8 +1069,9 @@ msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" #~ "Druckdialog für eingehende Druckaufträge ist bislang nicht " #~ "implementiert!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profilsymbol" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/en.po b/po/en.po index 9b37e95..f43e3c1 100644 --- a/po/en.po +++ b/po/en.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:41+0200\n" +"POT-Creation-Date: 2011-06-23 21:04+0200\n" "PO-Revision-Date: 2011-06-23 15:42+0100\n" "Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <m.gabriel(a)das-netzwerkteam.de>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: English\n" "X-Poedit-Country: UNITED STATES\n" "X-Poedit-SourceCharset: utf-8\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:87 -#: ../pyhoca/wxgui/logon.py:97 +#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Username" -#: ../pyhoca/wxgui/logon.py:89 -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Password" @@ -51,27 +49,22 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:120 -#: ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Cancel" -#: ../pyhoca/wxgui/logon.py:251 -#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284 #: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:252 -#: ../pyhoca/wxgui/frontend.py:341 +#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "User is not allowed to start X2go sessions!" -#: ../pyhoca/wxgui/logon.py:257 -#: ../pyhoca/wxgui/frontend.py:348 +#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -97,28 +90,25 @@ msgstr "%s - ssh proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" -#: ../pyhoca/wxgui/logon.py:307 -#: ../pyhoca/wxgui/logon.py:314 -#: ../pyhoca/wxgui/logon.py:333 -#: ../pyhoca/wxgui/frontend.py:364 -#: ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392 #: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - connect error" -#: ../pyhoca/wxgui/logon.py:321 -#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371 #: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:322 -#: ../pyhoca/wxgui/frontend.py:371 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"The remote server's host key is invalid or has not been accepted by the user" #: ../pyhoca/wxgui/logon.py:328 #, python-format @@ -197,8 +187,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:72 -#: ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Custom command" @@ -317,8 +306,7 @@ msgstr "XDMCP server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "User" @@ -443,8 +431,7 @@ msgstr "Use local folder sharing" msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:239 -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Add" @@ -543,8 +530,7 @@ msgstr "Choose a folder to share within a session" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profile Manager" @@ -565,10 +551,12 @@ msgstr "The SSH proxy configuration is incomplete. Try again." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." #: ../pyhoca/wxgui/profilemanager.py:1413 @@ -610,8 +598,7 @@ msgstr "Printing Preferences" msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "E&xit" @@ -675,8 +662,7 @@ msgstr "Start/Resume Session" msgid "Connect Server" msgstr "Connect Server" -#: ../pyhoca/wxgui/about.py:55 -#: ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -686,8 +672,10 @@ msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." #: ../pyhoca/wxgui/frontend.py:378 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "The SSH proxy's host key is invalid or has not been accepted by the user" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"The SSH proxy's host key is invalid or has not been accepted by the user" #: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." @@ -763,11 +751,14 @@ msgstr "%s - channel error" #: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." -#: ../pyhoca/wxgui/frontend.py:687 -#: ../pyhoca/wxgui/frontend.py:699 +#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - session failure" @@ -788,13 +779,21 @@ msgstr "%s - session warning" #: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." #: ../pyhoca/wxgui/frontend.py:699 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +msgstr "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:711 #, python-format @@ -802,11 +801,12 @@ msgid "%s - audio warning" msgstr "%s - audio warning" #: ../pyhoca/wxgui/frontend.py:711 -msgid "The X2go PulseAudio system is not available within Remote Desktop sessions." -msgstr "The X2go PulseAudio system is not available within Remote Desktop sessions." +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:714 -#: ../pyhoca/wxgui/frontend.py:717 +#: ../pyhoca/wxgui/frontend.py:714 ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - audio error" @@ -833,8 +833,7 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 -#: ../pyhoca/wxgui/frontend.py:736 +#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - print error" @@ -861,8 +860,7 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:740 -#: ../pyhoca/wxgui/frontend.py:744 +#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - start" @@ -885,8 +883,7 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:748 -#: ../pyhoca/wxgui/frontend.py:752 +#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - resume" @@ -968,8 +965,7 @@ msgstr "Yes" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:99 -#: ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "Ok" @@ -1053,18 +1049,22 @@ msgstr "Choose PDF saving location" #~ msgid "All session profiles are connected" #~ msgstr "All session profiles are connected" + #~ msgid "New Profile" #~ msgstr "New Profile" + #~ msgid "%s - print job" #~ msgstr "%s - print job" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profile icon" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/es.po b/po/es.po index d151028..e2ffd91 100644 --- a/po/es.po +++ b/po/es.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:41+0200\n" +"POT-Creation-Date: 2011-06-23 21:04+0200\n" "PO-Revision-Date: 2011-06-23 15:48+0100\n" "Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: es <oceanosoftlapalma(a)gmail.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: Spanish\n" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (vía %s)" -#: ../pyhoca/wxgui/logon.py:87 -#: ../pyhoca/wxgui/logon.py:97 +#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Nombre de usuario" -#: ../pyhoca/wxgui/logon.py:89 -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Contraseña" @@ -51,27 +49,22 @@ msgstr "Inicio de sesión" msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:120 -#: ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Cancelar" -#: ../pyhoca/wxgui/logon.py:251 -#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284 #: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:252 -#: ../pyhoca/wxgui/frontend.py:341 +#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" -#: ../pyhoca/wxgui/logon.py:257 -#: ../pyhoca/wxgui/frontend.py:348 +#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - conectado" @@ -97,28 +90,26 @@ msgstr "%s - proxy ssh" 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:307 -#: ../pyhoca/wxgui/logon.py:314 -#: ../pyhoca/wxgui/logon.py:333 -#: ../pyhoca/wxgui/frontend.py:364 -#: ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392 #: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/logon.py:321 -#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371 #: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - error en la clave del equipo" -#: ../pyhoca/wxgui/logon.py:322 -#: ../pyhoca/wxgui/frontend.py:371 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "La clave del servidor remoto no es válida o no ha sido aceptada por el usuario" +#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"La clave del servidor remoto no es válida o no ha sido aceptada por el " +"usuario" #: ../pyhoca/wxgui/logon.py:328 #, python-format @@ -127,7 +118,8 @@ msgstr "%s - error en la clave" #: ../pyhoca/wxgui/logon.py:334 msgid "An unknown error occured during authentication!" -msgstr "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" +msgstr "" +"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/taskbar.py:79 #, python-format @@ -198,8 +190,7 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:72 -#: ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Comando personalizado" @@ -318,8 +309,7 @@ msgstr "Servidor XDMCP" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "Usuario" @@ -444,8 +434,7 @@ msgstr "Compartir carpetas locales" msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:239 -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Añadir" @@ -545,8 +534,7 @@ msgstr "Elige la carpeta que quieres compartir en la conexión" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Gestor de Perfiles" @@ -563,12 +551,15 @@ msgstr "" #: ../pyhoca/wxgui/profilemanager.py:1383 #, fuzzy msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo otra vez..." +msgstr "" +"¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " +"otra vez..." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" @@ -611,8 +602,7 @@ msgstr "Preferencias de impresión" msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "S&alir" @@ -676,8 +666,7 @@ msgstr "Iniciar/Retomar Sesión" msgid "Connect Server" msgstr "Conectar con el Servidor" -#: ../pyhoca/wxgui/about.py:55 -#: ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Acerca de %s ..." @@ -687,12 +676,16 @@ msgid "Public SSH key authentication has been successful." msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH." #: ../pyhoca/wxgui/frontend.py:378 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" #: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo otra vez..." +msgstr "" +"¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " +"otra vez..." #: ../pyhoca/wxgui/frontend.py:406 #, python-format @@ -702,7 +695,8 @@ msgstr "%s - error en la clave de identificación" #: ../pyhoca/wxgui/frontend.py:413 #, fuzzy msgid "An unknown error occurred during authentication!" -msgstr "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" +msgstr "" +"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/frontend.py:515 msgid "Cleaning X2go sessions..." @@ -765,11 +759,14 @@ msgstr "%s - error en el canal" #: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta iniciar sesión nuevamente..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " +"iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:687 -#: ../pyhoca/wxgui/frontend.py:699 +#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" @@ -790,13 +787,21 @@ msgstr "%s - advertencia durante la sesión" #: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Se ha denegado la redirección del túnel TCP inverso para la sesión %s al puerto %s del servidor X2go." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +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:699 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -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." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +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:711 #, python-format @@ -804,11 +809,13 @@ msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" #: ../pyhoca/wxgui/frontend.py:711 -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" +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:714 -#: ../pyhoca/wxgui/frontend.py:717 +#: ../pyhoca/wxgui/frontend.py:714 ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" @@ -835,8 +842,7 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 -#: ../pyhoca/wxgui/frontend.py:736 +#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" @@ -863,8 +869,7 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:740 -#: ../pyhoca/wxgui/frontend.py:744 +#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - inicio" @@ -887,8 +892,7 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:748 -#: ../pyhoca/wxgui/frontend.py:752 +#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" @@ -968,8 +972,7 @@ msgstr "Sí" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:99 -#: ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "Ok" @@ -1058,16 +1061,19 @@ msgstr "Elegir localización para los PDFs" #, fuzzy #~ msgid "New Profile" #~ msgstr "Perfil " + #~ msgid "%s - print job" #~ msgstr "%s - imprimir" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "¡¡¡El cuadro de diálogo de imprimir no ha sido desarrollado todavía!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Icono del perfil" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/nl.po b/po/nl.po index 1c81611..7132175 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:41+0200\n" -"PO-Revision-Date: 2011-06-23 15:45+0100\n" -"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-06-23 21:04+0200\n" +"PO-Revision-Date: 2011-06-23 21:04+0100\n" +"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" "X-Poedit-Language: Dutch\n" "X-Poedit-Country: NETHERLANDS\n" "X-Poedit-SourceCharset: utf-8\n" @@ -25,13 +25,11 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:87 -#: ../pyhoca/wxgui/logon.py:97 +#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Gebruiker" -#: ../pyhoca/wxgui/logon.py:89 -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Wachtwoord" @@ -51,27 +49,22 @@ msgstr "Sessie login" msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:120 -#: ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 -#: ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:251 -#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284 #: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:252 -#: ../pyhoca/wxgui/frontend.py:341 +#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "Gebruiker mag geen X2go sessie starten!" -#: ../pyhoca/wxgui/logon.py:257 -#: ../pyhoca/wxgui/frontend.py:348 +#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -97,28 +90,26 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:307 -#: ../pyhoca/wxgui/logon.py:314 -#: ../pyhoca/wxgui/logon.py:333 -#: ../pyhoca/wxgui/frontend.py:364 -#: ../pyhoca/wxgui/frontend.py:385 -#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392 #: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/logon.py:321 -#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371 #: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:322 -#: ../pyhoca/wxgui/frontend.py:371 -msgid "The remote server's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker" +#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371 +msgid "" +"The remote server's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de server is ongeldig of is niet geaccepteerd door de " +"gebruiker" #: ../pyhoca/wxgui/logon.py:328 #, python-format @@ -195,8 +186,7 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Enkelvoudige Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:72 -#: ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Speciaal Commando" @@ -315,8 +305,7 @@ msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 -#: ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "Gebruiker" @@ -441,8 +430,7 @@ msgstr "Delen van lokale mappen" msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:239 -#: ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Toevoegen" @@ -541,8 +529,7 @@ msgstr "Kies een map om te delen" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 -#: ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profiel manager" @@ -563,9 +550,13 @@ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH " +"proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" +"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale " +"SSH proxy.\n" +"Verander de SSH proxy instelling om dit probleem te verhelpen." #: ../pyhoca/wxgui/profilemanager.py:1413 #, python-format @@ -606,8 +597,7 @@ msgstr "Voorkeur voor afdrukken" msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:116 -#: ../pyhoca/wxgui/menus_taskbar.py:390 +#: ../pyhoca/wxgui/menus_taskbar.py:116 ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "&Beeindigen" @@ -671,8 +661,7 @@ msgstr "Sessie starten/hervatten" msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/about.py:55 -#: ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." @@ -682,8 +671,11 @@ msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." #: ../pyhoca/wxgui/frontend.py:378 -msgid "The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker" +msgid "" +"The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "" +"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " +"gebruiker" #: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." @@ -759,11 +751,14 @@ msgstr "%s - Verbindingsfout (channel error)" #: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..." +msgid "" +"Lost connection to server %s unexpectedly! Try to re-authenticate to the " +"server..." +msgstr "" +"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " +"opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:687 -#: ../pyhoca/wxgui/frontend.py:699 +#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" @@ -784,13 +779,21 @@ msgstr "%s - sessie waarschuwing" #: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." -msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgid "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." +msgstr "" +"Reverse TCP port forwarding request for session %s to server port %s has " +"been denied." #: ../pyhoca/wxgui/frontend.py:699 #, python-format -msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgid "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." +msgstr "" +"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " +"X2go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:711 #, python-format @@ -798,11 +801,12 @@ msgid "%s - audio warning" msgstr "%s - audio waarschuwing" #: ../pyhoca/wxgui/frontend.py:711 -msgid "The X2go PulseAudio system is not available within Remote Desktop sessions." -msgstr "Het X2go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" +msgid "" +"The X2go PulseAudio system is not available within Remote Desktop sessions." +msgstr "" +"Het X2go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies" -#: ../pyhoca/wxgui/frontend.py:714 -#: ../pyhoca/wxgui/frontend.py:717 +#: ../pyhoca/wxgui/frontend.py:714 ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" @@ -829,8 +833,7 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 -#: ../pyhoca/wxgui/frontend.py:736 +#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - Printfout" @@ -857,8 +860,7 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:740 -#: ../pyhoca/wxgui/frontend.py:744 +#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - Start" @@ -881,8 +883,7 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:748 -#: ../pyhoca/wxgui/frontend.py:752 +#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - hervatten" @@ -964,8 +965,7 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:99 -#: ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "Ok" @@ -1049,18 +1049,22 @@ msgstr "Kies locatie om PDF op te slaan" #~ msgid "All session profiles are connected" #~ msgstr "Alle profielen zijn verbonden" + #~ msgid "New Profile" #~ msgstr "Profiel" + #~ msgid "%s - print job" #~ msgstr "%s - print job" + #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "De Print job dialog is nog niet geimplementeerd!!!\n" #~ "%s" + #~ msgid "Profile icon" #~ msgstr "Profile icon" + #~ msgid "Arts" #~ msgstr "Arts" - diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 44fbe91..940459f 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:49+0200\n" +"POT-Creation-Date: 2011-06-23 21:04+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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\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)).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-48-gfe00a4d
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via fe00a4d4a04d28fe242e054879d9a5a9ceaad357 (commit) from bcbc75f490c112b47e2c30ce889f23f0ce0822ef (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 fe00a4d4a04d28fe242e054879d9a5a9ceaad357 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 20:51:05 2011 +0200 re-fix session resume/suspend functionality ----------------------------------------------------------------------- Summary of changes: x2go/backends/proxy/base.py | 27 ++++++++++++++++++++------- x2go/backends/terminal/_stdout.py | 14 ++++---------- x2go/forward.py | 2 ++ x2go/session.py | 7 ++++++- 4 files changed, 32 insertions(+), 18 deletions(-) The diff of changes is: diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py index 0a3fc34..4bbac10 100644 --- a/x2go/backends/proxy/base.py +++ b/x2go/backends/proxy/base.py @@ -131,12 +131,17 @@ class X2goProxyBASE(threading.Thread): if left open. """ - if self.ok(): + if self.proxy: self.logger('Shutting down X2go proxy subprocess', loglevel=log.loglevel_DEBUG) - self.proxy.kill() + try: + self.proxy.kill() + except OSError, e: + self.logger('X2go proxy shutdown gave a message that we may ignore: %s' % str(e), loglevel=log.loglevel_WARNING) + self.proxy = None if self.fw_tunnel is not None: self.logger('Shutting down Paramiko/SSH forwarding tunnel', loglevel=log.loglevel_DEBUG) forward.stop_forward_tunnel(self.fw_tunnel) + self.fw_tunnel = None if self.session_log_stdout is not None: self.session_log_stdout.close() if self.session_log_stderr is not None: @@ -178,7 +183,8 @@ class X2goProxyBASE(threading.Thread): remote_port=self.session_info.graphics_port, ssh_transport=self.ssh_transport, session_instance=self.session_instance, - logger=self.logger, ) + logger=self.logger, + ) # update the proxy port in PROXY_ARGS self._update_local_proxy_socket(local_graphics_port) @@ -211,9 +217,9 @@ class X2goProxyBASE(threading.Thread): if _X2GOCLIENT_OS == 'Windows': _stdin.close() - self.logger('terminating proxy: %s' % p, loglevel=log.loglevel_DEBUG) try: p.terminate() + self.logger('terminating proxy: %s' % p, loglevel=log.loglevel_DEBUG) except OSError, e: if e.errno == 3: # No such process @@ -255,14 +261,21 @@ class X2goProxyBASE(threading.Thread): """ threading.Thread.start(self) - while self.proxy is None: - gevent.sleep(.2) + + # wait for proxy to get started + _count = 0 + _maxwait = 40 + while self.proxy is None and _count < _maxwait: + _count += 1 + self.logger('waiting for proxy to come up: 0.4s x %s' % _count, loglevel=log.loglevel_DEBUG) + gevent.sleep(.4) # also wait for fw_tunnel to become active _count = 0 _maxwait = 40 while not self.fw_tunnel.is_active and _count < _maxwait: _count += 1 + self.logger('waiting for port fw tunnel to come up: 0.5s x %s' % _count, loglevel=log.loglevel_DEBUG) gevent.sleep(.5) return self.proxy @@ -275,4 +288,4 @@ class X2goProxyBASE(threading.Thread): @rtype C{bool} """ - return self.proxy and self.proxy.poll is not None + return bool(self.proxy and self.proxy.poll() is None) diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 38e0739..dc9d3f4 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -331,8 +331,7 @@ class X2goTerminalSessionSTDOUT(object): def _x2go_tidy_up(self): - if self.proxy.ok(): - self.release_proxy() + self.release_proxy() try: if self.control_session.get_transport() is not None: @@ -924,9 +923,8 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.proxy.ok(): - self.release_proxy() self.control_session.suspend(session_name=self.session_info.name) + self.release_proxy() # TODO: check if session has really suspended _ret = True @@ -941,9 +939,8 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.proxy.ok(): - self.release_proxy() self.control_session.terminate(session_name=self.session_info.name) + self.release_proxy() # TODO: check if session has really suspended _ret = True @@ -955,7 +952,4 @@ class X2goTerminalSessionSTDOUT(object): STILL UNDOCUMENTED """ - try: - self.proxy.__del__() - except: - pass + self.proxy.__del__() diff --git a/x2go/forward.py b/x2go/forward.py index 09950d5..34466d0 100644 --- a/x2go/forward.py +++ b/x2go/forward.py @@ -103,6 +103,7 @@ class X2goFwServer(StreamServer): # it is recommended here to have passed on the session instance to this object... if self.session_instance: if not self.session_instance.is_connected(): + print 'HALLO' break _count += 1 @@ -189,6 +190,7 @@ class X2goFwServer(StreamServer): _success = True except socket.error: gevent.sleep(.2) + self.logger('could not close fw_tunnel socket, try again (%s of %s)' % (_count, _maxwait), loglevel=log.loglevel_WARN) if _count >= _maxwait: self.logger('forwarding tunnel to [%s]:%d could not be closed properly' % (self.chain_host, self.chain_port), loglevel=log.loglevel_WARN) diff --git a/x2go/session.py b/x2go/session.py index 89499c3..37283b1 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -965,7 +965,10 @@ class X2goSession(object): if self.session_name is None: _new_session = True - self.session_name = self.terminal_session.session_info.name + try: + self.session_name = self.terminal_session.session_info.name + except AttributeError: + raise X2goSessionException('start of new X2go session failed') if self.has_terminal_session() and not self.faulty: @@ -1317,5 +1320,7 @@ class X2goSession(object): """ if self.has_terminal_session(): + self.terminal_session.release_proxy() + if self.has_terminal_session(): self.terminal_session.__del__() self.terminal_session = None hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-47-gbcbc75f
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via bcbc75f490c112b47e2c30ce889f23f0ce0822ef (commit) from 009a7d9f70834ad66f535b71ac4d1670a6009b0e (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 bcbc75f490c112b47e2c30ce889f23f0ce0822ef Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 16:37:01 2011 +0200 remove unnecessary brackets ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 27d3eca..38e0739 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -768,7 +768,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - return bool(self.session_info.name and (self.proxy.ok())) + return bool(self.session_info.name and self.proxy.ok()) def is_running(self): """\ hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-46-g009a7d9
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via 009a7d9f70834ad66f535b71ac4d1670a6009b0e (commit) from c9357984185ea987a4378fba4c3b5236e440cb4c (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 009a7d9f70834ad66f535b71ac4d1670a6009b0e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 16:09:57 2011 +0200 Faulty sessions (without a NX proxy fw tunnel) will get terminated whenever the X2go server (SSHd) denies the tunnel setup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/session.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bad9996..5e8cef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low - Do not start X2go service tunnels (audio, sshfs) if session startup failed. - Fix NX proxy startup post-check. - Force 16bit colour depth for RDP-proxy sessions. + - Faulty sessions (without a NX proxy fw tunnel) will get terminated whenever + the X2go server (SSHd) denies the tunnel setup. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 23 Jun 2011 08:34:14 +0200 diff --git a/x2go/session.py b/x2go/session.py index 02d78f4..89499c3 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -304,6 +304,9 @@ class X2goSession(object): else: self.logger('HOOK_forwarding_tunnel_setup_failed: Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2go/SSH server. Session startup failed.' % (chain_host, chain_port, self.session_name, self.profile_name), loglevel=log.loglevel_WARN) + # get rid of the faulty session... + self.terminate() + def HOOK_check_host_dialog(self, host, port, fingerprint='no fingerprint', fingerprint_type='RSA'): """\ HOOK method: called if a host check is requested. This hook has to either return C{True} (default) or C{False}. @@ -967,22 +970,22 @@ class X2goSession(object): if self.has_terminal_session() and not self.faulty: if SUPPORTED_SOUND and self.terminal_session.params.snd_system is not 'none': - self.terminal_session.start_sound() + self.terminal_session and not self.faulty and self.terminal_session.start_sound() if (SUPPORTED_PRINTING and self.printing) or \ (SUPPORTED_MIMEBOX and self.allow_mimebox) or \ (SUPPORTED_FOLDERSHARING and self.allow_share_local_folders): - self.terminal_session.start_sshfs() + self.terminal_session and not self.faulty and self.terminal_session.start_sshfs() try: if SUPPORTED_PRINTING and self.printing: - self.terminal_session.start_printing() - self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), }) + self.terminal_session and not self.faulty and self.terminal_session.start_printing() + self.terminal_session and not self.faulty and self.session_environment.update({'X2GO_SPOOLDIR': self.terminal_session.get_printing_spooldir(), }) except X2goUserException: pass if SUPPORTED_MIMEBOX and self.allow_mimebox: - self.terminal_session.start_mimebox(mimebox_extensions=self.mimebox_extensions, mimebox_action=self.mimebox_action) + 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(), }) if SUPPORTED_FOLDERSHARING and self.share_local_folders: hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.3-4-gf0a005a
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via f0a005a720805404e60144556ef44900a8f99b61 (commit) from a1bc905bf45414d4142f795e03bd484c12f3fc6a (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 f0a005a720805404e60144556ef44900a8f99b61 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 15:50:05 2011 +0200 rebuilt i18n files ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 16718 -> 16445 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 15598 -> 15407 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15354 -> 15225 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 15383 -> 15334 bytes po/de.po | 296 ++++++++++++++++----------------- po/en.po | 283 ++++++++++++++++--------------- po/es.po | 301 ++++++++++++++++----------------- po/nl.po | 283 +++++++++++++++---------------- po/pyhoca-gui.pot | 150 +++++++++-------- 9 files changed, 652 insertions(+), 661 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 c6a3298..d85d93e 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 8ca5316..68777c3 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 5098c96..46b80b4 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 94e27ec..d94483f 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/de.po b/po/de.po index d00089b..151d32e 100644 --- a/po/de.po +++ b/po/de.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-26 09:50+0200\n" -"PO-Revision-Date: 2011-05-26 02:00+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-06-23 15:41+0200\n" +"PO-Revision-Date: 2011-06-23 15:43+0100\n" +"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: de <m.gabriel(a)das-netzwerkteam.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,103 +20,112 @@ msgstr "" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../pyhoca/wxgui/logon.py:82 +#: ../pyhoca/wxgui/logon.py:83 #, python-format msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:94 +#: ../pyhoca/wxgui/logon.py:87 +#: ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Benutzername" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Kennwort" -#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:92 msgid "Authenticate" msgstr "Anmelden" -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:102 msgid " Start SSH tunnel " msgstr "SSH Tunnel aufbauen" -#: ../pyhoca/wxgui/logon.py:105 +#: ../pyhoca/wxgui/logon.py:108 msgid "Session login" msgstr "Sitzungslogin" -#: ../pyhoca/wxgui/logon.py:106 +#: ../pyhoca/wxgui/logon.py:109 msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:117 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 +#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 +#: ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Abbrechen" -#: ../pyhoca/wxgui/logon.py:248 ../pyhoca/wxgui/logon.py:281 -#: ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:251 +#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:249 ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:252 +#: ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "Benutzer darf keine X2go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:254 ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/logon.py:257 +#: ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - verbinden" -#: ../pyhoca/wxgui/logon.py:255 +#: ../pyhoca/wxgui/logon.py:258 msgid "Authentication has been successful." msgstr "Anmeldung war erfolgreich." -#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:280 msgid "SSH tunnel started" msgstr "SSH Tunnel gestartet" -#: ../pyhoca/wxgui/logon.py:282 +#: ../pyhoca/wxgui/logon.py:285 msgid "Authentication failed!" msgstr "Anmeldung fehlgeschlagen!" -#: ../pyhoca/wxgui/logon.py:289 +#: ../pyhoca/wxgui/logon.py:291 #, python-format msgid "%s - ssh proxy" msgstr "%s - SSH Proxy" -#: ../pyhoca/wxgui/logon.py:290 +#: ../pyhoca/wxgui/logon.py:292 msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/logon.py:329 ../pyhoca/wxgui/frontend.py:359 -#: ../pyhoca/wxgui/frontend.py:380 ../pyhoca/wxgui/frontend.py:387 -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/logon.py:307 +#: ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 +#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/logon.py:317 ../pyhoca/wxgui/frontend.py:366 -#: ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/logon.py:321 +#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:318 ../pyhoca/wxgui/frontend.py:366 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer " -"nicht akzeptiert" +#: ../pyhoca/wxgui/logon.py:322 +#: ../pyhoca/wxgui/frontend.py:371 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "Der Host-Schlüssel des X2go Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" -#: ../pyhoca/wxgui/logon.py:324 +#: ../pyhoca/wxgui/logon.py:328 #, python-format msgid "%s - key error" msgstr "%s - ungültiger Schlüssel" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:334 msgid "An unknown error occured during authentication!" msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" @@ -186,7 +195,8 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -305,7 +315,8 @@ msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "Benutzer" @@ -430,7 +441,8 @@ msgstr "Lokale Ordnerfreigabe verwenden" msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Hinzufügen" @@ -529,7 +541,8 @@ msgstr "Ordner zur Freigabe für Sitzungen auswählen" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profilmanager" @@ -545,19 +558,14 @@ msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" #: ../pyhoca/wxgui/profilemanager.py:1383 msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" -"Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." +msgstr "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." -msgstr "" -"Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um " -"einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " -"Einstellungen entsprechend ändern." +msgstr "Ein anderes Profil (%s) verwendet die Socketadresse [%s]:%s bereits, um einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy Einstellungen entsprechend ändern." #: ../pyhoca/wxgui/profilemanager.py:1413 #, python-format @@ -590,74 +598,71 @@ msgstr "Sitzungsprofil löschen" msgid "About %s (%s)..." msgstr "Über %s (%s) ..." -#: ../pyhoca/wxgui/menus_taskbar.py:101 +#: ../pyhoca/wxgui/menus_taskbar.py:102 msgid "Printing Preferences" msgstr "Druckeinstellungen" -#: ../pyhoca/wxgui/menus_taskbar.py:107 +#: ../pyhoca/wxgui/menus_taskbar.py:108 msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:115 ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:116 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "&Beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:153 msgid "Resume Session" msgstr "Sitzung fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:155 +#: ../pyhoca/wxgui/menus_taskbar.py:156 msgid "Transfer Session" msgstr "Sitzung übernehmen" -#: ../pyhoca/wxgui/menus_taskbar.py:156 +#: ../pyhoca/wxgui/menus_taskbar.py:157 msgid "Suspend Session" msgstr "Sitzung anhalten" -#: ../pyhoca/wxgui/menus_taskbar.py:158 +#: ../pyhoca/wxgui/menus_taskbar.py:159 msgid "Terminate Session" msgstr "Sitzung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:196 +#: ../pyhoca/wxgui/menus_taskbar.py:197 msgid "Start &new Session" msgstr "&Neue Sitzung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:212 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Running" msgstr "aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:214 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Suspended" msgstr "angehalten" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:227 msgid "&Clean all sessions" msgstr "Alle Sitzungen beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:228 +#: ../pyhoca/wxgui/menus_taskbar.py:229 msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:230 +#: ../pyhoca/wxgui/menus_taskbar.py:231 msgid "Share local &folder" msgstr "Lokalen Ordner verbinden" -#: ../pyhoca/wxgui/menus_taskbar.py:235 +#: ../pyhoca/wxgui/menus_taskbar.py:236 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:263 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:329 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:331 -msgid "All session profiles are connected" -msgstr "Alle Sitzungsprofile sind bereits verbunden" - #: ../pyhoca/wxgui/menus_taskbar.py:363 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" @@ -666,70 +671,70 @@ msgstr "Sitzung starten/fortsetzen" msgid "Connect Server" msgstr "Serververbindung aufbauen" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Über %s ..." -#: ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/frontend.py:348 msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." -#: ../pyhoca/wxgui/frontend.py:373 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom " -"Benutzer nicht akzeptiert" +#: ../pyhoca/wxgui/frontend.py:378 +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom Benutzer nicht akzeptiert" -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "" -"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal " -"versuchen..." +msgstr "Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal versuchen..." -#: ../pyhoca/wxgui/frontend.py:401 +#: ../pyhoca/wxgui/frontend.py:406 #, python-format msgid "%s - auth key error" msgstr "%s - ungültiger Benutzerschlüssel" -#: ../pyhoca/wxgui/frontend.py:510 +#: ../pyhoca/wxgui/frontend.py:413 +msgid "An unknown error occurred during authentication!" +msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!" + +#: ../pyhoca/wxgui/frontend.py:515 msgid "Cleaning X2go sessions..." msgstr "Beende X2go Sitzungen..." -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 #, python-format msgid "%s - disconnect" msgstr "%s - trennen" -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 msgid "X2go Profile is now disconnected." msgstr "X2go Profil ist nun nicht mehr verbunden." -#: ../pyhoca/wxgui/frontend.py:546 +#: ../pyhoca/wxgui/frontend.py:550 msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:573 +#: ../pyhoca/wxgui/frontend.py:577 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:598 #, 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:646 +#: ../pyhoca/wxgui/frontend.py:650 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -742,97 +747,80 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:654 +#: ../pyhoca/wxgui/frontend.py:658 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen " -"Sie, sich neu am Server anzumelden..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen Sie, sich neu am Server anzumelden..." -#: ../pyhoca/wxgui/frontend.py:683 ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:683 +#: ../pyhoca/wxgui/frontend.py:687 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" -"%s)." +"%s." msgstr "" "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied by the X2go server. This is a common issue with SSH, it might " -"help to restart the X2go server's SSH daemon." -msgstr "" -"Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s " -"wurde vom X2go Server abgelehnt. Leider kann dieses Problem aufgrund der SSH " -"Implementation häufiger vorkommen. Falls administrativ die Möglichkeit " -"besteht, wird es helfen, den SSH-Server Prozess auf dem X2go Server neu zu " -"starten." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s wurde vom X2go Server abgelehnt." -#: ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " -"verweigert. Die Sitzung konnte nicht gestartet werden." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +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:701 +#: ../pyhoca/wxgui/frontend.py:711 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:701 -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:711 +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:704 ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:704 +#: ../pyhoca/wxgui/frontend.py:714 msgid "The X2go PulseAudio system could not be started." msgstr "Das X2go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:717 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Das X2go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -841,12 +829,13 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:724 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:724 +#: ../pyhoca/wxgui/frontend.py:734 #, python-format msgid "" "%s\n" @@ -857,7 +846,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "" "%s\n" @@ -868,12 +857,13 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:730 ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:730 +#: ../pyhoca/wxgui/frontend.py:740 #, python-format msgid "" "New X2go session starting up...\n" @@ -882,7 +872,7 @@ msgstr "" "Neue X2go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "" "Another client started X2go session\n" @@ -891,12 +881,13 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:738 ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:748 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:748 #, python-format msgid "" "Resuming X2go session...\n" @@ -905,7 +896,7 @@ msgstr "" "X2go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "" "Another client resumed X2go session\n" @@ -914,12 +905,12 @@ msgstr "" "Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "" "Found already running session\n" @@ -928,12 +919,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "" "X2go Session has been suspended\n" @@ -942,12 +933,12 @@ msgstr "" "X2go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "" "X2go Session has terminated\n" @@ -974,7 +965,8 @@ msgstr "Ja" msgid "No" msgstr "Nein" -#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 +#: ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "OK" @@ -1056,13 +1048,14 @@ msgstr "Applikation für PDF-Anzeige auswählen" msgid "Choose PDF saving location" msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" +#~ msgid "All session profiles are connected" +#~ msgstr "Alle Sitzungsprofile sind bereits verbunden" + #, fuzzy #~ msgid "New Profile" #~ msgstr "Profil" - #~ msgid "%s - print job" #~ msgstr "%s - Druckauftrag" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" @@ -1070,9 +1063,8 @@ msgstr "Speicherort für eingehende Druckaufträge (PDFs) auswählen" #~ "Druckdialog für eingehende Druckaufträge ist bislang nicht " #~ "implementiert!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Profilsymbol" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/en.po b/po/en.po index b016f35..9b37e95 100644 --- a/po/en.po +++ b/po/en.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-26 09:50+0200\n" -"PO-Revision-Date: 2011-05-26 02:00+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-06-23 15:41+0200\n" +"PO-Revision-Date: 2011-06-23 15:42+0100\n" +"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: en <m.gabriel(a)das-netzwerkteam.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,102 +20,112 @@ msgstr "" "X-Poedit-Country: UNITED STATES\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../pyhoca/wxgui/logon.py:82 +#: ../pyhoca/wxgui/logon.py:83 #, python-format msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:94 +#: ../pyhoca/wxgui/logon.py:87 +#: ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Username" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Password" -#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:92 msgid "Authenticate" msgstr "Authenticate" -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:102 msgid " Start SSH tunnel " msgstr " Start SSH tunnel " -#: ../pyhoca/wxgui/logon.py:105 +#: ../pyhoca/wxgui/logon.py:108 msgid "Session login" msgstr "Session login" -#: ../pyhoca/wxgui/logon.py:106 +#: ../pyhoca/wxgui/logon.py:109 msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:117 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 +#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 +#: ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Cancel" -#: ../pyhoca/wxgui/logon.py:248 ../pyhoca/wxgui/logon.py:281 -#: ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:251 +#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:249 ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:252 +#: ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "User is not allowed to start X2go sessions!" -#: ../pyhoca/wxgui/logon.py:254 ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/logon.py:257 +#: ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - connect" -#: ../pyhoca/wxgui/logon.py:255 +#: ../pyhoca/wxgui/logon.py:258 msgid "Authentication has been successful." msgstr "Authentication has been successful." -#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:280 msgid "SSH tunnel started" msgstr "SSH tunnel started" -#: ../pyhoca/wxgui/logon.py:282 +#: ../pyhoca/wxgui/logon.py:285 msgid "Authentication failed!" msgstr "Authentication failed!" -#: ../pyhoca/wxgui/logon.py:289 +#: ../pyhoca/wxgui/logon.py:291 #, python-format msgid "%s - ssh proxy" msgstr "%s - ssh proxy" -#: ../pyhoca/wxgui/logon.py:290 +#: ../pyhoca/wxgui/logon.py:292 msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" -#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/logon.py:329 ../pyhoca/wxgui/frontend.py:359 -#: ../pyhoca/wxgui/frontend.py:380 ../pyhoca/wxgui/frontend.py:387 -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/logon.py:307 +#: ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 +#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - connect error" -#: ../pyhoca/wxgui/logon.py:317 ../pyhoca/wxgui/frontend.py:366 -#: ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/logon.py:321 +#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:318 ../pyhoca/wxgui/frontend.py:366 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"The remote server's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/logon.py:322 +#: ../pyhoca/wxgui/frontend.py:371 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "The remote server's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/logon.py:324 +#: ../pyhoca/wxgui/logon.py:328 #, python-format msgid "%s - key error" msgstr "%s - key error" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:334 msgid "An unknown error occured during authentication!" msgstr "An unknown error occured during authentication!" @@ -187,7 +197,8 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Custom command" @@ -306,7 +317,8 @@ msgstr "XDMCP server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "User" @@ -431,7 +443,8 @@ msgstr "Use local folder sharing" msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Add" @@ -530,7 +543,8 @@ msgstr "Choose a folder to share within a session" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profile Manager" @@ -551,12 +565,10 @@ msgstr "The SSH proxy configuration is incomplete. Try again." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." #: ../pyhoca/wxgui/profilemanager.py:1413 @@ -590,74 +602,71 @@ msgstr "Delete Profile" msgid "About %s (%s)..." msgstr "About %s (%s) ..." -#: ../pyhoca/wxgui/menus_taskbar.py:101 +#: ../pyhoca/wxgui/menus_taskbar.py:102 msgid "Printing Preferences" msgstr "Printing Preferences" -#: ../pyhoca/wxgui/menus_taskbar.py:107 +#: ../pyhoca/wxgui/menus_taskbar.py:108 msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:115 ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:116 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "E&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:153 msgid "Resume Session" msgstr "Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:155 +#: ../pyhoca/wxgui/menus_taskbar.py:156 msgid "Transfer Session" msgstr "Transfer Session" -#: ../pyhoca/wxgui/menus_taskbar.py:156 +#: ../pyhoca/wxgui/menus_taskbar.py:157 msgid "Suspend Session" msgstr "Suspend Session" -#: ../pyhoca/wxgui/menus_taskbar.py:158 +#: ../pyhoca/wxgui/menus_taskbar.py:159 msgid "Terminate Session" msgstr "Terminate Session" -#: ../pyhoca/wxgui/menus_taskbar.py:196 +#: ../pyhoca/wxgui/menus_taskbar.py:197 msgid "Start &new Session" msgstr "Start &new Session" -#: ../pyhoca/wxgui/menus_taskbar.py:212 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Running" msgstr "Running" -#: ../pyhoca/wxgui/menus_taskbar.py:214 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:227 msgid "&Clean all sessions" msgstr "&Clean all sessions" -#: ../pyhoca/wxgui/menus_taskbar.py:228 +#: ../pyhoca/wxgui/menus_taskbar.py:229 msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:230 +#: ../pyhoca/wxgui/menus_taskbar.py:231 msgid "Share local &folder" msgstr "Share local &folder" -#: ../pyhoca/wxgui/menus_taskbar.py:235 +#: ../pyhoca/wxgui/menus_taskbar.py:236 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:263 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:329 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:331 -msgid "All session profiles are connected" -msgstr "All session profiles are connected" - #: ../pyhoca/wxgui/menus_taskbar.py:363 msgid "Start/Resume Session" msgstr "Start/Resume Session" @@ -666,67 +675,70 @@ msgstr "Start/Resume Session" msgid "Connect Server" msgstr "Connect Server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/frontend.py:348 msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." -#: ../pyhoca/wxgui/frontend.py:373 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"The SSH proxy's host key is invalid or has not been accepted by the user" +#: ../pyhoca/wxgui/frontend.py:378 +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "The SSH proxy's host key is invalid or has not been accepted by the user" -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authentication protocol communication incomplete! Try again..." -#: ../pyhoca/wxgui/frontend.py:401 +#: ../pyhoca/wxgui/frontend.py:406 #, python-format msgid "%s - auth key error" msgstr "%s - auth key error" -#: ../pyhoca/wxgui/frontend.py:510 +#: ../pyhoca/wxgui/frontend.py:413 +msgid "An unknown error occurred during authentication!" +msgstr "An unknown error occurred during authentication!" + +#: ../pyhoca/wxgui/frontend.py:515 msgid "Cleaning X2go sessions..." msgstr "Cleaning X2go sessions..." -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 #, python-format msgid "%s - disconnect" msgstr "%s - disconnect" -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 msgid "X2go Profile is now disconnected." msgstr "X2go Profile is now disconnected." -#: ../pyhoca/wxgui/frontend.py:546 +#: ../pyhoca/wxgui/frontend.py:550 msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:573 +#: ../pyhoca/wxgui/frontend.py:577 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Really Delete Session Profile ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:598 #, 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:646 +#: ../pyhoca/wxgui/frontend.py:650 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -739,94 +751,80 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:654 +#: ../pyhoca/wxgui/frontend.py:658 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." -#: ../pyhoca/wxgui/frontend.py:683 ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:683 +#: ../pyhoca/wxgui/frontend.py:687 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" -"%s)." +"%s." msgstr "" "The command ,,%s'' is not available on X2go server\n" -"%s)." +"%s." -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format msgid "%s - session warning" msgstr "%s - session warning" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied by the X2go server. This is a common issue with SSH, it might " -"help to restart the X2go server's SSH daemon." -msgstr "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied by the X2go server. This is a common issue with SSH, it might " -"help to restart the X2go server's SSH daemon." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." -#: ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:701 +#: ../pyhoca/wxgui/frontend.py:711 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:701 -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:711 +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:704 ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:704 +#: ../pyhoca/wxgui/frontend.py:714 msgid "The X2go PulseAudio system could not be started." msgstr "The X2go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:717 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "The X2go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -835,12 +833,13 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:724 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:724 +#: ../pyhoca/wxgui/frontend.py:734 #, python-format msgid "" "%s\n" @@ -851,7 +850,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "" "%s\n" @@ -862,12 +861,13 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:730 ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:730 +#: ../pyhoca/wxgui/frontend.py:740 #, python-format msgid "" "New X2go session starting up...\n" @@ -876,7 +876,7 @@ msgstr "" "New X2go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "" "Another client started X2go session\n" @@ -885,12 +885,13 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:738 ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:748 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:748 #, python-format msgid "" "Resuming X2go session...\n" @@ -899,7 +900,7 @@ msgstr "" "Resuming X2go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "" "Another client resumed X2go session\n" @@ -908,12 +909,12 @@ msgstr "" "Another client resumed X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "" "Found already running session\n" @@ -922,12 +923,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "" "X2go Session has been suspended\n" @@ -936,12 +937,12 @@ msgstr "" "X2go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "" "X2go Session has terminated\n" @@ -967,7 +968,8 @@ msgstr "Yes" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 +#: ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "Ok" @@ -1049,21 +1051,20 @@ msgstr "Choose PDF viewer application" msgid "Choose PDF saving location" msgstr "Choose PDF saving location" +#~ msgid "All session profiles are connected" +#~ msgstr "All session profiles are connected" #~ msgid "New Profile" #~ msgstr "New Profile" - #~ msgid "%s - print job" #~ msgstr "%s - print job" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Profile icon" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/es.po b/po/es.po index a44971a..d151028 100644 --- a/po/es.po +++ b/po/es.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-26 09:50+0200\n" -"PO-Revision-Date: 2011-05-26 02:02+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-06-23 15:41+0200\n" +"PO-Revision-Date: 2011-06-23 15:48+0100\n" +"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: es <oceanosoftlapalma(a)gmail.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,106 +20,114 @@ msgstr "" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../pyhoca/wxgui/logon.py:82 +#: ../pyhoca/wxgui/logon.py:83 #, python-format msgid "%s (via %s)" msgstr "%s (vía %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:94 +#: ../pyhoca/wxgui/logon.py:87 +#: ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Nombre de usuario" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Contraseña" -#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:92 msgid "Authenticate" msgstr "Autenticar" -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:102 msgid " Start SSH tunnel " msgstr " Iniciar tunel SSH " -#: ../pyhoca/wxgui/logon.py:105 +#: ../pyhoca/wxgui/logon.py:108 msgid "Session login" msgstr "Inicio de sesión" -#: ../pyhoca/wxgui/logon.py:106 +#: ../pyhoca/wxgui/logon.py:109 msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" -#: ../pyhoca/wxgui/logon.py:117 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 +#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 +#: ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Cancelar" -#: ../pyhoca/wxgui/logon.py:248 ../pyhoca/wxgui/logon.py:281 -#: ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:251 +#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:249 ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:252 +#: ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" -#: ../pyhoca/wxgui/logon.py:254 ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/logon.py:257 +#: ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - conectado" -#: ../pyhoca/wxgui/logon.py:255 +#: ../pyhoca/wxgui/logon.py:258 msgid "Authentication has been successful." msgstr "Inicio de sesión correcto." -#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:280 msgid "SSH tunnel started" msgstr "Iniciado tunel SSH" -#: ../pyhoca/wxgui/logon.py:282 +#: ../pyhoca/wxgui/logon.py:285 msgid "Authentication failed!" msgstr "Error en el nombre de usuario o contraseña!" -#: ../pyhoca/wxgui/logon.py:289 +#: ../pyhoca/wxgui/logon.py:291 #, python-format msgid "%s - ssh proxy" msgstr "%s - proxy ssh" -#: ../pyhoca/wxgui/logon.py:290 +#: ../pyhoca/wxgui/logon.py:292 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:303 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/logon.py:329 ../pyhoca/wxgui/frontend.py:359 -#: ../pyhoca/wxgui/frontend.py:380 ../pyhoca/wxgui/frontend.py:387 -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/logon.py:307 +#: ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 +#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/logon.py:317 ../pyhoca/wxgui/frontend.py:366 -#: ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/logon.py:321 +#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - error en la clave del equipo" -#: ../pyhoca/wxgui/logon.py:318 ../pyhoca/wxgui/frontend.py:366 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"La clave del servidor remoto no es válida o no ha sido aceptada por el " -"usuario" +#: ../pyhoca/wxgui/logon.py:322 +#: ../pyhoca/wxgui/frontend.py:371 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "La clave del servidor remoto no es válida o no ha sido aceptada por el usuario" -#: ../pyhoca/wxgui/logon.py:324 +#: ../pyhoca/wxgui/logon.py:328 #, python-format msgid "%s - key error" msgstr "%s - error en la clave" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:334 msgid "An unknown error occured during authentication!" -msgstr "" -"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" +msgstr "¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!" #: ../pyhoca/wxgui/taskbar.py:79 #, python-format @@ -170,11 +178,11 @@ msgstr "Lightweight X Desktop (LXDE)" #: ../pyhoca/wxgui/profilemanager.py:65 #, fuzzy msgid "Trinity X Desktop (KDE3-like)" -msgstr "Lightweight X Desktop (LXDE)" +msgstr "Trinity X Desktop (KDE3-like)" #: ../pyhoca/wxgui/profilemanager.py:66 msgid "Unity X Desktop Shell (UNITY)" -msgstr "" +msgstr "Unity X Desktop Shell (UNITY)" #: ../pyhoca/wxgui/profilemanager.py:67 msgid "XDMCP Query" @@ -190,7 +198,8 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Aplicación" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Comando personalizado" @@ -309,7 +318,8 @@ msgstr "Servidor XDMCP" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "Usuario" @@ -434,7 +444,8 @@ msgstr "Compartir carpetas locales" msgid "Path" msgstr "Ruta" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Añadir" @@ -534,7 +545,8 @@ msgstr "Elige la carpeta que quieres compartir en la conexión" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Gestor de Perfiles" @@ -551,15 +563,12 @@ msgstr "" #: ../pyhoca/wxgui/profilemanager.py:1383 #, fuzzy msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "" -"¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " -"otra vez..." +msgstr "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo otra vez..." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" @@ -594,75 +603,71 @@ msgstr "Borrar Perfil" msgid "About %s (%s)..." msgstr "Acerca de %s (%s) ..." -#: ../pyhoca/wxgui/menus_taskbar.py:101 +#: ../pyhoca/wxgui/menus_taskbar.py:102 msgid "Printing Preferences" msgstr "Preferencias de impresión" -#: ../pyhoca/wxgui/menus_taskbar.py:107 +#: ../pyhoca/wxgui/menus_taskbar.py:108 msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:115 ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:116 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "S&alir" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:153 msgid "Resume Session" msgstr "Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:155 +#: ../pyhoca/wxgui/menus_taskbar.py:156 msgid "Transfer Session" msgstr "Transferir Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:156 +#: ../pyhoca/wxgui/menus_taskbar.py:157 msgid "Suspend Session" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:158 +#: ../pyhoca/wxgui/menus_taskbar.py:159 msgid "Terminate Session" msgstr "Finalizar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:196 +#: ../pyhoca/wxgui/menus_taskbar.py:197 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:212 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Running" msgstr "Activa" -#: ../pyhoca/wxgui/menus_taskbar.py:214 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Suspended" msgstr "Suspendida" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:227 msgid "&Clean all sessions" msgstr "&Limpiar el registro de sesiones" -#: ../pyhoca/wxgui/menus_taskbar.py:228 +#: ../pyhoca/wxgui/menus_taskbar.py:229 msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:230 +#: ../pyhoca/wxgui/menus_taskbar.py:231 msgid "Share local &folder" msgstr "Compartir &Carpeta local" -#: ../pyhoca/wxgui/menus_taskbar.py:235 +#: ../pyhoca/wxgui/menus_taskbar.py:236 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:263 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:329 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:331 -#, fuzzy -msgid "All session profiles are connected" -msgstr "No se han definido perfiles de sesión" - #: ../pyhoca/wxgui/menus_taskbar.py:363 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" @@ -671,69 +676,71 @@ msgstr "Iniciar/Retomar Sesión" msgid "Connect Server" msgstr "Conectar con el Servidor" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Acerca de %s ..." -#: ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/frontend.py:348 msgid "Public SSH key authentication has been successful." msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH." -#: ../pyhoca/wxgui/frontend.py:373 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" +#: ../pyhoca/wxgui/frontend.py:378 +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "La clave SSH del proxy no es válida o no ha sido aceptada por el usuario" -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." -msgstr "" -"¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo " -"otra vez..." +msgstr "¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo otra vez..." -#: ../pyhoca/wxgui/frontend.py:401 +#: ../pyhoca/wxgui/frontend.py:406 #, python-format msgid "%s - auth key error" msgstr "%s - error en la clave de identificación" -#: ../pyhoca/wxgui/frontend.py:510 +#: ../pyhoca/wxgui/frontend.py:413 +#, 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:515 msgid "Cleaning X2go sessions..." msgstr "Limpiando sesiones X2go..." -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 #, python-format msgid "%s - disconnect" msgstr "%s - desconectado" -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 msgid "X2go Profile is now disconnected." msgstr "Se ha desconectado el Perfil X2go." -#: ../pyhoca/wxgui/frontend.py:546 +#: ../pyhoca/wxgui/frontend.py:550 msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:573 +#: ../pyhoca/wxgui/frontend.py:577 #, fuzzy, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:598 #, 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:646 +#: ../pyhoca/wxgui/frontend.py:650 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -746,95 +753,80 @@ msgstr "" "\n" "¿Continuar con la conexión?" -#: ../pyhoca/wxgui/frontend.py:654 +#: ../pyhoca/wxgui/frontend.py:658 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Se confirma la autorización del equipo" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta " -"iniciar sesión nuevamente..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:683 ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - fallo en la sesión" -#: ../pyhoca/wxgui/frontend.py:683 +#: ../pyhoca/wxgui/frontend.py:687 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" -"%s)." +"%s." msgstr "" "El comando ,,%s'' no está presente en el servidor X2go\n" -"%s)." +"%s." -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format msgid "%s - session warning" msgstr "%s - advertencia durante la sesión" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied by the X2go server. This is a common issue with SSH, it might " -"help to restart the X2go server's SSH daemon." -msgstr "" -"Se ha denegado la redirección del túnel TCP inverso para la sesión %s al " -"puerto %s del servidor X2go. Es algo típico en los túneles SSH. Este error " -"podría solucionarse reiniciando el demonio SSH en el servidor X2go." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +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:695 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -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." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +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:701 +#: ../pyhoca/wxgui/frontend.py:711 #, python-format msgid "%s - audio warning" msgstr "%s - advertencia en el sistema de audio" -#: ../pyhoca/wxgui/frontend.py:701 -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:711 +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:704 ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - error en el audio" -#: ../pyhoca/wxgui/frontend.py:704 +#: ../pyhoca/wxgui/frontend.py:714 msgid "The X2go PulseAudio system could not be started." msgstr "El sistema X2go PulseAudio no puede iniciarse" -#: ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:717 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "El sistema X2go PulseAudio ha finalizado inesperadamente" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - audio problem" msgstr "%s - problema en el audio" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -843,12 +835,13 @@ msgstr "" "La conexión de audio puede que no esté configurada para esta sesión.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:724 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:724 +#: ../pyhoca/wxgui/frontend.py:734 #, python-format msgid "" "%s\n" @@ -859,7 +852,7 @@ msgstr "" "...provocado en la impresora %s por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "" "%s\n" @@ -870,12 +863,13 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:730 ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:730 +#: ../pyhoca/wxgui/frontend.py:740 #, python-format msgid "" "New X2go session starting up...\n" @@ -884,7 +878,7 @@ msgstr "" "Iniciando nueva sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "" "Another client started X2go session\n" @@ -893,12 +887,13 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:738 ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:748 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:748 #, python-format msgid "" "Resuming X2go session...\n" @@ -907,7 +902,7 @@ msgstr "" "Retornando sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "" "Another client resumed X2go session\n" @@ -916,12 +911,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "" "Found already running session\n" @@ -930,12 +925,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "" "X2go Session has been suspended\n" @@ -944,12 +939,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "" "X2go Session has terminated\n" @@ -973,7 +968,8 @@ msgstr "Sí" msgid "No" msgstr "No" -#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 +#: ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "Ok" @@ -1056,21 +1052,22 @@ msgid "Choose PDF saving location" msgstr "Elegir localización para los PDFs" #, fuzzy +#~ msgid "All session profiles are connected" +#~ msgstr "No se han definido perfiles de sesión" + +#, fuzzy #~ msgid "New Profile" #~ msgstr "Perfil " - #~ msgid "%s - print job" #~ msgstr "%s - imprimir" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "¡¡¡El cuadro de diálogo de imprimir no ha sido desarrollado todavía!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Icono del perfil" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/nl.po b/po/nl.po index 8e58e51..1c81611 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-26 09:50+0200\n" -"PO-Revision-Date: 2011-05-26 02:01+0100\n" -"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" +"POT-Creation-Date: 2011-06-23 15:41+0200\n" +"PO-Revision-Date: 2011-06-23 15:45+0100\n" +"Last-Translator: Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep(a)lindix.nl>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,103 +20,112 @@ msgstr "" "X-Poedit-Country: NETHERLANDS\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../pyhoca/wxgui/logon.py:82 +#: ../pyhoca/wxgui/logon.py:83 #, python-format msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:94 +#: ../pyhoca/wxgui/logon.py:87 +#: ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "Gebruiker" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "Wachtwoord" -#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:92 msgid "Authenticate" msgstr "Aanmelden" -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:102 msgid " Start SSH tunnel " msgstr " Start SSH Tunnel " -#: ../pyhoca/wxgui/logon.py:105 +#: ../pyhoca/wxgui/logon.py:108 msgid "Session login" msgstr "Sessie login" -#: ../pyhoca/wxgui/logon.py:106 +#: ../pyhoca/wxgui/logon.py:109 msgid "SSH proxy server login" msgstr "Login via SSH Proxy" -#: ../pyhoca/wxgui/logon.py:117 ../pyhoca/wxgui/profilemanager.py:262 -#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 +#: ../pyhoca/wxgui/logon.py:120 +#: ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/messages.py:105 +#: ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "Afbreken" -#: ../pyhoca/wxgui/logon.py:248 ../pyhoca/wxgui/logon.py:281 -#: ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:251 +#: ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:249 ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:252 +#: ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "Gebruiker mag geen X2go sessie starten!" -#: ../pyhoca/wxgui/logon.py:254 ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/logon.py:257 +#: ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "%s - verbinden" -#: ../pyhoca/wxgui/logon.py:255 +#: ../pyhoca/wxgui/logon.py:258 msgid "Authentication has been successful." msgstr "Authenticatie is gelukt." -#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:280 msgid "SSH tunnel started" msgstr "SSH Tunnel gestart" -#: ../pyhoca/wxgui/logon.py:282 +#: ../pyhoca/wxgui/logon.py:285 msgid "Authentication failed!" msgstr "Authenticatie mislukt!" -#: ../pyhoca/wxgui/logon.py:289 +#: ../pyhoca/wxgui/logon.py:291 #, python-format msgid "%s - ssh proxy" msgstr "%s - SSH Proxy" -#: ../pyhoca/wxgui/logon.py:290 +#: ../pyhoca/wxgui/logon.py:292 msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" -#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/logon.py:329 ../pyhoca/wxgui/frontend.py:359 -#: ../pyhoca/wxgui/frontend.py:380 ../pyhoca/wxgui/frontend.py:387 -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/logon.py:307 +#: ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 +#: ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 +#: ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/logon.py:317 ../pyhoca/wxgui/frontend.py:366 -#: ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/logon.py:321 +#: ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "%s - server sleutel fout" -#: ../pyhoca/wxgui/logon.py:318 ../pyhoca/wxgui/frontend.py:366 -msgid "" -"The remote server's host key is invalid or has not been accepted by the user" -msgstr "" -"De sleutel van de server is ongeldig of is niet geaccepteerd door de " -"gebruiker" +#: ../pyhoca/wxgui/logon.py:322 +#: ../pyhoca/wxgui/frontend.py:371 +msgid "The remote server's host key is invalid or has not been accepted by the user" +msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker" -#: ../pyhoca/wxgui/logon.py:324 +#: ../pyhoca/wxgui/logon.py:328 #, python-format msgid "%s - key error" msgstr "%s - sleutel fout" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:334 msgid "An unknown error occured during authentication!" msgstr "Een onbekende fout is bij de authenticatie opgetreden" @@ -186,7 +195,8 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Enkelvoudige Applicatie" -#: ../pyhoca/wxgui/profilemanager.py:72 ../pyhoca/wxgui/profilemanager.py:156 +#: ../pyhoca/wxgui/profilemanager.py:72 +#: ../pyhoca/wxgui/profilemanager.py:156 msgid "Custom command" msgstr "Speciaal Commando" @@ -305,7 +315,8 @@ msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:169 ../pyhoca/wxgui/profilemanager.py:179 +#: ../pyhoca/wxgui/profilemanager.py:169 +#: ../pyhoca/wxgui/profilemanager.py:179 msgid "User" msgstr "Gebruiker" @@ -430,7 +441,8 @@ msgstr "Delen van lokale mappen" msgid "Path" msgstr "Pad" -#: ../pyhoca/wxgui/profilemanager.py:239 ../pyhoca/wxgui/profilemanager.py:256 +#: ../pyhoca/wxgui/profilemanager.py:239 +#: ../pyhoca/wxgui/profilemanager.py:256 msgid "Add" msgstr "Toevoegen" @@ -529,7 +541,8 @@ msgstr "Kies een map om te delen" #: ../pyhoca/wxgui/profilemanager.py:1374 #: ../pyhoca/wxgui/profilemanager.py:1377 #: ../pyhoca/wxgui/profilemanager.py:1383 -#: ../pyhoca/wxgui/profilemanager.py:1393 ../pyhoca/wxgui/menus_taskbar.py:87 +#: ../pyhoca/wxgui/profilemanager.py:1393 +#: ../pyhoca/wxgui/menus_taskbar.py:87 msgid "Profile Manager" msgstr "Profiel manager" @@ -544,15 +557,13 @@ msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" #: ../pyhoca/wxgui/profilemanager.py:1383 -#, fuzzy msgid "The SSH proxy configuration is incomplete. Try again." -msgstr "Authenticatie was niet volledig! Opnieuw proberen..." +msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." #: ../pyhoca/wxgui/profilemanager.py:1393 #, python-format msgid "" -"Another session profile (%s) already uses [%s]:%s for binding a local SSH " -"proxy to.\n" +"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n" "Please change the SSH proxy settings accordingly." msgstr "" @@ -587,74 +598,71 @@ msgstr "Profiel verwijderen" msgid "About %s (%s)..." msgstr "About %s (%s) ..." -#: ../pyhoca/wxgui/menus_taskbar.py:101 +#: ../pyhoca/wxgui/menus_taskbar.py:102 msgid "Printing Preferences" msgstr "Voorkeur voor afdrukken" -#: ../pyhoca/wxgui/menus_taskbar.py:107 +#: ../pyhoca/wxgui/menus_taskbar.py:108 msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:115 ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:116 +#: ../pyhoca/wxgui/menus_taskbar.py:390 msgid "E&xit" msgstr "&Beeindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:153 msgid "Resume Session" msgstr "Sessie hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:155 +#: ../pyhoca/wxgui/menus_taskbar.py:156 msgid "Transfer Session" msgstr "Sessie overnemen" -#: ../pyhoca/wxgui/menus_taskbar.py:156 +#: ../pyhoca/wxgui/menus_taskbar.py:157 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:158 +#: ../pyhoca/wxgui/menus_taskbar.py:159 msgid "Terminate Session" msgstr "Sessie beeindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:196 +#: ../pyhoca/wxgui/menus_taskbar.py:197 msgid "Start &new Session" msgstr "&Nieuwe Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:212 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Running" msgstr "Aktief" -#: ../pyhoca/wxgui/menus_taskbar.py:214 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:227 msgid "&Clean all sessions" msgstr "Alle Sessies beeindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:228 +#: ../pyhoca/wxgui/menus_taskbar.py:229 msgid "Customize &profile" msgstr "Sessieprofiel wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:230 +#: ../pyhoca/wxgui/menus_taskbar.py:231 msgid "Share local &folder" msgstr "Delen lokale &map" -#: ../pyhoca/wxgui/menus_taskbar.py:235 +#: ../pyhoca/wxgui/menus_taskbar.py:236 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:262 +#: ../pyhoca/wxgui/menus_taskbar.py:263 msgid "Add Profile" msgstr "Profiel toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:329 +#: ../pyhoca/wxgui/menus_taskbar.py:332 msgid "No session profiles defined" msgstr "Geen Profiel gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:331 -msgid "All session profiles are connected" -msgstr "Alle profielen zijn verbonden" - #: ../pyhoca/wxgui/menus_taskbar.py:363 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" @@ -663,68 +671,70 @@ msgstr "Sessie starten/hervatten" msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/about.py:55 ../pyhoca/wxgui/about.py:57 +#: ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." -#: ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/frontend.py:348 msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." -#: ../pyhoca/wxgui/frontend.py:373 -msgid "" -"The SSH proxy's host key is invalid or has not been accepted by the user" -msgstr "" -"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de " -"gebruiker" +#: ../pyhoca/wxgui/frontend.py:378 +msgid "The SSH proxy's host key is invalid or has not been accepted by the user" +msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker" -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authenticatie was niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/frontend.py:401 +#: ../pyhoca/wxgui/frontend.py:406 #, python-format msgid "%s - auth key error" msgstr "%s - Verbindingsfout met auth. key" -#: ../pyhoca/wxgui/frontend.py:510 +#: ../pyhoca/wxgui/frontend.py:413 +msgid "An unknown error occurred during authentication!" +msgstr "Een onbekende fout is bij de authenticatie opgetreden" + +#: ../pyhoca/wxgui/frontend.py:515 msgid "Cleaning X2go sessions..." msgstr "Opschonen X2go sessies..." -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 #, python-format msgid "%s - disconnect" msgstr "%s - verbinding verbreken" -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 msgid "X2go Profile is now disconnected." msgstr "X2go Profiel is nu niet meer verbonden." -#: ../pyhoca/wxgui/frontend.py:546 +#: ../pyhoca/wxgui/frontend.py:550 msgid "New Session Profile" msgstr "Nieuw Profiel" -#: ../pyhoca/wxgui/frontend.py:573 +#: ../pyhoca/wxgui/frontend.py:577 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "Verwijder sessie profiel ,,%s''?" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 #, python-format msgid "%s - profile deleted" msgstr "%s - Profiel is verwijderd!" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 msgid "The session profile has been deleted." msgstr "Het sessie profiel is verwijderd." -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:598 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profiel" -#: ../pyhoca/wxgui/frontend.py:646 +#: ../pyhoca/wxgui/frontend.py:650 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -737,94 +747,80 @@ msgstr "" "\n" "Weet u zeker dat u de verbinding wilt maken?" -#: ../pyhoca/wxgui/frontend.py:654 +#: ../pyhoca/wxgui/frontend.py:658 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Bevestig dat de Host geautoriseerd is" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout (channel error)" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format -msgid "" -"Lost connection to server %s unexpectedly! Try to re-authenticate to the " -"server..." -msgstr "" -"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " -"opnieuw aan te melden..." +msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..." +msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:683 ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:687 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "%s - sessie fout" -#: ../pyhoca/wxgui/frontend.py:683 +#: ../pyhoca/wxgui/frontend.py:687 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" -"%s)." +"%s." msgstr "" "Het commando ,,%s'' is niet beschikbaar op de X2go server\n" "%s" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format msgid "%s - session warning" msgstr "%s - sessie waarschuwing" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format -msgid "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied by the X2go server. This is a common issue with SSH, it might " -"help to restart the X2go server's SSH daemon." -msgstr "" -"Reverse TCP port forwarding request for session %s to server port %s has " -"been denied by the X2go server. This is a common issue with SSH, it might " -"help to restart the X2go server's SSH daemon." +msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied." +msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied." -#: ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:699 #, python-format -msgid "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." -msgstr "" -"Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." +msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed." -#: ../pyhoca/wxgui/frontend.py:701 +#: ../pyhoca/wxgui/frontend.py:711 #, python-format msgid "%s - audio warning" msgstr "%s - audio waarschuwing" -#: ../pyhoca/wxgui/frontend.py:701 -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:711 +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:704 ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:714 +#: ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "%s - audio fout" -#: ../pyhoca/wxgui/frontend.py:704 +#: ../pyhoca/wxgui/frontend.py:714 msgid "The X2go PulseAudio system could not be started." msgstr "Het X2go PulseAudio systeem kon niet gestart worden" -#: ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:717 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Het X2go PulseAudio systeem is gecrashed" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - audio problem" msgstr "%s - audio probleem" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -833,12 +829,13 @@ msgstr "" "De audio verbinding kon niet worden gemaakt voor deze sessie.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:724 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:724 +#: ../pyhoca/wxgui/frontend.py:734 #, python-format msgid "" "%s\n" @@ -849,7 +846,7 @@ msgstr "" "...veroorzaakt door printer %s in sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "" "%s\n" @@ -860,12 +857,13 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:730 ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:730 +#: ../pyhoca/wxgui/frontend.py:740 #, python-format msgid "" "New X2go session starting up...\n" @@ -874,7 +872,7 @@ msgstr "" "Nieuwe X2go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "" "Another client started X2go session\n" @@ -883,12 +881,13 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:738 ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:748 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:748 #, python-format msgid "" "Resuming X2go session...\n" @@ -897,7 +896,7 @@ msgstr "" "X2go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "" "Another client resumed X2go session\n" @@ -906,12 +905,12 @@ msgstr "" "Een andere X2go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "" "Found already running session\n" @@ -920,12 +919,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "" "X2go Session has been suspended\n" @@ -934,12 +933,12 @@ msgstr "" "X2go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "%s - terminate" msgstr "%s - beÃ«indigen" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "" "X2go Session has terminated\n" @@ -965,7 +964,8 @@ msgstr "Ja" msgid "No" msgstr "Nee" -#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126 +#: ../pyhoca/wxgui/messages.py:99 +#: ../pyhoca/wxgui/printingprefs.py:126 msgid "Ok" msgstr "Ok" @@ -1047,21 +1047,20 @@ msgstr "Kies PDF viewer toepassing" msgid "Choose PDF saving location" msgstr "Kies locatie om PDF op te slaan" +#~ msgid "All session profiles are connected" +#~ msgstr "Alle profielen zijn verbonden" #~ msgid "New Profile" #~ msgstr "Profiel" - #~ msgid "%s - print job" #~ msgstr "%s - print job" - #~ msgid "" #~ "Opening print job dialog not implemented yet!!!\n" #~ "%s" #~ msgstr "" #~ "De Print job dialog is nog niet geimplementeerd!!!\n" #~ "%s" - #~ msgid "Profile icon" #~ msgstr "Profile icon" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 434e8a8..44fbe91 100644 --- a/po/pyhoca-gui.pot +++ b/po/pyhoca-gui.pot @@ -8,110 +8,109 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-31 15:00+0200\n" +"POT-Creation-Date: 2011-06-23 15:49+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" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../pyhoca/wxgui/logon.py:82 +#: ../pyhoca/wxgui/logon.py:83 #, python-format msgid "%s (via %s)" msgstr "" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:94 +#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97 msgid "Username" msgstr "" -#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:96 +#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99 msgid "Password" msgstr "" -#: ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:92 msgid "Authenticate" msgstr "" -#: ../pyhoca/wxgui/logon.py:99 +#: ../pyhoca/wxgui/logon.py:102 msgid " Start SSH tunnel " msgstr "" -#: ../pyhoca/wxgui/logon.py:105 +#: ../pyhoca/wxgui/logon.py:108 msgid "Session login" msgstr "" -#: ../pyhoca/wxgui/logon.py:106 +#: ../pyhoca/wxgui/logon.py:109 msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:117 ../pyhoca/wxgui/profilemanager.py:262 +#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262 #: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131 msgid "Cancel" msgstr "" -#: ../pyhoca/wxgui/logon.py:248 ../pyhoca/wxgui/logon.py:281 -#: ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284 +#: ../pyhoca/wxgui/frontend.py:341 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:249 ../pyhoca/wxgui/frontend.py:336 +#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341 msgid "User is not allowed to start X2go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:254 ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348 #, python-format msgid "%s - connect" msgstr "" -#: ../pyhoca/wxgui/logon.py:255 +#: ../pyhoca/wxgui/logon.py:258 msgid "Authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/logon.py:277 +#: ../pyhoca/wxgui/logon.py:280 msgid "SSH tunnel started" msgstr "" -#: ../pyhoca/wxgui/logon.py:282 +#: ../pyhoca/wxgui/logon.py:285 msgid "Authentication failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:289 +#: ../pyhoca/wxgui/logon.py:291 #, python-format msgid "%s - ssh proxy" msgstr "" -#: ../pyhoca/wxgui/logon.py:290 +#: ../pyhoca/wxgui/logon.py:292 msgid "Authentication to the SSH proxy server failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/logon.py:310 -#: ../pyhoca/wxgui/logon.py:329 ../pyhoca/wxgui/frontend.py:359 -#: ../pyhoca/wxgui/frontend.py:380 ../pyhoca/wxgui/frontend.py:387 -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314 +#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364 +#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392 +#: ../pyhoca/wxgui/frontend.py:399 #, python-format msgid "%s - connect error" msgstr "" -#: ../pyhoca/wxgui/logon.py:317 ../pyhoca/wxgui/frontend.py:366 -#: ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371 +#: ../pyhoca/wxgui/frontend.py:378 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:318 ../pyhoca/wxgui/frontend.py:366 +#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:324 +#: ../pyhoca/wxgui/logon.py:328 #, python-format msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:330 +#: ../pyhoca/wxgui/logon.py:334 msgid "An unknown error occured during authentication!" msgstr "" @@ -652,61 +651,65 @@ msgstr "" msgid "About %s ..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:343 +#: ../pyhoca/wxgui/frontend.py:348 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:373 +#: ../pyhoca/wxgui/frontend.py:378 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:394 +#: ../pyhoca/wxgui/frontend.py:399 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:401 +#: ../pyhoca/wxgui/frontend.py:406 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:510 +#: ../pyhoca/wxgui/frontend.py:413 +msgid "An unknown error occurred during authentication!" +msgstr "" + +#: ../pyhoca/wxgui/frontend.py:515 msgid "Cleaning X2go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:530 +#: ../pyhoca/wxgui/frontend.py:534 msgid "X2go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:546 +#: ../pyhoca/wxgui/frontend.py:550 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:573 +#: ../pyhoca/wxgui/frontend.py:577 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:579 +#: ../pyhoca/wxgui/frontend.py:583 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:598 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:646 +#: ../pyhoca/wxgui/frontend.py:650 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -715,96 +718,95 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:654 +#: ../pyhoca/wxgui/frontend.py:658 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:673 +#: ../pyhoca/wxgui/frontend.py:677 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:683 ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:683 +#: ../pyhoca/wxgui/frontend.py:687 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" -"%s)." +"%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:689 +#: ../pyhoca/wxgui/frontend.py:693 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " -"been denied by the X2go server. This is a common issue with SSH, it might " -"help to restart the X2go server's SSH daemon." +"been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:695 +#: ../pyhoca/wxgui/frontend.py:699 #, 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:701 +#: ../pyhoca/wxgui/frontend.py:711 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:701 +#: ../pyhoca/wxgui/frontend.py:711 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:704 ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:714 ../pyhoca/wxgui/frontend.py:717 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:704 +#: ../pyhoca/wxgui/frontend.py:714 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:707 +#: ../pyhoca/wxgui/frontend.py:717 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:710 +#: ../pyhoca/wxgui/frontend.py:720 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:724 ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:724 +#: ../pyhoca/wxgui/frontend.py:734 #, python-format msgid "" "%s\n" @@ -812,7 +814,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:726 +#: ../pyhoca/wxgui/frontend.py:736 #, python-format msgid "" "%s\n" @@ -820,74 +822,74 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:730 ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:730 +#: ../pyhoca/wxgui/frontend.py:740 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:734 +#: ../pyhoca/wxgui/frontend.py:744 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:738 ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:738 +#: ../pyhoca/wxgui/frontend.py:748 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:746 +#: ../pyhoca/wxgui/frontend.py:756 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:750 +#: ../pyhoca/wxgui/frontend.py:760 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:766 +#: ../pyhoca/wxgui/frontend.py:776 #, 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.3-3-ga1bc905
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via a1bc905bf45414d4142f795e03bd484c12f3fc6a (commit) from d46fb1ee31088c597f1e7e0169dfe11455f6252a (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 a1bc905bf45414d4142f795e03bd484c12f3fc6a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 15:49:45 2011 +0200 Shortened error output for RevFwTunnel failures. ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 01a83b3..ce8244a 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -690,7 +690,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.ExitMainLoop() def HOOK_rforward_request_denied(self, profile_name='UNKNOWN', session_name='UNKNOWN', server_port=0): - self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Reverse TCP port forwarding request for session %s to server port %s has been denied by the X2go server. This is a common issue with SSH, it might help to restart the X2go server\'s SSH daemon.') % (session_name, server_port), icon='session_warning', timeout=10000) + self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Reverse TCP port forwarding request for session %s to server port %s has been denied.') % (session_name, server_port), icon='session_warning', timeout=10000) if self.exit_on_disconnect: self.WakeUpIdle() self.ExitMainLoop() 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-45-gc935798
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via c9357984185ea987a4378fba4c3b5236e440cb4c (commit) via bb675f711f1c336be6959f0a97608c5acfd92f85 (commit) from ff2be3893729257f9e03ef61a743ef3b8dd9cc2c (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 c9357984185ea987a4378fba4c3b5236e440cb4c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 15:29:10 2011 +0200 Force 16bit colour depth for RDP-proxy sessions. commit bb675f711f1c336be6959f0a97608c5acfd92f85 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 15:23:11 2011 +0200 typo fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/terminal/_stdout.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7c04f4b..bad9996 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ python-x2go (0.1.1.0-0~x2go1) UNRELEASED; urgency=low duplicate sessions in the session registry. - Do not start X2go service tunnels (audio, sshfs) if session startup failed. - Fix NX proxy startup post-check. + - Force 16bit colour depth for RDP-proxy sessions. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 23 Jun 2011 08:34:14 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 5b53e5a..27d3eca 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -72,9 +72,9 @@ def _rewrite_cmd(cmd, params=None): if (cmd == 'RDP') and (type(params) == X2goSessionParams): if params.geometry == 'fullscreen': - cmd = 'rdesktop -f -N %s %s' % (params.rdp_options, params.rdp_server) + cmd = 'rdesktop -f -N %s %s -a %s' % (params.rdp_options, params.rdp_server, params.depth) else: - cmd = 'rdesktop -g %s -N %s %s' % (params.geometry, params.rdp_options, params.rdp_server) + cmd = 'rdesktop -g %s -N %s %s -a %s' % (params.geometry, params.rdp_options, params.rdp_server, params.depth) # place quot marks around cmd if not empty string if cmd: @@ -277,7 +277,6 @@ class X2goTerminalSessionSTDOUT(object): self.params = X2goSessionParams() self.params.geometry = str(geometry) - self.params.depth = str(depth) self.params.link = str(link) self.params.pack = str(pack) self.params.cache_type = str(cache_type) @@ -287,6 +286,10 @@ class X2goTerminalSessionSTDOUT(object): self.params.kbtype = str(kbtype) self.params.snd_system = str(snd_system) self.params.cmd = str(cmd) + if self.params.cmd == 'RDP': + self.params.depth = '16' + else: + self.params.depth = str(depth) self.params.rdp_server = str(rdp_server) self.params.rdp_options = str(rdp_options) @@ -938,7 +941,7 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - if self.proxy.ok() + if self.proxy.ok(): self.release_proxy() self.control_session.terminate(session_name=self.session_info.name) hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-43-gff2be38
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via ff2be3893729257f9e03ef61a743ef3b8dd9cc2c (commit) from 51fcf9104c866bb962277925a6c451a5854d71a1 (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 ff2be3893729257f9e03ef61a743ef3b8dd9cc2c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 15:07:29 2011 +0200 tidy up usage of <terminal_session>.release_proxy() method ----------------------------------------------------------------------- Summary of changes: x2go/backends/terminal/_stdout.py | 8 +++++--- x2go/session.py | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 83bf13e..5b53e5a 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -328,7 +328,7 @@ class X2goTerminalSessionSTDOUT(object): def _x2go_tidy_up(self): - if self.proxy is not None: + if self.proxy.ok(): self.release_proxy() try: @@ -921,7 +921,8 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - self.release_proxy() + if self.proxy.ok(): + self.release_proxy() self.control_session.suspend(session_name=self.session_info.name) # TODO: check if session has really suspended @@ -937,7 +938,8 @@ class X2goTerminalSessionSTDOUT(object): @rtype: bool """ - self.release_proxy() + if self.proxy.ok() + self.release_proxy() self.control_session.terminate(session_name=self.session_info.name) # TODO: check if session has really suspended diff --git a/x2go/session.py b/x2go/session.py index 3a821bd..02d78f4 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1314,7 +1314,5 @@ class X2goSession(object): """ if self.has_terminal_session(): - self.terminal_session.release_proxy() - if self.has_terminal_session(): self.terminal_session.__del__() self.terminal_session = None hooks/post-receive -- python-x2go.git (Python X2go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.3-2-gd46fb1e
by git-admin＠x2go.org 23 Jun '11

23 Jun '11

The branch, master has been updated via d46fb1ee31088c597f1e7e0169dfe11455f6252a (commit) from 22754ec680075cc4584bd52e681f079cba7fa923 (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 d46fb1ee31088c597f1e7e0169dfe11455f6252a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 23 14:52:13 2011 +0200 removed bracket ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index c2eb8f5..01a83b3 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -684,7 +684,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.ExitMainLoop() def HOOK_no_such_command(self, cmd, profile_name='UNKNOWN', session_name='UNKNOWN'): - self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2go server\n%s).') % (cmd, session_name), icon='session_error', timeout=10000) + self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2go server\n%s.') % (cmd, session_name), icon='session_error', timeout=10000) if self.exit_on_disconnect: self.WakeUpIdle() self.ExitMainLoop() 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)).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits