The branch, twofactorauth has been updated via 180484c4a26461ce3916920af70a3d496d3f58b4 (commit) from 052916c4ea0d523a6db253b4f0ffe394d932aab9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: man/man1/pyhoca-gui.1 | 2 +- nsis_template.py | 2 +- po/PyHoca-GUI.pot | 20 ++++++++++---------- po/bg.po | 6 +++--- po/da.po | 10 +++++----- po/de.po | 12 ++++++------ po/en.po | 12 ++++++------ po/es.po | 26 +++++++++++++------------- po/fr.po | 6 +++--- po/nb_NO.po | 10 +++++----- po/nl.po | 14 +++++++------- po/ru.po | 12 ++++++------ po/sv.po | 6 +++--- pyhoca-gui | 2 +- pyhoca/wxgui/about.py | 2 +- pyhoca/wxgui/frontend.py | 12 ++++++------ pyhoca/wxgui/logon.py | 2 +- pyhoca/wxgui/sessiontitle.py | 2 +- pyhoca/wxgui/taskbar.py | 6 +++--- 19 files changed, 82 insertions(+), 82 deletions(-) The diff of changes is: diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 1f73aff..790b2de 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -54,7 +54,7 @@ Enable debugging output. Enable debugging code of the unterlying Python X2Go module. .TP \*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> -Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data). +Enable debugging code of Python X2Go's sFTP server code (very verbose, and it may even reveal promiscuous data). .SH GUI OPTIONS .TP \*(T<\fB\-P, \-\-session-profile\fR\*(T> diff --git a/nsis_template.py b/nsis_template.py index e9db9eb..d4b35c0 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -266,7 +266,7 @@ Section "$STARTMENU_LINKS" CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO).lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} (debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO, debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 - CreateShortCut "$SMPROGRAMS\\{program_name}\\X2go Website.lnk" "http://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0 + CreateShortCut "$SMPROGRAMS\\{program_name}\\X2Go Website.lnk" "http://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\Uninstall.lnk" "$INSTDIR\\uninstall.exe" "" "$INSTDIR\\uninstall.exe" 0 SectionEnd diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index fd05fc8..8d1a34e 100644 --- a/po/PyHoca-GUI.pot +++ b/po/PyHoca-GUI.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-20 09:07+0100\n" +"POT-Creation-Date: 2012-12-20 09:58+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" @@ -47,7 +47,7 @@ msgid "SSH proxy server login" msgstr "" #: ../pyhoca/wxgui/logon.py:127 ../pyhoca/wxgui/profilemanager.py:350 -#: ../pyhoca/wxgui/messages.py:131 ../pyhoca/wxgui/printingprefs.py:147 +#: ../pyhoca/wxgui/messages.py:130 ../pyhoca/wxgui/printingprefs.py:147 #: ../pyhoca/wxgui/sessiontitle.py:85 msgid "Cancel" msgstr "" @@ -147,7 +147,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" @@ -159,7 +159,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" @@ -1117,7 +1117,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" #: ../pyhoca/wxgui/frontend.py:1374 @@ -1298,14 +1298,14 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/messages.py:73 +#: ../pyhoca/wxgui/messages.py:72 #, python-format msgid "" "Are you really sure you want to\n" "delete the session profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/messages.py:74 +#: ../pyhoca/wxgui/messages.py:73 #, python-format msgid "" "PyHoca-GUI is already running for user ,,%s''!\n" @@ -1315,15 +1315,15 @@ msgid "" "notification area/systray." msgstr "" -#: ../pyhoca/wxgui/messages.py:107 +#: ../pyhoca/wxgui/messages.py:106 msgid "Yes" msgstr "" -#: ../pyhoca/wxgui/messages.py:108 +#: ../pyhoca/wxgui/messages.py:107 msgid "No" msgstr "" -#: ../pyhoca/wxgui/messages.py:125 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:124 ../pyhoca/wxgui/printingprefs.py:142 msgid "Ok" msgstr "" diff --git a/po/bg.po b/po/bg.po index 194fc9c..e36baf1 100644 --- a/po/bg.po +++ b/po/bg.po @@ -151,7 +151,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" @@ -1121,7 +1121,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" #: ../pyhoca/wxgui/frontend.py:1370 diff --git a/po/da.po b/po/da.po index ab9e1af..9985b8b 100644 --- a/po/da.po +++ b/po/da.po @@ -163,10 +163,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Forbinder dig til X2Go server ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -179,10 +179,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Klient til at forbinde dig til en X2Go server" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1169,7 +1169,7 @@ msgstr "Omvendt TCP port forwarding forespørgsel for session %s til serverport #: ../pyhoca/wxgui/frontend.py:1351 #, python-format -msgid "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 forespørgsler til [%s]:%s til session %s blev nægtet af X2Go/SSH fjernserveren. Sessionsstartop fejlede." #: ../pyhoca/wxgui/frontend.py:1370 diff --git a/po/de.po b/po/de.po index 3ee236d..14cea70 100644 --- a/po/de.po +++ b/po/de.po @@ -155,10 +155,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbindungsaufbau zu X2Go Server ,,%s'' läuft" #: ../pyhoca/wxgui/taskbar.py:103 @@ -169,10 +169,10 @@ msgstr "Verbinden mit X2Go Server..." #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbindungen zu entferntem X2Go Server aufbauen" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1159,9 +1159,9 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" -"SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server " +"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:1370 diff --git a/po/en.po b/po/en.po index f706bbb..d7a1730 100644 --- a/po/en.po +++ b/po/en.po @@ -153,10 +153,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -169,10 +169,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1151,10 +1151,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"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." +"X2Go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format diff --git a/po/es.po b/po/es.po index 1574d9f..1ee3659 100644 --- a/po/es.po +++ b/po/es.po @@ -68,7 +68,7 @@ msgstr "%s - fallo en la conexión" #: ../pyhoca/wxgui/logon.py:298 ../pyhoca/wxgui/frontend.py:606 msgid "User is not allowed to start X2Go sessions!" -msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!" +msgstr "¡El usuario no tiene permisos para iniciar sesiones X2Go!" #: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/frontend.py:613 #, python-format @@ -160,10 +160,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Conectando con tu servidor remoto X2Go \"%s\"" #: ../pyhoca/wxgui/taskbar.py:103 @@ -176,11 +176,11 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" -"Cliente para conexiones remotas a servidores X2go" +"PyHoca-GUI (Python X2Go Client)\n" +"Cliente para conexiones remotas a servidores X2Go" #: ../pyhoca/wxgui/profilemanager.py:79 msgid "GNOME Desktop (GNOME)" @@ -1151,7 +1151,7 @@ msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -"El comando \"%s\" no está disponible en el servidor X2go\n" +"El comando \"%s\" no está disponible en el servidor X2Go\n" "%s." #: ../pyhoca/wxgui/frontend.py:1332 @@ -1167,10 +1167,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el " -"servidor X2go/SSH . Fallo en el inicio de sesión." +"servidor X2Go/SSH . Fallo en el inicio de sesión." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format @@ -1317,7 +1317,7 @@ msgid "" "Another client started X2Go session\n" "%s" msgstr "" -"Otro cliente ha iniciado sesión X2go\n" +"Otro cliente ha iniciado sesión X2Go\n" "%s" #: ../pyhoca/wxgui/frontend.py:1510 ../pyhoca/wxgui/frontend.py:1525 @@ -1340,7 +1340,7 @@ msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -"Otro cliente retornó a la sesión X2go\n" +"Otro cliente retornó a la sesión X2Go\n" "%s" #: ../pyhoca/wxgui/frontend.py:1540 @@ -1368,7 +1368,7 @@ msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -"Se ha suspendido la Sesión X2go\n" +"Se ha suspendido la Sesión X2Go\n" "%s" #: ../pyhoca/wxgui/frontend.py:1587 @@ -1382,7 +1382,7 @@ msgid "" "X2Go Session has terminated\n" "%s" msgstr "" -"Se ha finalizado la sesión X2go\n" +"Se ha finalizado la sesión X2Go\n" "%s" #: ../pyhoca/wxgui/messages.py:73 diff --git a/po/fr.po b/po/fr.po index 636eff8..edc7156 100644 --- a/po/fr.po +++ b/po/fr.po @@ -151,7 +151,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" @@ -163,7 +163,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" @@ -1121,7 +1121,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" #: ../pyhoca/wxgui/frontend.py:1370 diff --git a/po/nb_NO.po b/po/nb_NO.po index 0a8c4cd..c3deebe 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -154,10 +154,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Holder på med å koble deg til X2Go serveren ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -170,10 +170,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Klient for å koble deg til en ekstern X2Go server" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1156,7 +1156,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den " "eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet." diff --git a/po/nl.po b/po/nl.po index af1e219..7609837 100644 --- a/po/nl.po +++ b/po/nl.po @@ -154,10 +154,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbinding met X2Go server ,,%s'' wordt gemaakt" #: ../pyhoca/wxgui/taskbar.py:103 @@ -168,10 +168,10 @@ msgstr "Bezig je te verbinden met X2Go ..." #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Verbinding met remote X2Go server aan het opbouwen" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -980,7 +980,7 @@ msgstr "%s - server waarschuwing" #: ../pyhoca/wxgui/frontend.py:562 msgid "The X2Go Server does not publish an application menu." -msgstr "De X2go server publiceert geen applicatie menu" +msgstr "De X2Go server publiceert geen applicatie menu" #: ../pyhoca/wxgui/frontend.py:613 msgid "SSH key authentication has been successful." @@ -1152,10 +1152,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"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." +"X2Go/SSH server. Session startup failed." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format diff --git a/po/ru.po b/po/ru.po index 531b6c0..5d48cde 100644 --- a/po/ru.po +++ b/po/ru.po @@ -158,10 +158,10 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Соединяет Вас с удаленным сервером X2Go ,,%s''" #: ../pyhoca/wxgui/taskbar.py:103 @@ -172,10 +172,10 @@ msgstr "Соединяет Вас с X2Go..." #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Для соединения с удаленным сервером X2Go" #: ../pyhoca/wxgui/profilemanager.py:79 @@ -1156,10 +1156,10 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Запрос туннеля к серверу [%s]:%s для сессии %s был отклонен удаленным " -"сервером X2go/SSH. Запуск сессии не удался." +"сервером X2Go/SSH. Запуск сессии не удался." #: ../pyhoca/wxgui/frontend.py:1370 #, python-format diff --git a/po/sv.po b/po/sv.po index c956385..6116dbf 100644 --- a/po/sv.po +++ b/po/sv.po @@ -153,7 +153,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:93 #, python-format msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" "PyHoca-GUI (Python X2Go-klient)\n" @@ -169,7 +169,7 @@ msgstr "" #: ../pyhoca/wxgui/taskbar.py:107 msgid "" -"PyHoca-GUI (Python X2goClient)\n" +"PyHoca-GUI (Python X2Go Client)\n" "Client for connecting you to a remote X2Go server" msgstr "" "PyHoca-GUI (Python X2Go-klient)\n" @@ -1150,7 +1150,7 @@ msgstr "" #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " -"X2go/SSH server. Session startup failed." +"X2Go/SSH server. Session startup failed." msgstr "" "Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. " "Sessionsstart misslyckades." diff --git a/pyhoca-gui b/pyhoca-gui index 0486314..c077301 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -193,7 +193,7 @@ debug_options = [ {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', }, {'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', }, {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2Go module', }, - {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', }, + {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2Go\'s sFTP server code (very verbose, and even promiscuous)', }, {'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', }, ] x2go_gui_options = [ diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 07ea039..5003972 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -32,7 +32,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go # wxPython diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index a77672b..fbb8539 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -36,7 +36,7 @@ except: pass import os -# Python X2go +# Python X2Go import x2go import gevent import gevent.monkey @@ -129,7 +129,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): L{PyHocaCLI} constructor for logging application events @type logger: Python X2Go C{X2goLogger} instance @param liblogger: you can pass an L{X2goLogger} object to the - L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2goClient} class in Python X2Go + L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2goClient. class in Python X2Go. @type liblogger: Python X2Go C{X2goLogger} instance @param appname: name of the application instance @type appname: C{str} @@ -1204,7 +1204,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self.OnExit(evt) ## - ## Python X2Go (X2goClient) interactive HOOK's... + ## Python X2Go (X2Go Client) interactive HOOK's... ## def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA', **kwargs): """\ @@ -1266,7 +1266,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): return _print_action ## - ## Python X2Go (X2goClient) notification HOOK's... + ## Python X2Go (X2Go Client) notification HOOK's... ## # this hook gets called from Python X2Go classes if profile_name's control session has died... @@ -1352,7 +1352,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): @type chain_port: C{str} """ - self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000) + self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2Go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000) if not self._hide_notifications_map.has_key(profile_name): self._hide_notifications_map[profile_name] = [] self._hide_notifications_map[profile_name].append(session_name) @@ -1582,7 +1582,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): """ self._enable_session_name(profile_name, session_name) - # avoid notification if X2goClient.clean_sessions has been used to terminate sessions + # avoid notification if X2Go Client.clean_sessions has been used to terminate sessions if self._hide_notifications_map.has_key(profile_name) and session_name in self._hide_notifications_map[profile_name]: self._hide_notifications_map[profile_name].remove(session_name) if not self._hide_notifications_map[profile_name]: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index fca8600..36ac3d9 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -30,7 +30,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go # gevent diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 144380f..975c52d 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -30,7 +30,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go # gevent diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index f79feca..d9763d7 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -30,7 +30,7 @@ try: wxversion.select('2.8') except: pass -# Python X2go +# Python X2Go import x2go import gevent @@ -90,7 +90,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): else: icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') - self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name) + self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name) def SetIconIdle(self): """\ @@ -104,7 +104,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): else: icon_name = self._PyHocaGUI.tray_icon self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='pyhoca-trayicon') - self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server")) + self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nClient for connecting you to a remote X2Go server")) def CreateSessionManagerPopupMenu(self, evt): """\ 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)).