[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.29.0-36-g3a9e2e4

The branch, twofactorauth has been updated discards 1a2219217c79ff370443076506f0708c2d2d44dc (commit) discards c7f21295a90c5ad7d53a00359ef35186403d2fb2 (commit) discards d444350f168b5ad8dd5d49338d1cb14873738478 (commit) discards c37d4d706ac6daf41d05d17962c5ab06ced02655 (commit) via 3a9e2e4a7205d7a1a58839955bc410851177b156 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (1a2219217c79ff370443076506f0708c2d2d44dc) \ N -- N -- N (3a9e2e4a7205d7a1a58839955bc410851177b156) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 15020 -> 14210 bytes build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 14046 -> 13318 bytes build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 11137 -> 11137 bytes build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 10546 -> 10546 bytes man/pyhoca-gui.1 | 5 +- po/POTFILES.in | 2 - po/de.po | 294 +++++++++++++-------------------- po/en.po | 285 +++++++++++++------------------- po/es.po | 200 ++++++++-------------- po/nl.po | 200 ++++++++-------------- po/pyhoca-gui.pot | 196 ++++++++-------------- pyhoca-gui | 1 - pyhoca/wxgui/frontend.py | 12 -- pyhoca/wxgui/menus_taskbar.py | 6 - pyhoca/wxgui/messages.py | 5 +- pyhoca/wxgui/printingprefs.py | 266 ----------------------------- 16 files changed, 454 insertions(+), 1018 deletions(-) delete mode 100644 pyhoca/wxgui/printingprefs.py 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 5f08da6..5f1a538 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 3e04462..324d44b 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 0091fb8..eb48c3d 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 662b0da..955b5a4 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/man/pyhoca-gui.1 b/man/pyhoca-gui.1 index 6dd3a6e..b60bf95 100644 --- a/man/pyhoca-gui.1 +++ b/man/pyhoca-gui.1 @@ -85,11 +85,8 @@ After authentication directly auto-resume all available running/suspended sessio \*(T<\fB\-\-disable-options\fR\*(T> Grey-out the ,,Options'' menu item and thus disable the client configuration window. .TP -\*(T<\fB\-\-disable-printingprefs\fR\*(T> -Grey-out the ,,Printing Preferences'' menu item and thus disable the client's printing preferences window. -.TP \*(T<\fB\-\-disable-profilemanager\fR\*(T> -Grey-out the profile manager menu items and thus disable all profile management functionalities. +Grey-out the profile manager menu items and thus disable all profile management functionalities.B .TP \*(T<\fB\-\-display <hostname>:<screennumber>\fR\*(T> Set the DISPLAY environment variable to <hostname>:<screennumber>. diff --git a/po/POTFILES.in b/po/POTFILES.in index ad45729..1bf078d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,6 +8,4 @@ pyhoca/wxgui/menus_taskbar.py pyhoca/wxgui/about.py pyhoca/wxgui/basepath.py pyhoca/wxgui/frontend.py -pyhoca/wxgui/messages.py -pyhoca/wxgui/printingprefs.py pyhoca-gui diff --git a/po/de.po b/po/de.po index 8e59df7..8808965 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-27 18:47+0100\n" -"PO-Revision-Date: 2011-02-27 18:47+0100\n" +"POT-Creation-Date: 2011-02-27 01:24+0100\n" +"PO-Revision-Date: 2011-02-27 01:29+0100\n" "Last-Translator: Mike Gabriel <m.gabriel@das-netzwerkteam.de>\n" "Language-Team: de <m.gabriel@das-netzwerkteam.de>\n" "MIME-Version: 1.0\n" @@ -25,11 +25,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:82 ../pyhoca/wxgui/logon.py:92 +#: ../pyhoca/wxgui/logon.py:82 +#: ../pyhoca/wxgui/logon.py:92 msgid "Username" msgstr "Benutzername" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:94 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:94 msgid "Password" msgstr "Kennwort" @@ -49,22 +51,25 @@ msgstr "Sitzungslogin" msgid "SSH proxy server login" msgstr "Anmeldung an SSH Proxy" -#: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258 -#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77 +#: ../pyhoca/wxgui/logon.py:115 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Cancel" msgstr "Abbrechen" -#: ../pyhoca/wxgui/logon.py:245 ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/logon.py:245 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:318 #, python-format msgid "%s - connect failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/logon.py:246 +#: ../pyhoca/wxgui/frontend.py:318 msgid "User is not allowed to start X2go sessions!" msgstr "Benutzer darf keine X2go Sitzungen starten!" -#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/logon.py:251 +#: ../pyhoca/wxgui/frontend.py:322 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -90,26 +95,28 @@ msgstr "%s - SSH Proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/logon.py:304 -#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:341 -#: ../pyhoca/wxgui/frontend.py:350 ../pyhoca/wxgui/frontend.py:353 -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/logon.py:298 +#: ../pyhoca/wxgui/logon.py:304 +#: ../pyhoca/wxgui/logon.py:320 +#: ../pyhoca/wxgui/frontend.py:337 +#: ../pyhoca/wxgui/frontend.py:346 +#: ../pyhoca/wxgui/frontend.py:349 +#: ../pyhoca/wxgui/frontend.py:352 #, python-format msgid "%s - connect error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:344 -#: ../pyhoca/wxgui/frontend.py:347 +#: ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/frontend.py:340 +#: ../pyhoca/wxgui/frontend.py:343 #, python-format msgid "%s - host key error" msgstr "%s - ungültiger Server-Schlüssel" -#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:344 -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:311 +#: ../pyhoca/wxgui/frontend.py:340 +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:316 #, python-format @@ -178,7 +185,8 @@ msgstr "Windows Terminalserver (RDP-proxy)" msgid "Single Application" msgstr "Einzelne Anwendung" -#: ../pyhoca/wxgui/profilemanager.py:69 ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:69 +#: ../pyhoca/wxgui/profilemanager.py:152 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -293,7 +301,8 @@ msgstr "XDMCP Server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:165 ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "User" msgstr "Benutzer" @@ -418,7 +427,8 @@ msgstr "Lokale Ordnerfreigabe verwenden" msgid "Path" msgstr "Pfad" -#: ../pyhoca/wxgui/profilemanager.py:235 ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Add" msgstr "Hinzufügen" @@ -454,7 +464,7 @@ msgstr "Aktion" msgid "Defaults" msgstr "Standardwerte" -#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Save" msgstr "Speichern" @@ -513,7 +523,8 @@ msgstr "Öffentlichen SSH-Schlüssel auswählen" msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1332 ../pyhoca/wxgui/menus_taskbar.py:86 +#: ../pyhoca/wxgui/profilemanager.py:1332 +#: ../pyhoca/wxgui/menus_taskbar.py:86 msgid "Profile Manager" msgstr "Profilmanager" @@ -547,138 +558,131 @@ msgstr "Sitzungsprofil bearbeiten" msgid "Delete Profile" msgstr "Sitzungsprofil löschen" -#: ../pyhoca/wxgui/menus_taskbar.py:79 ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/menus_taskbar.py:79 +#: ../pyhoca/wxgui/about.py:55 #: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "Über %s ..." #: ../pyhoca/wxgui/menus_taskbar.py:97 -msgid "Printing Preferences" -msgstr "Druckeinstellungen" - -#: ../pyhoca/wxgui/menus_taskbar.py:103 msgid "Client Options" msgstr "Optionen" -#: ../pyhoca/wxgui/menus_taskbar.py:111 ../pyhoca/wxgui/menus_taskbar.py:334 +#: ../pyhoca/wxgui/menus_taskbar.py:105 +#: ../pyhoca/wxgui/menus_taskbar.py:328 msgid "E&xit" msgstr "&Beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:148 +#: ../pyhoca/wxgui/menus_taskbar.py:142 msgid "Resume Session" msgstr "Sitzung fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:151 +#: ../pyhoca/wxgui/menus_taskbar.py:145 msgid "Transfer Session" msgstr "Sitzung übernehmen" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:146 msgid "Suspend Session" msgstr "Sitzung anhalten" -#: ../pyhoca/wxgui/menus_taskbar.py:154 +#: ../pyhoca/wxgui/menus_taskbar.py:148 msgid "Terminate Session" msgstr "Sitzung beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:192 +#: ../pyhoca/wxgui/menus_taskbar.py:186 msgid "Start &new Session" msgstr "&Neue Sitzung starten" -#: ../pyhoca/wxgui/menus_taskbar.py:205 +#: ../pyhoca/wxgui/menus_taskbar.py:199 msgid "Running" msgstr "aktiv" -#: ../pyhoca/wxgui/menus_taskbar.py:207 +#: ../pyhoca/wxgui/menus_taskbar.py:201 msgid "Suspended" msgstr "angehalten" -#: ../pyhoca/wxgui/menus_taskbar.py:217 +#: ../pyhoca/wxgui/menus_taskbar.py:211 msgid "&Clean all sessions" msgstr "Alle Sitzungen beenden" -#: ../pyhoca/wxgui/menus_taskbar.py:219 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Customize &profile" msgstr "Sitzungsprofil anpassen" -#: ../pyhoca/wxgui/menus_taskbar.py:221 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Share local &folder" msgstr "Lokalen Ordner verbinden" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:220 msgid "&Disconnect from Server" msgstr "Von Server trennen" -#: ../pyhoca/wxgui/menus_taskbar.py:254 +#: ../pyhoca/wxgui/menus_taskbar.py:248 msgid "Add Profile" msgstr "Sitzungsprofil hinzufügen" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:274 msgid "No session profiles defined" msgstr "keine Sitzungsprofile definiert" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Start/Resume Session" msgstr "Sitzung starten/fortsetzen" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Connect Server" msgstr "Serververbindung aufbauen" -#: ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/frontend.py:322 msgid "Public SSH key authentication has been successful." msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich." -#: ../pyhoca/wxgui/frontend.py:347 -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:343 +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:356 +#: ../pyhoca/wxgui/frontend.py:352 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:359 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - auth key error" msgstr "%s - ungültiger Benutzerschlüssel" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:430 msgid "Cleaning X2go sessions..." msgstr "Beende X2go Sitzungen..." -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 #, python-format msgid "%s - disconnect" msgstr "%s - trennen" -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 msgid "X2go Profile is now disconnected." msgstr "X2go Profil ist nun nicht mehr verbunden." -#: ../pyhoca/wxgui/frontend.py:462 +#: ../pyhoca/wxgui/frontend.py:458 msgid "New Session Profile" msgstr "Neues Sitzungsprofil" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 #, python-format msgid "%s - profile deleted" msgstr "%s - Profil gelöscht" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 msgid "The session profile has been deleted." msgstr "Das Sitzungsprofil wurde gelöscht." -#: ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/frontend.py:502 #, 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:558 +#: ../pyhoca/wxgui/frontend.py:546 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -691,31 +695,28 @@ msgstr "" "\n" "Sind Sie sicher, dass sie fortfahren möchten? " -#: ../pyhoca/wxgui/frontend.py:566 +#: ../pyhoca/wxgui/frontend.py:554 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Echtheit des Servers bestätigen" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "%s - channel error" msgstr "%s - Verbindungsfehler" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, 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:588 ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:576 +#: ../pyhoca/wxgui/frontend.py:580 #, python-format msgid "%s - session failure" msgstr "%s - Verbindung fehlgeschlagen" -#: ../pyhoca/wxgui/frontend.py:588 +#: ../pyhoca/wxgui/frontend.py:576 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -724,64 +725,50 @@ msgstr "" "Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n" "%s" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, python-format msgid "%s - session warning" msgstr "%s - Sitzungsfunktion eingeschränkt" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, 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 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." -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:580 #, 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:594 +#: ../pyhoca/wxgui/frontend.py:582 #, python-format msgid "%s - audio warning" msgstr "%s - Warnung Audiosystem" -#: ../pyhoca/wxgui/frontend.py:594 -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:582 +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:596 ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:584 +#: ../pyhoca/wxgui/frontend.py:586 #, python-format msgid "%s - audio error" msgstr "%s - Audiofehler" -#: ../pyhoca/wxgui/frontend.py:596 +#: ../pyhoca/wxgui/frontend.py:584 msgid "The X2go PulseAudio system could not be started." msgstr "Das X2go PulseAudio System konnte nicht gestartet werden." -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:586 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "Das X2go PulseAudio System ist soeben abgestürzt." -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "%s - audio problem" msgstr "%s - Audioproblem" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -790,12 +777,12 @@ msgstr "" "Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "%s - print job" msgstr "%s - Druckauftrag" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "" "Opening print job dialog not implemented yet!!!\n" @@ -804,12 +791,13 @@ msgstr "" "Druckdialog für eingehende Druckaufträge ist bislang nicht implementiert!!!\n" "%s" -#: ../pyhoca/wxgui/frontend.py:626 ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:614 +#: ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "%s - print error" msgstr "%s - Druckfehler" -#: ../pyhoca/wxgui/frontend.py:626 +#: ../pyhoca/wxgui/frontend.py:614 #, python-format msgid "" "%s\n" @@ -820,7 +808,7 @@ msgstr "" "...verursacht an Drucker durch Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "" "%s\n" @@ -831,12 +819,13 @@ msgstr "" "...verursacht von Sitzung\n" "%s" -#: ../pyhoca/wxgui/frontend.py:630 ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:618 +#: ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "%s - start" msgstr "%s - starten" -#: ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/frontend.py:618 #, python-format msgid "" "New X2go session starting up...\n" @@ -845,7 +834,7 @@ msgstr "" "Neue X2go Sitzung wird gestartet...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "" "Another client started X2go session\n" @@ -854,12 +843,13 @@ msgstr "" "Ein anderes X2go Programm hat diese Sitzung gestartet\n" "%s" -#: ../pyhoca/wxgui/frontend.py:634 ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:622 +#: ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "%s - resume" msgstr "%s - fortsetzen" -#: ../pyhoca/wxgui/frontend.py:634 +#: ../pyhoca/wxgui/frontend.py:622 #, python-format msgid "" "Resuming X2go session...\n" @@ -868,7 +858,7 @@ msgstr "" "X2go Sitzung wird fortgesetzt...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "" "Another client resumed X2go session\n" @@ -877,12 +867,12 @@ msgstr "" "Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n" "%s" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "%s - running" msgstr "%s - aktiv" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "" "Found already running session\n" @@ -891,12 +881,12 @@ msgstr "" "Bereits aktive Sitzung gefunden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "%s - suspend" msgstr "%s - anhalten" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "" "X2go Session has been suspended\n" @@ -905,12 +895,12 @@ msgstr "" "X2go Sitzung wurde angehalten\n" "%s" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "%s - terminate" msgstr "%s - beenden" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "" "X2go Session has terminated\n" @@ -919,56 +909,8 @@ msgstr "" "X2go Sitzung wurde beendet\n" "%s" -#: ../pyhoca/wxgui/messages.py:72 -msgid "Yes" -msgstr "Ja" - -#: ../pyhoca/wxgui/messages.py:73 -msgid "No" -msgstr "Nein" - -#: ../pyhoca/wxgui/messages.py:90 -msgid "Ok" -msgstr "OK" - -#: ../pyhoca/wxgui/printingprefs.py:52 -msgid "Open with PDF Viewer" -msgstr "MIt PDF-Betrachter öffnen" - -#: ../pyhoca/wxgui/printingprefs.py:53 -msgid "Save to a local folder" -msgstr "In lokalen Ordner speichern" - -#: ../pyhoca/wxgui/printingprefs.py:54 -msgid "Print to a local Printer" -msgstr "Auf lokalem Drucker drucken" - -#: ../pyhoca/wxgui/printingprefs.py:55 -msgid "Run Custom Print Command" -msgstr "Benutzerdefiniertes Druckkommando ausführen" - -#: ../pyhoca/wxgui/printingprefs.py:56 -msgid "Open this Dialog Window" -msgstr "Dieses Auswahlfenster öffnen" - -#: ../pyhoca/wxgui/printingprefs.py:59 -msgid "<Select a Print Action here>" -msgstr "Bearbeitungsmodus für Druckauftrag hier wählen" - -#: ../pyhoca/wxgui/printingprefs.py:67 -msgid "Print action" -msgstr "Aktion für aktuellen Druckauftrag" - -#: ../pyhoca/wxgui/printingprefs.py:69 -msgid "Default action for incoming print jobs" -msgstr "Aktion für eingehende Druckaufträge" - -#: ../pyhoca/wxgui/printingprefs.py:75 -msgid "Print" -msgstr "Drucken" - #~ msgid "Profile icon" #~ msgstr "Profilsymbol" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/en.po b/po/en.po index b006419..163bb4c 100644 --- a/po/en.po +++ b/po/en.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-27 18:47+0100\n" -"PO-Revision-Date: 2011-02-27 18:45+0100\n" +"POT-Creation-Date: 2011-02-27 01:24+0100\n" +"PO-Revision-Date: 2011-02-27 01:25+0100\n" "Last-Translator: Mike Gabriel <m.gabriel@das-netzwerkteam.de>\n" "Language-Team: en <m.gabriel@das-netzwerkteam.de>\n" "MIME-Version: 1.0\n" @@ -25,11 +25,13 @@ msgstr "" msgid "%s (via %s)" msgstr "%s (via %s)" -#: ../pyhoca/wxgui/logon.py:82 ../pyhoca/wxgui/logon.py:92 +#: ../pyhoca/wxgui/logon.py:82 +#: ../pyhoca/wxgui/logon.py:92 msgid "Username" msgstr "Username" -#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:94 +#: ../pyhoca/wxgui/logon.py:84 +#: ../pyhoca/wxgui/logon.py:94 msgid "Password" msgstr "Password" @@ -49,22 +51,25 @@ msgstr "Session login" msgid "SSH proxy server login" msgstr "SSH proxy server login" -#: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258 -#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77 +#: ../pyhoca/wxgui/logon.py:115 +#: ../pyhoca/wxgui/profilemanager.py:258 msgid "Cancel" msgstr "Cancel" -#: ../pyhoca/wxgui/logon.py:245 ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/logon.py:245 +#: ../pyhoca/wxgui/logon.py:278 +#: ../pyhoca/wxgui/frontend.py:318 #, python-format msgid "%s - connect failure" msgstr "%s - connect failure" -#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/logon.py:246 +#: ../pyhoca/wxgui/frontend.py:318 msgid "User is not allowed to start X2go sessions!" msgstr "User is not allowed to start X2go sessions!" -#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/logon.py:251 +#: ../pyhoca/wxgui/frontend.py:322 #, python-format msgid "%s - connect" msgstr "%s - connect" @@ -90,25 +95,28 @@ msgstr "%s - ssh proxy" msgid "Authentication to the SSH proxy server failed!" msgstr "Authentication to the SSH proxy server failed!" -#: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/logon.py:304 -#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:341 -#: ../pyhoca/wxgui/frontend.py:350 ../pyhoca/wxgui/frontend.py:353 -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/logon.py:298 +#: ../pyhoca/wxgui/logon.py:304 +#: ../pyhoca/wxgui/logon.py:320 +#: ../pyhoca/wxgui/frontend.py:337 +#: ../pyhoca/wxgui/frontend.py:346 +#: ../pyhoca/wxgui/frontend.py:349 +#: ../pyhoca/wxgui/frontend.py:352 #, python-format msgid "%s - connect error" msgstr "%s - connect error" -#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:344 -#: ../pyhoca/wxgui/frontend.py:347 +#: ../pyhoca/wxgui/logon.py:310 +#: ../pyhoca/wxgui/frontend.py:340 +#: ../pyhoca/wxgui/frontend.py:343 #, python-format msgid "%s - host key error" msgstr "%s - host key error" -#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:344 -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:311 +#: ../pyhoca/wxgui/frontend.py:340 +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:316 #, python-format @@ -179,7 +187,8 @@ msgstr "Windows Terminal Server (RDP-proxy)" msgid "Single Application" msgstr "Single Application" -#: ../pyhoca/wxgui/profilemanager.py:69 ../pyhoca/wxgui/profilemanager.py:152 +#: ../pyhoca/wxgui/profilemanager.py:69 +#: ../pyhoca/wxgui/profilemanager.py:152 msgid "Custom command" msgstr "Custom command" @@ -294,7 +303,8 @@ msgstr "XDMCP server" #. ## #. ## widgets for the CONNECTION tab #. ## -#: ../pyhoca/wxgui/profilemanager.py:165 ../pyhoca/wxgui/profilemanager.py:175 +#: ../pyhoca/wxgui/profilemanager.py:165 +#: ../pyhoca/wxgui/profilemanager.py:175 msgid "User" msgstr "User" @@ -419,7 +429,8 @@ msgstr "Use local folder sharing" msgid "Path" msgstr "Path" -#: ../pyhoca/wxgui/profilemanager.py:235 ../pyhoca/wxgui/profilemanager.py:252 +#: ../pyhoca/wxgui/profilemanager.py:235 +#: ../pyhoca/wxgui/profilemanager.py:252 msgid "Add" msgstr "Add" @@ -455,7 +466,7 @@ msgstr "Action" msgid "Defaults" msgstr "Defaults" -#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Save" msgstr "Save" @@ -514,7 +525,8 @@ msgstr "Choose a public SSH key" msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:1332 ../pyhoca/wxgui/menus_taskbar.py:86 +#: ../pyhoca/wxgui/profilemanager.py:1332 +#: ../pyhoca/wxgui/menus_taskbar.py:86 msgid "Profile Manager" msgstr "Profile Manager" @@ -548,135 +560,131 @@ msgstr "Edit Profile" msgid "Delete Profile" msgstr "Delete Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:79 ../pyhoca/wxgui/about.py:55 +#: ../pyhoca/wxgui/menus_taskbar.py:79 +#: ../pyhoca/wxgui/about.py:55 #: ../pyhoca/wxgui/about.py:57 #, python-format msgid "About %s ..." msgstr "About %s ..." #: ../pyhoca/wxgui/menus_taskbar.py:97 -msgid "Printing Preferences" -msgstr "Printing Preferences" - -#: ../pyhoca/wxgui/menus_taskbar.py:103 msgid "Client Options" msgstr "Client Options" -#: ../pyhoca/wxgui/menus_taskbar.py:111 ../pyhoca/wxgui/menus_taskbar.py:334 +#: ../pyhoca/wxgui/menus_taskbar.py:105 +#: ../pyhoca/wxgui/menus_taskbar.py:328 msgid "E&xit" msgstr "E&xit" -#: ../pyhoca/wxgui/menus_taskbar.py:148 +#: ../pyhoca/wxgui/menus_taskbar.py:142 msgid "Resume Session" msgstr "Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:151 +#: ../pyhoca/wxgui/menus_taskbar.py:145 msgid "Transfer Session" msgstr "Transfer Session" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:146 msgid "Suspend Session" msgstr "Suspend Session" -#: ../pyhoca/wxgui/menus_taskbar.py:154 +#: ../pyhoca/wxgui/menus_taskbar.py:148 msgid "Terminate Session" msgstr "Terminate Session" -#: ../pyhoca/wxgui/menus_taskbar.py:192 +#: ../pyhoca/wxgui/menus_taskbar.py:186 msgid "Start &new Session" msgstr "Start &new Session" -#: ../pyhoca/wxgui/menus_taskbar.py:205 +#: ../pyhoca/wxgui/menus_taskbar.py:199 msgid "Running" msgstr "Running" -#: ../pyhoca/wxgui/menus_taskbar.py:207 +#: ../pyhoca/wxgui/menus_taskbar.py:201 msgid "Suspended" msgstr "Suspended" -#: ../pyhoca/wxgui/menus_taskbar.py:217 +#: ../pyhoca/wxgui/menus_taskbar.py:211 msgid "&Clean all sessions" msgstr "&Clean all sessions" -#: ../pyhoca/wxgui/menus_taskbar.py:219 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Customize &profile" msgstr "Customize &profile" -#: ../pyhoca/wxgui/menus_taskbar.py:221 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Share local &folder" msgstr "Share local &folder" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:220 msgid "&Disconnect from Server" msgstr "&Disconnect from Server" -#: ../pyhoca/wxgui/menus_taskbar.py:254 +#: ../pyhoca/wxgui/menus_taskbar.py:248 msgid "Add Profile" msgstr "Add Profile" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:274 msgid "No session profiles defined" msgstr "No session profiles defined" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Start/Resume Session" msgstr "Start/Resume Session" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Connect Server" msgstr "Connect Server" -#: ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/frontend.py:322 msgid "Public SSH key authentication has been successful." msgstr "Public SSH key authentication has been successful." -#: ../pyhoca/wxgui/frontend.py:347 -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:343 +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:356 +#: ../pyhoca/wxgui/frontend.py:352 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authentication protocol communication incomplete! Try again..." -#: ../pyhoca/wxgui/frontend.py:359 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - auth key error" msgstr "%s - auth key error" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:430 msgid "Cleaning X2go sessions..." msgstr "Cleaning X2go sessions..." -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 #, python-format msgid "%s - disconnect" msgstr "%s - disconnect" -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 msgid "X2go Profile is now disconnected." msgstr "X2go Profile is now disconnected." -#: ../pyhoca/wxgui/frontend.py:462 +#: ../pyhoca/wxgui/frontend.py:458 msgid "New Session Profile" msgstr "New Session Profile" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 #, python-format msgid "%s - profile deleted" msgstr "%s - profile deleted" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 msgid "The session profile has been deleted." msgstr "The session profile has been deleted." -#: ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/frontend.py:502 #, 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:558 +#: ../pyhoca/wxgui/frontend.py:546 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -689,31 +697,28 @@ msgstr "" "\n" "Are you sure you want to continue connecting?" -#: ../pyhoca/wxgui/frontend.py:566 +#: ../pyhoca/wxgui/frontend.py:554 #, python-format msgid "%s: Confirm Host Authorization" msgstr "%s: Confirm Host Authorization" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "%s - channel error" msgstr "%s - channel error" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, 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:588 ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:576 +#: ../pyhoca/wxgui/frontend.py:580 #, python-format msgid "%s - session failure" msgstr "%s - session failure" -#: ../pyhoca/wxgui/frontend.py:588 +#: ../pyhoca/wxgui/frontend.py:576 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" @@ -722,61 +727,50 @@ msgstr "" "The command ,,%s'' is not available on X2go server\n" "%s)." -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, python-format msgid "%s - session warning" msgstr "%s - session warning" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, 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 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." -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:580 #, 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:594 +#: ../pyhoca/wxgui/frontend.py:582 #, python-format msgid "%s - audio warning" msgstr "%s - audio warning" -#: ../pyhoca/wxgui/frontend.py:594 -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:582 +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:596 ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:584 +#: ../pyhoca/wxgui/frontend.py:586 #, python-format msgid "%s - audio error" msgstr "%s - audio error" -#: ../pyhoca/wxgui/frontend.py:596 +#: ../pyhoca/wxgui/frontend.py:584 msgid "The X2go PulseAudio system could not be started." msgstr "The X2go PulseAudio system could not be started." -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:586 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "The X2go PulseAudio system has died unexpectedly." -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "%s - audio problem" msgstr "%s - audio problem" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "" "The audio connection could not be set up for this session.\n" @@ -785,12 +779,12 @@ msgstr "" "The audio connection could not be set up for this session.\n" "%s" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "%s - print job" msgstr "%s - print job" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "" "Opening print job dialog not implemented yet!!!\n" @@ -799,12 +793,13 @@ msgstr "" "Opening print job dialog not implemented yet!!!\n" "%s" -#: ../pyhoca/wxgui/frontend.py:626 ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:614 +#: ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "%s - print error" msgstr "%s - print error" -#: ../pyhoca/wxgui/frontend.py:626 +#: ../pyhoca/wxgui/frontend.py:614 #, python-format msgid "" "%s\n" @@ -815,7 +810,7 @@ msgstr "" "...caused on printer %s by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "" "%s\n" @@ -826,12 +821,13 @@ msgstr "" "...caused by session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:630 ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:618 +#: ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "%s - start" msgstr "%s - start" -#: ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/frontend.py:618 #, python-format msgid "" "New X2go session starting up...\n" @@ -840,7 +836,7 @@ msgstr "" "New X2go session starting up...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "" "Another client started X2go session\n" @@ -849,12 +845,13 @@ msgstr "" "Another client started X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:634 ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:622 +#: ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "%s - resume" msgstr "%s - resume" -#: ../pyhoca/wxgui/frontend.py:634 +#: ../pyhoca/wxgui/frontend.py:622 #, python-format msgid "" "Resuming X2go session...\n" @@ -863,7 +860,7 @@ msgstr "" "Resuming X2go session...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "" "Another client resumed X2go session\n" @@ -872,12 +869,12 @@ msgstr "" "Another client resumed X2go session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "%s - running" msgstr "%s - running" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "" "Found already running session\n" @@ -886,12 +883,12 @@ msgstr "" "Found already running session\n" "%s" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "" "X2go Session has been suspended\n" @@ -900,12 +897,12 @@ msgstr "" "X2go Session has been suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "%s - terminate" msgstr "%s - terminate" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "" "X2go Session has terminated\n" @@ -914,56 +911,8 @@ msgstr "" "X2go Session has terminated\n" "%s" -#: ../pyhoca/wxgui/messages.py:72 -msgid "Yes" -msgstr "Yes" - -#: ../pyhoca/wxgui/messages.py:73 -msgid "No" -msgstr "No" - -#: ../pyhoca/wxgui/messages.py:90 -msgid "Ok" -msgstr "Ok" - -#: ../pyhoca/wxgui/printingprefs.py:52 -msgid "Open with PDF Viewer" -msgstr "Open with PDF Viewer" - -#: ../pyhoca/wxgui/printingprefs.py:53 -msgid "Save to a local folder" -msgstr "Save to a local folder" - -#: ../pyhoca/wxgui/printingprefs.py:54 -msgid "Print to a local Printer" -msgstr "Print to a local Printer" - -#: ../pyhoca/wxgui/printingprefs.py:55 -msgid "Run Custom Print Command" -msgstr "Run Custom Print Command" - -#: ../pyhoca/wxgui/printingprefs.py:56 -msgid "Open this Dialog Window" -msgstr "Open this Dialog Window" - -#: ../pyhoca/wxgui/printingprefs.py:59 -msgid "<Select a Print Action here>" -msgstr "<Select a Print Action here>" - -#: ../pyhoca/wxgui/printingprefs.py:67 -msgid "Print action" -msgstr "Print action" - -#: ../pyhoca/wxgui/printingprefs.py:69 -msgid "Default action for incoming print jobs" -msgstr "Default action for incoming print jobs" - -#: ../pyhoca/wxgui/printingprefs.py:75 -msgid "Print" -msgstr "Print" - #~ msgid "Profile icon" #~ msgstr "Profile icon" - #~ msgid "Arts" #~ msgstr "Arts" + diff --git a/po/es.po b/po/es.po index 8cfef3a..f4d92e2 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-27 18:47+0100\n" +"POT-Creation-Date: 2011-02-27 01:24+0100\n" "PO-Revision-Date: 2011-02-24 15:33+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: es <oceanosoftlapalma@gmail.com>\n" @@ -50,21 +50,20 @@ msgid "SSH proxy server login" msgstr "Inicio de sesión en el servidor proxy SSH" #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258 -#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77 msgid "Cancel" msgstr "Cancelar" #: ../pyhoca/wxgui/logon.py:245 ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/frontend.py:318 #, python-format msgid "%s - connect failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:318 msgid "User is not allowed to start X2go sessions!" msgstr "El usuario no tiene permisos para iniciar X2go sesiones!" -#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:322 #, python-format msgid "%s - connect" msgstr "%s - conectado" @@ -91,20 +90,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Nombre de usuario o cantraseña erróneo en el servidor proxy SSH!" #: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/logon.py:304 -#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:341 -#: ../pyhoca/wxgui/frontend.py:350 ../pyhoca/wxgui/frontend.py:353 -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:337 +#: ../pyhoca/wxgui/frontend.py:346 ../pyhoca/wxgui/frontend.py:349 +#: ../pyhoca/wxgui/frontend.py:352 #, python-format msgid "%s - connect error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:344 -#: ../pyhoca/wxgui/frontend.py:347 +#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:340 +#: ../pyhoca/wxgui/frontend.py:343 #, fuzzy, python-format msgid "%s - host key error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:344 +#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:340 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -455,7 +454,7 @@ msgstr "Acción" msgid "Defaults" msgstr "Valores por defecto" -#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Save" msgstr "Guardar" @@ -555,127 +554,123 @@ msgid "About %s ..." msgstr "Acerca de %s ..." #: ../pyhoca/wxgui/menus_taskbar.py:97 -msgid "Printing Preferences" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:103 msgid "Client Options" msgstr "Opciones del Cliente" -#: ../pyhoca/wxgui/menus_taskbar.py:111 ../pyhoca/wxgui/menus_taskbar.py:334 +#: ../pyhoca/wxgui/menus_taskbar.py:105 ../pyhoca/wxgui/menus_taskbar.py:328 msgid "E&xit" msgstr "S&alir" -#: ../pyhoca/wxgui/menus_taskbar.py:148 +#: ../pyhoca/wxgui/menus_taskbar.py:142 msgid "Resume Session" msgstr "Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:151 +#: ../pyhoca/wxgui/menus_taskbar.py:145 msgid "Transfer Session" msgstr "Transferir Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:146 msgid "Suspend Session" msgstr "Suspender Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:154 +#: ../pyhoca/wxgui/menus_taskbar.py:148 msgid "Terminate Session" msgstr "Finalizar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:192 +#: ../pyhoca/wxgui/menus_taskbar.py:186 msgid "Start &new Session" msgstr "Iniciar &nueva Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:205 +#: ../pyhoca/wxgui/menus_taskbar.py:199 msgid "Running" msgstr "Activa" -#: ../pyhoca/wxgui/menus_taskbar.py:207 +#: ../pyhoca/wxgui/menus_taskbar.py:201 msgid "Suspended" msgstr "Suspendida" -#: ../pyhoca/wxgui/menus_taskbar.py:217 +#: ../pyhoca/wxgui/menus_taskbar.py:211 msgid "&Clean all sessions" msgstr "&Limpiar el registro de sesiones" -#: ../pyhoca/wxgui/menus_taskbar.py:219 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Customize &profile" msgstr "Configurar &perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:221 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Share local &folder" msgstr "Comporarti &Carpeta local" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:220 msgid "&Disconnect from Server" msgstr "&Desconectar del servidor" -#: ../pyhoca/wxgui/menus_taskbar.py:254 +#: ../pyhoca/wxgui/menus_taskbar.py:248 msgid "Add Profile" msgstr "Añadir Perfil" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:274 msgid "No session profiles defined" msgstr "No se han definido perfiles de sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Start/Resume Session" msgstr "Iniciar/Retomar Sesión" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Connect Server" msgstr "Conectar con el Servidor" -#: ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/frontend.py:322 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:347 +#: ../pyhoca/wxgui/frontend.py:343 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/frontend.py:352 msgid "Authentication protocol communication incomplete! Try again..." msgstr "¡El protocolo de comunicaciones está incompleto! Inténtalo otra vez..." -#: ../pyhoca/wxgui/frontend.py:359 +#: ../pyhoca/wxgui/frontend.py:355 #, fuzzy, python-format msgid "%s - auth key error" msgstr "%s - error en la conexión" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:430 msgid "Cleaning X2go sessions..." msgstr "Limpieado sesiones X2go..." -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 #, python-format msgid "%s - disconnect" msgstr "%s - desconectado" -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 msgid "X2go Profile is now disconnected." msgstr "Se ha desconectado el Perfil X2go." -#: ../pyhoca/wxgui/frontend.py:462 +#: ../pyhoca/wxgui/frontend.py:458 msgid "New Session Profile" msgstr "Nuevo Perfil de Sesión" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 #, python-format msgid "%s - profile deleted" msgstr "%s - perfil eliminado" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 msgid "The session profile has been deleted." msgstr "Se ha eliminado el perfil de sesión." -#: ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/frontend.py:502 #, 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:558 +#: ../pyhoca/wxgui/frontend.py:546 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -684,17 +679,17 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:566 +#: ../pyhoca/wxgui/frontend.py:554 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "%s - channel error" msgstr "%s - error en el canal" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -703,24 +698,24 @@ msgstr "" "La conexión con el servidor %s ha finalizado inesperadamente! Intenta " "iniciar sesión nuevamente..." -#: ../pyhoca/wxgui/frontend.py:588 ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:576 ../pyhoca/wxgui/frontend.py:580 #, fuzzy, python-format msgid "%s - session failure" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/frontend.py:588 +#: ../pyhoca/wxgui/frontend.py:576 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s)." msgstr "" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, fuzzy, python-format msgid "%s - session warning" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -728,54 +723,54 @@ msgid "" "help to restart the X2go server's SSH daemon." msgstr "" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:580 #, 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:594 +#: ../pyhoca/wxgui/frontend.py:582 #, fuzzy, python-format msgid "%s - audio warning" msgstr "%s - fallo en la conexión" -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:582 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:596 ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:584 ../pyhoca/wxgui/frontend.py:586 #, fuzzy, python-format msgid "%s - audio error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:596 +#: ../pyhoca/wxgui/frontend.py:584 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:586 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "%s - print job" msgstr "%s - imprimir" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "" "Opening print job dialog not implemented yet!!!\n" @@ -784,12 +779,12 @@ msgstr "" "¡¡¡El cuadro de diálogo de imprimir no ha sido desarrollado todavía!!!\n" "%s" -#: ../pyhoca/wxgui/frontend.py:626 ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:614 ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "%s - print error" msgstr "%s - error de impresión" -#: ../pyhoca/wxgui/frontend.py:626 +#: ../pyhoca/wxgui/frontend.py:614 #, fuzzy, python-format msgid "" "%s\n" @@ -800,7 +795,7 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "" "%s\n" @@ -811,12 +806,12 @@ msgstr "" "...provocado por la sesión\n" "%s" -#: ../pyhoca/wxgui/frontend.py:630 ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:618 ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "%s - start" msgstr "%s - inicio" -#: ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/frontend.py:618 #, python-format msgid "" "New X2go session starting up...\n" @@ -825,7 +820,7 @@ msgstr "" "Iniciaciando nueva sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "" "Another client started X2go session\n" @@ -834,12 +829,12 @@ msgstr "" "Otro cliente ha iniciado sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:634 ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:622 ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "%s - resume" msgstr "%s - retornar a la sesión" -#: ../pyhoca/wxgui/frontend.py:634 +#: ../pyhoca/wxgui/frontend.py:622 #, python-format msgid "" "Resuming X2go session...\n" @@ -848,7 +843,7 @@ msgstr "" "Retornando sesión X2go...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "" "Another client resumed X2go session\n" @@ -857,12 +852,12 @@ msgstr "" "Otro cliente retornó a la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "%s - running" msgstr "%s - en ejecución" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "" "Found already running session\n" @@ -871,12 +866,12 @@ msgstr "" "La sesión ya está en ejecución\n" "%s" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "%s - suspend" msgstr "%s - suspender" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "" "X2go Session has been suspended\n" @@ -885,12 +880,12 @@ msgstr "" "Se ha suspendido la Sesión X2go\n" "%s" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "%s - terminate" msgstr "%s - finalizar" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "" "X2go Session has terminated\n" @@ -899,59 +894,6 @@ msgstr "" "Se ha finalizado la sesión X2go\n" "%s" -#: ../pyhoca/wxgui/messages.py:72 -#, fuzzy -msgid "Yes" -msgstr "esd" - -#: ../pyhoca/wxgui/messages.py:73 -msgid "No" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:90 -msgid "Ok" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:52 -msgid "Open with PDF Viewer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:53 -#, fuzzy -msgid "Save to a local folder" -msgstr "Comporarti &Carpeta local" - -#: ../pyhoca/wxgui/printingprefs.py:54 -msgid "Print to a local Printer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:55 -#, fuzzy -msgid "Run Custom Print Command" -msgstr "Comando personalizado" - -#: ../pyhoca/wxgui/printingprefs.py:56 -msgid "Open this Dialog Window" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:59 -msgid "<Select a Print Action here>" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:67 -#, fuzzy -msgid "Print action" -msgstr "Impresora" - -#: ../pyhoca/wxgui/printingprefs.py:69 -msgid "Default action for incoming print jobs" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:75 -#, fuzzy -msgid "Print" -msgstr "Impresora" - #~ msgid "Profile icon" #~ msgstr "Icono del perfil" diff --git a/po/nl.po b/po/nl.po index 5488ce9..52397f4 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-27 18:47+0100\n" +"POT-Creation-Date: 2011-02-27 01:24+0100\n" "PO-Revision-Date: 2011-02-24 15:34+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep@lindix.nl>\n" @@ -50,21 +50,20 @@ msgid "SSH proxy server login" msgstr "Login via SSH Proxy" #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258 -#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77 msgid "Cancel" msgstr "Afbreken" #: ../pyhoca/wxgui/logon.py:245 ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/frontend.py:318 #, python-format msgid "%s - connect failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:318 msgid "User is not allowed to start X2go sessions!" msgstr "Gebruiker mag geen X2go sessie starten!" -#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:322 #, python-format msgid "%s - connect" msgstr "%s - verbinden" @@ -91,20 +90,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "Authenticatie via SSH Proxy Server mislukt!" #: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/logon.py:304 -#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:341 -#: ../pyhoca/wxgui/frontend.py:350 ../pyhoca/wxgui/frontend.py:353 -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:337 +#: ../pyhoca/wxgui/frontend.py:346 ../pyhoca/wxgui/frontend.py:349 +#: ../pyhoca/wxgui/frontend.py:352 #, python-format msgid "%s - connect error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:344 -#: ../pyhoca/wxgui/frontend.py:347 +#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:340 +#: ../pyhoca/wxgui/frontend.py:343 #, fuzzy, python-format msgid "%s - host key error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:344 +#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:340 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -453,7 +452,7 @@ msgstr "Actie" msgid "Defaults" msgstr "Standaardwaarden" -#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Save" msgstr "Opslaan" @@ -553,127 +552,123 @@ msgid "About %s ..." msgstr "About %s ..." #: ../pyhoca/wxgui/menus_taskbar.py:97 -msgid "Printing Preferences" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:103 msgid "Client Options" msgstr "Opties" -#: ../pyhoca/wxgui/menus_taskbar.py:111 ../pyhoca/wxgui/menus_taskbar.py:334 +#: ../pyhoca/wxgui/menus_taskbar.py:105 ../pyhoca/wxgui/menus_taskbar.py:328 msgid "E&xit" msgstr "&Beeindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:148 +#: ../pyhoca/wxgui/menus_taskbar.py:142 msgid "Resume Session" msgstr "Sessie hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:151 +#: ../pyhoca/wxgui/menus_taskbar.py:145 msgid "Transfer Session" msgstr "Sessie overnemen" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:146 msgid "Suspend Session" msgstr "Suspend Sessie" -#: ../pyhoca/wxgui/menus_taskbar.py:154 +#: ../pyhoca/wxgui/menus_taskbar.py:148 msgid "Terminate Session" msgstr "Sessie beeindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:192 +#: ../pyhoca/wxgui/menus_taskbar.py:186 msgid "Start &new Session" msgstr "&Nieuwe Sessie starten" -#: ../pyhoca/wxgui/menus_taskbar.py:205 +#: ../pyhoca/wxgui/menus_taskbar.py:199 msgid "Running" msgstr "aktief" -#: ../pyhoca/wxgui/menus_taskbar.py:207 +#: ../pyhoca/wxgui/menus_taskbar.py:201 msgid "Suspended" msgstr "hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:217 +#: ../pyhoca/wxgui/menus_taskbar.py:211 msgid "&Clean all sessions" msgstr "Alle Sessies beeindigen" -#: ../pyhoca/wxgui/menus_taskbar.py:219 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Customize &profile" msgstr "Sessieprofile wijzigen" -#: ../pyhoca/wxgui/menus_taskbar.py:221 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Share local &folder" msgstr "Delen lokale &map" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:220 msgid "&Disconnect from Server" msgstr "&Verbinding verbreken" -#: ../pyhoca/wxgui/menus_taskbar.py:254 +#: ../pyhoca/wxgui/menus_taskbar.py:248 msgid "Add Profile" msgstr "Profile toevoegen" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:274 msgid "No session profiles defined" msgstr "Geen Profile gedefinieerd" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Start/Resume Session" msgstr "Sessie starten/hervatten" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Connect Server" msgstr "Verbinden met Server" -#: ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/frontend.py:322 msgid "Public SSH key authentication has been successful." msgstr "Public SSH-key authenticatie is gelukt." -#: ../pyhoca/wxgui/frontend.py:347 +#: ../pyhoca/wxgui/frontend.py:343 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/frontend.py:352 msgid "Authentication protocol communication incomplete! Try again..." msgstr "Authenticatie was niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/frontend.py:359 +#: ../pyhoca/wxgui/frontend.py:355 #, fuzzy, python-format msgid "%s - auth key error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:430 msgid "Cleaning X2go sessions..." msgstr "Eindig X2go Sessies..." -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 #, python-format msgid "%s - disconnect" msgstr "%s - verbinding verbreken" -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 msgid "X2go Profile is now disconnected." msgstr "X2go Profil is nu niet meer verbonden." -#: ../pyhoca/wxgui/frontend.py:462 +#: ../pyhoca/wxgui/frontend.py:458 msgid "New Session Profile" msgstr "Nieuw Profile" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 #, python-format msgid "%s - profile deleted" msgstr "%s - Profile verwijderd" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 msgid "The session profile has been deleted." msgstr "Het Profile wordt verwijderd." -#: ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/frontend.py:502 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "%s - deel lokale map met dit Profile" -#: ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/frontend.py:546 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -682,17 +677,17 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:566 +#: ../pyhoca/wxgui/frontend.py:554 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "%s - channel error" msgstr "%s - Verbindingsfout" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " @@ -701,24 +696,24 @@ msgstr "" "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u " "opnieuw aan te melden..." -#: ../pyhoca/wxgui/frontend.py:588 ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:576 ../pyhoca/wxgui/frontend.py:580 #, fuzzy, python-format msgid "%s - session failure" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/frontend.py:588 +#: ../pyhoca/wxgui/frontend.py:576 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s)." msgstr "" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, fuzzy, python-format msgid "%s - session warning" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -726,54 +721,54 @@ msgid "" "help to restart the X2go server's SSH daemon." msgstr "" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:580 #, 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:594 +#: ../pyhoca/wxgui/frontend.py:582 #, fuzzy, python-format msgid "%s - audio warning" msgstr "%s - verbinden mislukt" -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:582 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:596 ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:584 ../pyhoca/wxgui/frontend.py:586 #, fuzzy, python-format msgid "%s - audio error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:596 +#: ../pyhoca/wxgui/frontend.py:584 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:586 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "%s - print job" msgstr "%s - print job" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "" "Opening print job dialog not implemented yet!!!\n" @@ -782,12 +777,12 @@ msgstr "" "De Print job dialog is nog niet geimplementeerd!!!\n" "%s" -#: ../pyhoca/wxgui/frontend.py:626 ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:614 ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "%s - print error" msgstr "%s - Printfout" -#: ../pyhoca/wxgui/frontend.py:626 +#: ../pyhoca/wxgui/frontend.py:614 #, fuzzy, python-format msgid "" "%s\n" @@ -798,7 +793,7 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "" "%s\n" @@ -809,12 +804,12 @@ msgstr "" "...veroorzaakt door sessie\n" "%s" -#: ../pyhoca/wxgui/frontend.py:630 ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:618 ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "%s - start" msgstr "%s - Start" -#: ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/frontend.py:618 #, python-format msgid "" "New X2go session starting up...\n" @@ -823,7 +818,7 @@ msgstr "" "Neue X2go sessie wordt gestart...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "" "Another client started X2go session\n" @@ -832,12 +827,12 @@ msgstr "" "Een andere X2go-client heeft deze sessie gestart\n" "%s" -#: ../pyhoca/wxgui/frontend.py:634 ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:622 ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "%s - resume" msgstr "%s - hervatten" -#: ../pyhoca/wxgui/frontend.py:634 +#: ../pyhoca/wxgui/frontend.py:622 #, python-format msgid "" "Resuming X2go session...\n" @@ -846,7 +841,7 @@ msgstr "" "X2go Sessie wordt hervat...\n" "%s" -#: ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "" "Another client resumed X2go session\n" @@ -855,12 +850,12 @@ msgstr "" "Een andere X2go-client heeft de Sessie hervat\n" "%s" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "%s - running" msgstr "%s - actief" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "" "Found already running session\n" @@ -869,12 +864,12 @@ msgstr "" "Reeds actieve sessie gevonden\n" "%s" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "%s - suspend" msgstr "%s - suspend" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "" "X2go Session has been suspended\n" @@ -883,12 +878,12 @@ msgstr "" "X2go Sessie is suspended\n" "%s" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "%s - terminate" msgstr "%s - beeindigen" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "" "X2go Session has terminated\n" @@ -897,59 +892,6 @@ msgstr "" "X2go Sessie wordt beeindigd\n" "%s" -#: ../pyhoca/wxgui/messages.py:72 -#, fuzzy -msgid "Yes" -msgstr "esd" - -#: ../pyhoca/wxgui/messages.py:73 -msgid "No" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:90 -msgid "Ok" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:52 -msgid "Open with PDF Viewer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:53 -#, fuzzy -msgid "Save to a local folder" -msgstr "Delen lokale &map" - -#: ../pyhoca/wxgui/printingprefs.py:54 -msgid "Print to a local Printer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:55 -#, fuzzy -msgid "Run Custom Print Command" -msgstr "Speciaal Commando" - -#: ../pyhoca/wxgui/printingprefs.py:56 -msgid "Open this Dialog Window" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:59 -msgid "<Select a Print Action here>" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:67 -#, fuzzy -msgid "Print action" -msgstr "Afdrukken" - -#: ../pyhoca/wxgui/printingprefs.py:69 -msgid "Default action for incoming print jobs" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:75 -#, fuzzy -msgid "Print" -msgstr "Afdrukken" - #~ msgid "Profile icon" #~ msgstr "Profile icon" diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot index 444cad7..7683642 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-02-27 18:47+0100\n" +"POT-Creation-Date: 2011-02-27 02:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -46,21 +47,20 @@ msgid "SSH proxy server login" msgstr "" #: ../pyhoca/wxgui/logon.py:115 ../pyhoca/wxgui/profilemanager.py:258 -#: ../pyhoca/wxgui/messages.py:96 ../pyhoca/wxgui/printingprefs.py:77 msgid "Cancel" msgstr "" #: ../pyhoca/wxgui/logon.py:245 ../pyhoca/wxgui/logon.py:278 -#: ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/frontend.py:318 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:322 +#: ../pyhoca/wxgui/logon.py:246 ../pyhoca/wxgui/frontend.py:318 msgid "User is not allowed to start X2go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/frontend.py:322 #, python-format msgid "%s - connect" msgstr "" @@ -87,20 +87,20 @@ msgid "Authentication to the SSH proxy server failed!" msgstr "" #: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/logon.py:304 -#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:341 -#: ../pyhoca/wxgui/frontend.py:350 ../pyhoca/wxgui/frontend.py:353 -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/logon.py:320 ../pyhoca/wxgui/frontend.py:337 +#: ../pyhoca/wxgui/frontend.py:346 ../pyhoca/wxgui/frontend.py:349 +#: ../pyhoca/wxgui/frontend.py:352 #, python-format msgid "%s - connect error" msgstr "" -#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:344 -#: ../pyhoca/wxgui/frontend.py:347 +#: ../pyhoca/wxgui/logon.py:310 ../pyhoca/wxgui/frontend.py:340 +#: ../pyhoca/wxgui/frontend.py:343 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:344 +#: ../pyhoca/wxgui/logon.py:311 ../pyhoca/wxgui/frontend.py:340 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" @@ -442,7 +442,7 @@ msgstr "" msgid "Defaults" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:255 ../pyhoca/wxgui/printingprefs.py:73 +#: ../pyhoca/wxgui/profilemanager.py:255 msgid "Save" msgstr "" @@ -542,127 +542,123 @@ msgid "About %s ..." msgstr "" #: ../pyhoca/wxgui/menus_taskbar.py:97 -msgid "Printing Preferences" -msgstr "" - -#: ../pyhoca/wxgui/menus_taskbar.py:103 msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:111 ../pyhoca/wxgui/menus_taskbar.py:334 +#: ../pyhoca/wxgui/menus_taskbar.py:105 ../pyhoca/wxgui/menus_taskbar.py:328 msgid "E&xit" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:148 +#: ../pyhoca/wxgui/menus_taskbar.py:142 msgid "Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:151 +#: ../pyhoca/wxgui/menus_taskbar.py:145 msgid "Transfer Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:152 +#: ../pyhoca/wxgui/menus_taskbar.py:146 msgid "Suspend Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:154 +#: ../pyhoca/wxgui/menus_taskbar.py:148 msgid "Terminate Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:192 +#: ../pyhoca/wxgui/menus_taskbar.py:186 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:205 +#: ../pyhoca/wxgui/menus_taskbar.py:199 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:207 +#: ../pyhoca/wxgui/menus_taskbar.py:201 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:217 +#: ../pyhoca/wxgui/menus_taskbar.py:211 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:219 +#: ../pyhoca/wxgui/menus_taskbar.py:213 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:221 +#: ../pyhoca/wxgui/menus_taskbar.py:215 msgid "Share local &folder" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:226 +#: ../pyhoca/wxgui/menus_taskbar.py:220 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:254 +#: ../pyhoca/wxgui/menus_taskbar.py:248 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:280 +#: ../pyhoca/wxgui/menus_taskbar.py:274 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Start/Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:311 +#: ../pyhoca/wxgui/menus_taskbar.py:305 msgid "Connect Server" msgstr "" -#: ../pyhoca/wxgui/frontend.py:326 +#: ../pyhoca/wxgui/frontend.py:322 msgid "Public SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:347 +#: ../pyhoca/wxgui/frontend.py:343 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:356 +#: ../pyhoca/wxgui/frontend.py:352 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:359 +#: ../pyhoca/wxgui/frontend.py:355 #, python-format msgid "%s - auth key error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:434 +#: ../pyhoca/wxgui/frontend.py:430 msgid "Cleaning X2go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:454 +#: ../pyhoca/wxgui/frontend.py:450 msgid "X2go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:462 +#: ../pyhoca/wxgui/frontend.py:458 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:491 +#: ../pyhoca/wxgui/frontend.py:487 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:506 +#: ../pyhoca/wxgui/frontend.py:502 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:558 +#: ../pyhoca/wxgui/frontend.py:546 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -671,41 +667,41 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:566 +#: ../pyhoca/wxgui/frontend.py:554 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:585 +#: ../pyhoca/wxgui/frontend.py:573 #, python-format msgid "" "Lost connection to server %s unexpectedly! Try to re-authenticate to the " "server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:588 ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:576 ../pyhoca/wxgui/frontend.py:580 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:588 +#: ../pyhoca/wxgui/frontend.py:576 #, python-format msgid "" "The command ,,%s'' is not available on X2go server\n" "%s)." msgstr "" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:590 +#: ../pyhoca/wxgui/frontend.py:578 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " @@ -713,66 +709,66 @@ msgid "" "help to restart the X2go server's SSH daemon." msgstr "" -#: ../pyhoca/wxgui/frontend.py:592 +#: ../pyhoca/wxgui/frontend.py:580 #, 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:594 +#: ../pyhoca/wxgui/frontend.py:582 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:594 +#: ../pyhoca/wxgui/frontend.py:582 msgid "" "The X2go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:596 ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:584 ../pyhoca/wxgui/frontend.py:586 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:596 +#: ../pyhoca/wxgui/frontend.py:584 msgid "The X2go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:598 +#: ../pyhoca/wxgui/frontend.py:586 msgid "The X2go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:600 +#: ../pyhoca/wxgui/frontend.py:588 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "%s - print job" msgstr "" -#: ../pyhoca/wxgui/frontend.py:604 +#: ../pyhoca/wxgui/frontend.py:592 #, python-format msgid "" "Opening print job dialog not implemented yet!!!\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:626 ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:614 ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:626 +#: ../pyhoca/wxgui/frontend.py:614 #, python-format msgid "" "%s\n" @@ -780,7 +776,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:628 +#: ../pyhoca/wxgui/frontend.py:616 #, python-format msgid "" "%s\n" @@ -788,124 +784,76 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:630 ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:618 ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:630 +#: ../pyhoca/wxgui/frontend.py:618 #, python-format msgid "" "New X2go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:632 +#: ../pyhoca/wxgui/frontend.py:620 #, python-format msgid "" "Another client started X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:634 ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:622 ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:634 +#: ../pyhoca/wxgui/frontend.py:622 #, python-format msgid "" "Resuming X2go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:636 +#: ../pyhoca/wxgui/frontend.py:624 #, python-format msgid "" "Another client resumed X2go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:638 +#: ../pyhoca/wxgui/frontend.py:626 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:640 +#: ../pyhoca/wxgui/frontend.py:628 #, python-format msgid "" "X2go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:648 +#: ../pyhoca/wxgui/frontend.py:636 #, python-format msgid "" "X2go Session has terminated\n" "%s" msgstr "" - -#: ../pyhoca/wxgui/messages.py:72 -msgid "Yes" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:73 -msgid "No" -msgstr "" - -#: ../pyhoca/wxgui/messages.py:90 -msgid "Ok" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:52 -msgid "Open with PDF Viewer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:53 -msgid "Save to a local folder" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:54 -msgid "Print to a local Printer" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:55 -msgid "Run Custom Print Command" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:56 -msgid "Open this Dialog Window" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:59 -msgid "<Select a Print Action here>" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:67 -msgid "Print action" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:69 -msgid "Default action for incoming print jobs" -msgstr "" - -#: ../pyhoca/wxgui/printingprefs.py:75 -msgid "Print" -msgstr "" diff --git a/pyhoca-gui b/pyhoca-gui index 66893fa..d1d8491 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -175,7 +175,6 @@ x2go_gui_options = [ {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': ' on connect auto-resume the oldest suspended session', }, {'args':['--resume-all-on-connect'], 'default': False, 'action': 'store_true', 'help': 'auto-resume all suspended session on connect', }, {'args':['--disable-options'], 'default': False, 'action': 'store_true', 'help': 'disable the client options configuration window', }, - {'args':['--disable-printingprefs'], 'default': False, 'action': 'store_true', 'help': 'disable the client\'s printing preferences window', }, {'args':['--disable-profilemanager'], 'default': False, 'action': 'store_true', 'help': 'disable the session profile manager window', }, {'args':['--display'], 'default': None, 'metavar': '<hostname>:<screennumber>', 'help': 'set the DISPLAY environment variable to <hostname>:<screennumber>', }, ] diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index de06217..00bf25b 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -58,7 +58,6 @@ import logon import taskbar import menus_taskbar import profilemanager -import printingprefs import notify import messages import basepath @@ -217,12 +216,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): ### if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1': self.options_disabled = self.args.disable_options - self.printingprefs_disabled = self.args.disable_printingprefs else: self._pyhoca_logger('the current release of %s does not support client configuration' % self.appname, loglevel=x2go.log.loglevel_WARN) self.options_disabled = True - self._pyhoca_logger('the current release of %s does not support editing printing preferences' % self.appname, loglevel=x2go.log.loglevel_WARN) - self.printingprefs_disabled = True if self.args.session_profile: for profile_name in self.args.session_profile.split(','): @@ -532,14 +528,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ self._pyhoca_logger('The ,,Options\'\' configuration window is not implemented yet', loglevel=x2go.log.loglevel_WARN, ) - def OnPrintingPreferences(self, evt): - """\ - STILL UNDOCUMENTED - - """ - self._pyhoca_logger('opening the printing preferences window', loglevel=x2go.log.loglevel_INFO, ) - printingprefs.PyHocaGUI_PrintingPreferences(self) - def OnClose(self, evt): """\ STILL UNDOCUMENTED diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index d541492..4b8075c 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -93,12 +93,6 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu): self.AppendSeparator() - ID_PRINTINGPREFS = wx.NewId() - _printingprefs_item = self.Append(id=ID_PRINTINGPREFS, text=_(u"Printing Preferences")) - self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPrintingPreferences, id=ID_PRINTINGPREFS) - if self._PyHocaGUI.printingprefs_disabled: - _printingprefs_item.Enable(False) - ID_OPTIONS = wx.NewId() _options_item = self.Append(id=ID_OPTIONS, text=_(u"Client Options")) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnOptions, id=ID_OPTIONS) diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index b481c41..4a6c053 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -41,7 +41,10 @@ class PyHoca_MessageWindow(wx.Dialog): self._PyHocaGUI = _PyHocaGUI - wx.EndBusyCursor() + try: + wx.EndBusyCursor() + except: + pass if shortmsg is None: show_message = custom_message diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py deleted file mode 100644 index a167979..0000000 --- a/pyhoca/wxgui/printingprefs.py +++ /dev/null @@ -1,266 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (C) 2010-2011 by Dick Kniep <dick.kniep@lindix.nl> -# Copyright (C) 2010-2011 by Mike Gabriel <m.gabriel@das-netzwerkteam.de> -# -# PyHoca GUI is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# PyHoca GUI is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -import wx - -import x2go.log as log -import x2go.utils as utils -from x2go import X2GOCLIENT_OS - -from x2go import defaults - -import basepath - -_icons_location = basepath.icons_basepath - -class PyHocaGUI_PrintingPreferences(wx.Dialog): - """\ - STILL UNDOCUMENTED - - """ - def __init__(self, _PyHocaGUI, profile_name=None, session_name=None, mode='edit'): - """\ - STILL UNDOCUMENTED - - """ - self._PyHocaGUI = _PyHocaGUI - self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger - self.mode = mode - - self._pyhoca_logger('opening client printing configuration dialog, mode: ,,%s\'\'' % self.mode, loglevel=log.loglevel_INFO) - - wx.Dialog.__init__(self, None, -1, style=wx.DEFAULT_DIALOG_STYLE, ) - - self._availablePrintActions = { - 'PDFVIEW': _(u'Open with PDF viewer'), - 'PDFSAVE': _(u'Save to a local folder'), - 'PRINT': _(u'Print to a local printer'), - 'PRINTCMD': _(u'Run custom print command'), - 'DIALOG': _(u'Open this dialog window'), - } - if self.mode != 'edit': - self._availablePrintActions['DIALOG'] = _(u'<Select a print action here>') - - self.client_printing = self._PyHocaGUI.client_printing - - ### - ### widgets for CLIENT PRINTING - ### - if self.mode != 'edit': - self.PrintActionLabel = wx.StaticText(self, -1, _(u"Print action")+':') - else: - self.PrintActionLabel = wx.StaticText(self, -1, _(u"Default action for incoming print jobs")+':') - self.PrintAction = wx.ComboBox(self, -1, choices=self._availablePrintActions.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) - - # widgets for print action PDFVIEW - self.PdfViewCmdLabel = wx.StaticText(self, -1, _(u'PDF viewer command') + ':', ) - self.PdfViewCmd = wx.TextCtrl(self, -1, '', ) - self.PdfViewCmdBrowseButton = wx.BitmapButton(self, -1, - wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY) - ) - - # widgets for print action PDFSAVE - self.PdfSaveToFolderLabel = wx.StaticText(self, -1, _(u'Save PDFs to folder') + ':', ) - self.PdfSaveToFolder = wx.TextCtrl(self, -1, '', ) - self.PdfSaveToFolderBrowseButton = wx.BitmapButton(self, -1, - wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY) - ) - - # widgets for print action PRINT - _printer_list = [] - if X2GOCLIENT_OS == 'Windows': - pass - else: - pass - self.PrintPrinterLabel = wx.StaticText(self, -1, _(u'Use this printer') + ':', ) - self.PrintPrinter = wx.ComboBox(self, -1, choices=_printer_list, style=wx.CB_DROPDOWN|wx.CB_READONLY) - - # widgets for print action PRINTCMD - self.PrintCmdLabel = wx.StaticText(self, -1, _(u'Custom print command') + ':', ) - self.PrintCmd = wx.TextCtrl(self, -1, '', ) - - if self.mode == 'edit': - self.OKButton = wx.Button(self, -1, _(u"Save")) - else: - self.OKButton = wx.Button(self, -1, _(u"Print")) - self.OKButton.SetDefault() - self.CancelButton = wx.Button(self, -1, _(u"Cancel")) - - self.__set_properties() - self.__update_fields() - self.__do_layout() - - self.Bind(wx.EVT_COMBOBOX, self.OnPrintActionChange, self.PrintAction) - - self.Bind(wx.EVT_BUTTON, self.OnOKButton, self.OKButton) - self.Bind(wx.EVT_BUTTON, self.OnCancel, self.CancelButton) - - - def __set_properties(self): - - _textfield_height = 22 - self.PrintActionLabel.SetMinSize((-1, 16)) - self.PrintAction.SetMinSize((-1, _textfield_height)) - self.OKButton.SetMinSize((-1, 30)) - self.CancelButton.SetMinSize((-1, 30)) - - def __do_layout(self): - - sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_1_1 = wx.GridBagSizer(hgap=2, vgap=5) - sizer_1_1.Add(self.PrintActionLabel, pos=(0,0), flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, border=7) - sizer_1_1.Add(self.PrintAction, pos=(0,1), ) - - sizer_1_1.Add(self.PdfViewCmdLabel, pos=(1,0), flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, border=7) - sizer_1_1_1 = wx.BoxSizer(wx.HORIZONTAL) - sizer_1_1_1.Add(self.PdfViewCmd, proportion=1, flag=wx.EXPAND|wx.RIGHT, border=7, ) - sizer_1_1_1.Add(self.PdfViewCmdBrowseButton, ) - sizer_1_1.Add(sizer_1_1_1, pos=(1,1), flag=wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, ) - - sizer_1_1.Add(self.PdfSaveToFolderLabel, pos=(2,0), flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, border=7, ) - sizer_1_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_1_1_2.Add(self.PdfSaveToFolder, proportion=1, flag=wx.EXPAND|wx.RIGHT, border=7, ) - sizer_1_1_2.Add(self.PdfSaveToFolderBrowseButton, ) - sizer_1_1.Add(sizer_1_1_2, pos=(2,1), flag=wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, ) - - sizer_1_1.Add(self.PrintPrinterLabel, pos=(3,0), flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, border=7, ) - sizer_1_1_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_1_1_3.Add(self.PrintPrinter, proportion=1, flag=wx.EXPAND, ) - sizer_1_1.Add(sizer_1_1_3, pos=(3,1), flag=wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, ) - - sizer_1_1.Add(self.PrintCmdLabel, pos=(4,0), flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT, border=7, ) - sizer_1_1_4 = wx.BoxSizer(wx.HORIZONTAL) - sizer_1_1_4.Add(self.PrintCmd, proportion=1, flag=wx.EXPAND, ) - sizer_1_1.Add(sizer_1_1_4, pos=(4,1), flag=wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, ) - sizer_1.Add(sizer_1_1, flag=wx.EXPAND|wx.ALL, border=10) - - # the bottom area with OK and Cancel buttons - sizer_B = wx.BoxSizer(wx.HORIZONTAL) - sizer_B.Add(self.OKButton, flag=wx.ALL, border=5) - sizer_B.Add(self.CancelButton, flag=wx.ALL, border=5) - - # put it all together... - MainSizer = wx.BoxSizer(wx.VERTICAL) - MainSizer.Add(sizer_1, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE) - MainSizer.Add(sizer_B, flag=wx.ALIGN_RIGHT) - self.SetSizerAndFit(MainSizer) - - self.SetAutoLayout(True) - self.Layout() - self.CentreOnScreen() - self.Show(True) - - def __update_fields(self): - - self.PdfViewCmd.SetValue(self.client_printing.get_property('pdfview_cmd')) - self.PdfSaveToFolder.SetValue(self.client_printing.get_property('save_to_folder')) - self.PrintPrinter.SetValue(self.client_printing.get_property('printer')) - self.PrintCmd.SetValue(self.client_printing.get_property('print_cmd')) - - print_action_name = self.client_printing.get_print_action(reinit=True, return_name=True) - if self._availablePrintActions.has_key(print_action_name): - self.PrintAction.SetValue(self._availablePrintActions[print_action_name]) - else: - self.PrintAction.SetValue(print_action_name) - self._onPrintActionChange() - - def __update_from_screen(self): - properties = { - 'pdfview_cmd': self.PdfViewCmd.GetValue(), - 'save_to_folder': self.PdfSaveToFolder.GetValue(), - 'printer': self.PrintPrinter.GetValue(), - 'print_cmd': self.PrintCmd.GetValue(), - } - self.client_printing.store_print_action(self._print_action, **properties) - - @property - def _print_action(self): - return [ p for p in self._availablePrintActions.keys() if self._availablePrintActions[p] == self.PrintAction.GetValue() ][0] - - def _onPrintActionChange(self): - if self._print_action == 'PDFVIEW': - self.PdfViewSelected() - elif self._print_action == 'PDFSAVE': - self.PdfSaveToFolderSelected() - elif self._print_action == 'PRINT': - self.PrintPrinterSelected() - elif self._print_action == 'PRINTCMD': - self.PrintCmdSelected() - else: - self._disable_PrintOptions() - - def OnPrintActionChange(self, evt): - self._onPrintActionChange() - - def _disable_PrintOptions(self): - self.PdfViewCmdLabel.Enable(False) - self.PdfViewCmd.Enable(False) - self.PdfViewCmdBrowseButton.Enable(False) - self.PdfSaveToFolderLabel.Enable(False) - self.PdfSaveToFolder.Enable(False) - self.PdfSaveToFolderBrowseButton.Enable(False) - self.PrintPrinterLabel.Enable(False) - self.PrintPrinter.Enable(False) - self.PrintCmdLabel.Enable(False) - self.PrintCmd.Enable(False) - - def PdfViewSelected(self): - self._disable_PrintOptions() - self.PdfViewCmdLabel.Enable(True) - self.PdfViewCmd.Enable(True) - self.PdfViewCmdBrowseButton.Enable(True) - - def PdfSaveToFolderSelected(self): - self._disable_PrintOptions() - self.PdfSaveToFolderLabel.Enable(True) - self.PdfSaveToFolder.Enable(True) - self.PdfSaveToFolderBrowseButton.Enable(True) - - def PrintPrinterSelected(self): - self._disable_PrintOptions() - self.PrintPrinterLabel.Enable(True) - self.PrintPrinter.Enable(True) - - def PrintCmdSelected(self): - self._disable_PrintOptions() - self.PrintCmdLabel.Enable(True) - self.PrintCmd.Enable(True) - - def __validate(self): - validateOk = True - return validateOk - - def OnOKButton(self, event): - wx.BeginBusyCursor() - self.__update_from_screen() - if self.__validate(): - self.client_printing.write() - - wx.EndBusyCursor() - self.Close() - self.Destroy() - else: - wx.EndBusyCursor() - - def OnCancel(self, event): - self.client_printing.load() - self.Close() - self.Destroy() - 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)).