X2Go dev team | 4 Jan 11:40 2013

pyhoca-gui.git - master (branch) updated: 0.2.1.1-9-ga28643b

The branch, master has been updated
       via  a28643bee58961bbe0e21e3f48351647a3d343eb (commit)
       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 -----------------------------------------------------------------
commit a28643bee58961bbe0e21e3f48351647a3d343eb
Author: Mike Gabriel <mike.gabriel <at> das-netzwerkteam.de>
Date:   Fri Jan 4 11:41:28 2013 +0100

    fix __doc__ strings

commit 180484c4a26461ce3916920af70a3d496d3f58b4
Author: Mike Gabriel <mike.gabriel <at> das-netzwerkteam.de>
Date:   Fri Jan 4 11:40:25 2013 +0100

    replace all remaining occurrences of X2go with X2Go

-----------------------------------------------------------------------

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       |   14 ++--
 pyhoca/wxgui/logon.py          |    2 +-
 pyhoca/wxgui/profilemanager.py |  175 ++++++++++------------------------------
 pyhoca/wxgui/sessiontitle.py   |    2 +-
 pyhoca/wxgui/taskbar.py        |    6 +-
 20 files changed, 124 insertions(+), 217 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
 <at>  <at>  -54,7 +54,7  <at>  <at>  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
 <at>  <at>  -266,7 +266,7  <at>  <at>  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
 <at>  <at>  -8,7 +8,7  <at>  <at>  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 <at> ADDRESS>\n"
 "Language-Team: LANGUAGE <LL <at> li.org>\n"
 <at>  <at>  -47,7 +47,7  <at>  <at>  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 ""
 <at>  <at>  -147,7 +147,7  <at>  <at>  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 ""

 <at>  <at>  -159,7 +159,7  <at>  <at>  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 ""

 <at>  <at>  -1117,7 +1117,7  <at>  <at>  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
 <at>  <at>  -1298,14 +1298,14  <at>  <at>  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"
 <at>  <at>  -1315,15 +1315,15  <at>  <at>  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
 <at>  <at>  -151,7 +151,7  <at>  <at>  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 ""

 <at>  <at>  -163,7 +163,7  <at>  <at>  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 ""

 <at>  <at>  -1121,7 +1121,7  <at>  <at>  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
 <at>  <at>  -163,10 +163,10  <at>  <at>  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
 <at>  <at>  -179,10 +179,10  <at>  <at>  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
 <at>  <at>  -1169,7 +1169,7  <at>  <at>  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
 <at>  <at>  -155,10 +155,10  <at>  <at>  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
 <at>  <at>  -169,10 +169,10  <at>  <at>  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
 <at>  <at>  -1159,9 +1159,9  <at>  <at>  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
 <at>  <at>  -153,10 +153,10  <at>  <at>  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
 <at>  <at>  -169,10 +169,10  <at>  <at>  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
 <at>  <at>  -1151,10 +1151,10  <at>  <at>  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
 <at>  <at>  -68,7 +68,7  <at>  <at>  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
 <at>  <at>  -160,10 +160,10  <at>  <at>  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
 <at>  <at>  -176,11 +176,11  <at>  <at>  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)"
 <at>  <at>  -1151,7 +1151,7  <at>  <at>  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
 <at>  <at>  -1167,10 +1167,10  <at>  <at>  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
 <at>  <at>  -1317,7 +1317,7  <at>  <at>  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
 <at>  <at>  -1340,7 +1340,7  <at>  <at>  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
 <at>  <at>  -1368,7 +1368,7  <at>  <at>  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
 <at>  <at>  -1382,7 +1382,7  <at>  <at>  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
 <at>  <at>  -151,7 +151,7  <at>  <at>  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 ""

 <at>  <at>  -163,7 +163,7  <at>  <at>  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 ""

 <at>  <at>  -1121,7 +1121,7  <at>  <at>  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
 <at>  <at>  -154,10 +154,10  <at>  <at>  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
 <at>  <at>  -170,10 +170,10  <at>  <at>  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
 <at>  <at>  -1156,7 +1156,7  <at>  <at>  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
 <at>  <at>  -154,10 +154,10  <at>  <at>  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
 <at>  <at>  -168,10 +168,10  <at>  <at>  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
 <at>  <at>  -980,7 +980,7  <at>  <at>  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."
 <at>  <at>  -1152,10 +1152,10  <at>  <at>  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
 <at>  <at>  -158,10 +158,10  <at>  <at>  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
 <at>  <at>  -172,10 +172,10  <at>  <at>  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
 <at>  <at>  -1156,10 +1156,10  <at>  <at>  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
 <at>  <at>  -153,7 +153,7  <at>  <at>  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"
 <at>  <at>  -169,7 +169,7  <at>  <at>  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"
 <at>  <at>  -1150,7 +1150,7  <at>  <at>  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
 <at>  <at>  -193,7 +193,7  <at>  <at>  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
 <at>  <at>  -32,7 +32,7  <at>  <at>  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..328941c 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
 <at>  <at>  -36,7 +36,7  <at>  <at>  except: pass

 import os

-# Python X2go
+# Python X2Go
 import x2go
 import gevent
 import gevent.monkey
 <at>  <at>  -126,10 +126,10  <at>  <at>  class PyHocaGUI(wx.App, x2go.X2goClient):
          <at> param args: a class with properties representing the command-line options that are available to
L{PyHocaGUI} instances.
          <at> type args: C{argparse.ArgumentParser} (or similar)
          <at> param logger: you can pass an L{X2goLogger} object to the
-            L{PyHocaCLI} constructor for logging application events
+            L{PyHocaGUI} constructor for logging application events
          <at> type logger: Python X2Go C{X2goLogger} instance
          <at> 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{PyHocaGUI} constructor for logging application events, this object is forwarded to the
C{X2goClient. class in Python X2Go.
          <at> type liblogger: Python X2Go C{X2goLogger} instance
          <at> param appname: name of the application instance
          <at> type appname: C{str}
 <at>  <at>  -1204,7 +1204,7  <at>  <at>  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):
         """\
 <at>  <at>  -1266,7 +1266,7  <at>  <at>  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...
 <at>  <at>  -1352,7 +1352,7  <at>  <at>  class PyHocaGUI(wx.App, x2go.X2goClient):
          <at> 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)
 <at>  <at>  -1582,7 +1582,7  <at>  <at>  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
 <at>  <at>  -30,7 +30,7  <at>  <at>  try:
     wxversion.select('2.8')
 except: pass

-# Python X2go
+# Python X2Go
 import x2go

 # gevent
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 0d3dde5..0a05d91 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
 <at>  <at>  -149,19 +149,31  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             # allow localization of the default keyboard settings
             self.profile_name = self.profile_config['name'] = profile_name

+        # this code block is for compatibility of session profiles prior to 0.2.2.0:
+        _from_host = _from_port = _to_host = _to_port = None
+        if self.profile_config.has_key('sshproxytunnel'):
+            if self.profile_config['sshproxytunnel'].count(':') == 2:
+                _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
+                _from_host = 'localhost'
+            elif self.profile_config['sshproxytunnel'].count(':') == 3:
+                _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
+
+            if _to_host: self.profile_config['host'] = _to_host
+            if _to_port: self.profile_config['sshport'] = int(_to_port)
+
         # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
         self.profile_config_bak = copy.deepcopy(self.profile_config)

         self._last_rdpclient = self.profile_config['rdpclient']
         self._last_application = self.applicationChoices['TERMINAL']

-        self.X2goTabs = wx.Notebook(self, -1, style=0)
-        self.tab_Profile = wx.Panel(self.X2goTabs, -1)
-        self.tab_Session = wx.Panel(self.X2goTabs, -1)
-        self.tab_Connection = wx.Panel(self.X2goTabs, -1)
-        self.tab_LinkQuality = wx.Panel(self.X2goTabs, -1)
-        self.tab_Settings = wx.Panel(self.X2goTabs, -1)
-        self.tab_SharedResources = wx.Panel(self.X2goTabs, -1)
+        self.X2GoTabs = wx.Notebook(self, -1, style=0)
+        self.tab_Profile = wx.Panel(self.X2GoTabs, -1)
+        self.tab_Session = wx.Panel(self.X2GoTabs, -1)
+        self.tab_Connection = wx.Panel(self.X2GoTabs, -1)
+        self.tab_LinkQuality = wx.Panel(self.X2GoTabs, -1)
+        self.tab_Settings = wx.Panel(self.X2GoTabs, -1)
+        self.tab_SharedResources = wx.Panel(self.X2GoTabs, -1)

         # boxes for all tabs
         self.staticbox_Profile = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Title'))
 <at>  <at>  -261,12 +273,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
         self.SSHProxyPortLabel = wx.StaticText(self.tab_Connection, -1, _(u"Port")+": ")
         self.SSHProxyPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534)
-        self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, _(u"SSH Proxy Tunnel")+": ")
-        self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20))
-        self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "44444", min=1, max=65534)
-        self.SSHProxyTunnelBetweenLabel = wx.StaticText(self.tab_Connection, -1, " -> ")
-        self.SSHProxyTunnelToHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20))
-        self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "22", min=1, max=65534)
         self.SSHProxyAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent
for proxy authentication"))

         self.LinkSpeed = wx.Slider(self.tab_LinkQuality, -1, 0, 0, 4)
 <at>  <at>  -367,8 +373,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySameUser, self.SSHProxySameUser)
         self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxySamePassword, self.SSHProxySamePassword)
         self.Bind(wx.EVT_CHECKBOX, self.OnSSHProxyAutoLogin, self.SSHProxyAutoLogin)
-        self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromHost, self.SSHProxyTunnelFromHost)
-        self.Bind(wx.EVT_TEXT, self.OnUpdateSSHProxyTunnelFromPort, self.SSHProxyTunnelFromPort)
         self.Bind(wx.EVT_COMBOBOX, self.OnCompressionSelected, self.Compression)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayFullscreen, self.DisplayTypeFullscreen)
         self.Bind(wx.EVT_RADIOBUTTON, self.OnSetDisplayMaximize, self.DisplayTypeMaximize)
 <at>  <at>  -458,11 +462,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHProxyPortLabel.SetMinSize((-1, 16))
         self.SSHProxyPort.SetMinSize((65, self._textfield_height))
         self.SSHProxyKeyFile.SetMinSize((220, self._textfield_height))
-        self.SSHProxyTunnelLabel.SetMinSize((-1, 16))
-        self.SSHProxyTunnelFromPort.SetMinSize((65, self._textfield_height))
-        self.SSHProxyTunnelToPort.SetMinSize((65, self._textfield_height))
-        self.SSHProxyTunnelFromHost.SetMinSize((140, self._textfield_height))
-        self.SSHProxyTunnelToHost.SetMinSize((140, self._textfield_height))
         if X2GOCLIENT_OS == 'Windows':
             self.LinkSpeed.SetMinSize((425, self._textfield_height))
         else:
 <at>  <at>  -602,18 +601,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_3_2_1_1.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1_1.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1_1.Add((4, 0))
-        sizer_3_2_1_1.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1_1.Add((8, 0))
-        sizer_3_2_1_1.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL)
-        sizer_3_2_1_1.Add((8, 0))
-        sizer_3_2_1_1.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1_1.Add((4, 0))
-        sizer_3_2_1_1.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1_1.Add((0,32))
-        sizer_3_2_1.Add(sizer_3_2_1_1, pos=(5,0), span=(1,6))
         sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7)

         sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5)
 <at>  <at>  -794,12 +781,12  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         self.tab_SharedResources.SetSizerAndFit(sizer_6)
         self.tab_SharedResources.Layout()

-        self.X2goTabs.AddPage(self.tab_Profile, _(u"Profile"))
-        self.X2goTabs.AddPage(self.tab_Session, _(u"Session"))
-        self.X2goTabs.AddPage(self.tab_Connection, _(u"Connection"))
-        self.X2goTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality"))
-        self.X2goTabs.AddPage(self.tab_Settings, _(u"Settings"))
-        self.X2goTabs.AddPage(self.tab_SharedResources, _(u"Sharing"))
+        self.X2GoTabs.AddPage(self.tab_Profile, _(u"Profile"))
+        self.X2GoTabs.AddPage(self.tab_Session, _(u"Session"))
+        self.X2GoTabs.AddPage(self.tab_Connection, _(u"Connection"))
+        self.X2GoTabs.AddPage(self.tab_LinkQuality, _(u"Link Quality"))
+        self.X2GoTabs.AddPage(self.tab_Settings, _(u"Settings"))
+        self.X2GoTabs.AddPage(self.tab_SharedResources, _(u"Sharing"))

         # the bottom area with OK, Defaults and Cancel buttons
         sizer_B = wx.BoxSizer(wx.HORIZONTAL)
 <at>  <at>  -811,7 +798,7  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):

         # put it all together...
         MainSizer = wx.BoxSizer(wx.VERTICAL)
-        MainSizer.Add(self.X2goTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE)
+        MainSizer.Add(self.X2GoTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE)
         MainSizer.Add(sizer_B, flag=wx.ALIGN_RIGHT)
         self.SetSizerAndFit(MainSizer)

 <at>  <at>  -822,7 +809,7  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         max5_x, max5_y = self.tab_Settings.GetBestSize()
         max6_x, max6_y = self.tab_SharedResources.GetBestSize()

-        #self.SetSize(self.GetBestSize() + self.X2goTabs.GetBestSize())
+        #self.SetSize(self.GetBestSize() + self.X2GoTabs.GetBestSize())

         if X2GOCLIENT_OS == "Windows":
             self.SetSize((max(max1_x, max2_x, max3_x, max4_x, max5_x) * 1.05, max(max1_y, max2_y, max3_y,
max4_y, max5_y) * 1.10 + 50))
 <at>  <at>  -881,18 +868,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser'])
         self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile'])

-        _from_host = _from_port = _to_host = _to_port = None
-        if self.profile_config['sshproxytunnel'].count(':') == 2:
-            _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
-            _from_host = 'localhost'
-        elif self.profile_config['sshproxytunnel'].count(':') == 3:
-            _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':')
-
-        if _from_host: self.SSHProxyTunnelFromHost.SetValue(_from_host)
-        if _from_port: self.SSHProxyTunnelFromPort.SetValue(int(_from_port))
-        if _to_host: self.SSHProxyTunnelToHost.SetValue(_to_host)
-        if _to_port: self.SSHProxyTunnelToPort.SetValue(int(_to_port))
-
         self.UseSSHProxy.SetValue(_ssh_proxy)
         self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser'])
         self.SSHProxySamePassword.SetValue(self.profile_config['sshproxysamepass'])
 <at>  <at>  -1246,12 +1221,12  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHProxyHost.Enable(False)
             self.SSHProxyPortLabel.Enable(False)
             self.SSHProxyPort.Enable(False)
-            self.SSHProxyTunnelLabel.Enable(False)
-            self.SSHProxyTunnelFromHost.Enable(False)
-            self.SSHProxyTunnelFromPort.Enable(False)
-            self.SSHProxyTunnelBetweenLabel.Enable(False)
-            self.SSHProxyTunnelToHost.Enable(False)
-            self.SSHProxyTunnelToPort.Enable(False)
+            #self.SSHProxyTunnelLabel.Enable(False)
+            #self.SSHProxyTunnelFromHost.Enable(False)
+            #self.SSHProxyTunnelFromPort.Enable(False)
+            #self.SSHProxyTunnelBetweenLabel.Enable(False)
+            #self.SSHProxyTunnelToHost.Enable(False)
+            #self.SSHProxyTunnelToPort.Enable(False)
             self.SSHProxyAutoLogin.Enable(False)

 
 <at>  <at>  -1281,13 +1256,11  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.profile_config['icon'] = ':icons/128x128/x2gosession.png'
         self.profile_config['user'] = self.UserName.GetValue()
         self.profile_config['key'] = self.SSHKeyFile.GetValue()
+        self.profile_config['host'] = self.Host.GetValue()
         if self.UseSSHProxy.GetValue():
             self.profile_config['usesshproxy'] = True
-            self.profile_config['host'] = self.SSHProxyTunnelFromHost.GetValue()
-            self.profile_config['sshport'] = self.SSHProxyTunnelFromPort.GetValue()
         else:
             self.profile_config['usesshproxy'] = False
-            self.profile_config['host'] = self.Host.GetValue()
             if _session_type != 'DirectRDP':
                 self.profile_config['sshport'] = self.SSHPort.GetValue()
         self.profile_config['sshproxysameuser'] = self.SSHProxySameUser.GetValue()
 <at>  <at>  -1295,11 +1268,7  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):

         self.profile_config['sshproxyhost'] = self.SSHProxyHost.GetValue()
         self.profile_config['sshproxyport'] = self.SSHProxyPort.GetValue()
-        self.profile_config['sshproxytunnel'] = '%s:%s:%s:%s' % (self.SSHProxyTunnelFromHost.GetValue(),
-                                                                 self.SSHProxyTunnelFromPort.GetValue(),
-                                                                 self.SSHProxyTunnelToHost.GetValue(),
-                                                                 self.SSHProxyTunnelToPort.GetValue(),
-                                                                )
+        self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_REMOVED'
         self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue()
         if self.profile_config['sshproxysameuser']:
             self.profile_config['sshproxyuser'] = ''
 <at>  <at>  -1521,12 +1490,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHProxyHost.Enable(False)
         self.SSHProxyPortLabel.Enable(False)
         self.SSHProxyPort.Enable(False)
-        self.SSHProxyTunnelLabel.Enable(False)
-        self.SSHProxyTunnelFromHost.Enable(False)
-        self.SSHProxyTunnelFromPort.Enable(False)
-        self.SSHProxyTunnelBetweenLabel.Enable(False)
-        self.SSHProxyTunnelToHost.Enable(False)
-        self.SSHProxyTunnelToPort.Enable(False)
         self.SSHProxyAutoLogin.Enable(False)
         self.LinkSpeed.Enable(False)
         self.ModemLabel.Enable(False)
 <at>  <at>  -1566,14 +1529,11  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
          <at> type event: C{obj}

         """
-        if not self.UseSSHProxy.GetValue():
-            self.HostLabel.Enable(True)
-            self.Host.Enable(True)
-            self.SSHPortLabel.Enable(True)
-            self.SSHPort.Enable(True)
-            self.SSHPort.SetValue(self.profile_config_bak['sshport'])
-        else:
-            self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
+        self.HostLabel.Enable(True)
+        self.Host.Enable(True)
+        self.SSHPortLabel.Enable(True)
+        self.SSHPort.Enable(True)
+        self.SSHPort.SetValue(self.profile_config_bak['sshport'])
         self.SSHAutoLogin.Enable(True)
         if PARAMIKO_FEATURE['forward-ssh-agent']:
             self.SSHForwardAuthAgent.Enable(True)
 <at>  <at>  -1956,18 +1916,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             if self.SSHProxyAutoLogin.GetValue():
                 self.SSHProxyKeyFileLabel.Enable(False)
             self.SSHProxyAutoLogin.Enable(True)
-            self.SSHProxyTunnelLabel.Enable(True)
-            self.SSHProxyTunnelFromHost.Enable(True)
-            self.SSHProxyTunnelFromPort.Enable(True)
-            self.SSHProxyTunnelBetweenLabel.Enable(True)
-            self.SSHProxyTunnelToHost.Enable(True)
-            self.SSHProxyTunnelToPort.Enable(True)
-            self.Host.Enable(False)
-            self.HostLabel.Enable(False)
-            self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue())
-            self.SSHPort.Enable(False)
-            self.SSHPortLabel.Enable(False)
-            self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
         else:
             self.staticbox_Proxy.Enable(False)
             self.SSHProxySameUser.Enable(False)
 <at>  <at>  -1988,32 +1936,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHProxyTunnelToHost.Enable(False)
             self.SSHProxyTunnelToPort.Enable(False)
             self.SSHProxyAutoLogin.Enable(False)
-            self.Host.Enable(True)
-            self.HostLabel.Enable(True)
-            self.Host.SetValue(self.profile_config_bak['host'])
-            self.SSHPort.Enable(True)
-            self.SSHPortLabel.Enable(True)
-            self.SSHPort.SetValue(self.profile_config_bak['sshport'])
-
-    def OnUpdateSSHProxyTunnelFromHost(self, event):
-        """\
-        Gets called whenever the ssh-proxy-tunnel-from-host gets modified.
-
-         <at> param event: event
-         <at> type event: C{obj}
-
-        """
-        self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue())
-
-    def OnUpdateSSHProxyTunnelFromPort(self, event):
-        """\
-        Gets called whenever the ssh-proxy-tunnel-from-port gets modified.
-
-         <at> param event: event
-         <at> type event: C{obj}
-
-        """
-        self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())

     def OnSetKeyboard(self, event):
         """\
 <at>  <at>  -2048,7 +1970,7  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.KeyboardModel.Enable(False)
             self.KeyboardVariant.Enable(False)

-    def OnSoundEnable(self, event): # wxGlade: X2goMaintProfile.<event_handler>
+    def OnSoundEnable(self, event):
         """\
         Gets called whenever the enable-sound checkbox gets marked.

 <at>  <at>  -2352,21 +2274,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         elif self.profile_config['name'].strip() != self.profile_config_bak['name'] and
self.profile_config['name'] in self.session_profiles.profile_names:
             validateOk = False
             self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Profile name %s already
exists!!!') % self.profile_config['name'].strip(), icon='profile_error')
-        elif self.profile_config['usesshproxy'] and self.profile_config['name'] == self.profile_config_bak['name']:
-            try:
-                (from_host, from_port) = self.profile_config['sshproxytunnel'].split(':')[0:2]
-            except ValueError:
-                self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'The SSH proxy
configuration is incomplete. Try again.'), icon='profile_error')
-            for profile_name in [ p for p in self._PyHocaGUI.profile_names if p != self.profile_config['name'] ]:
-                test_profile_config = self.session_profiles.get_profile_config(profile_name)
-                if test_profile_config['usesshproxy']:
-                    try:
-                        (test_from_host, test_from_port) = test_profile_config['sshproxytunnel'].split(':')[0:2]
-                    except ValueError:
-                        continue
-                    if (from_host, from_port) == (test_from_host, test_from_port):
-                        validateOk = False
-                        self._PyHocaGUI.notifier.send(title=_(u'Profile Manager'), text=_(u'Another session profile
(%s) already uses [%s]:%s for binding a local SSH proxy to.\nPlease change the SSH proxy settings
accordingly.' % (profile_name.strip(), from_host, from_port)), icon='profile_warning')
         return validateOk

     def OnOKButton(self, event):
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
 <at>  <at>  -30,7 +30,7  <at>  <at>  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
 <at>  <at>  -30,7 +30,7  <at>  <at>  try:
     wxversion.select('2.8')
 except: pass

-# Python X2go
+# Python X2Go
 import x2go

 import gevent
 <at>  <at>  -90,7 +90,7  <at>  <at>  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):
         """\
 <at>  <at>  -104,7 +104,7  <at>  <at>  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)).

_______________________________________________
X2go-commits mailing list
X2go-commits <at> lists.berlios.de
https://lists.berlios.de/mailman/listinfo/x2go-commits

Gmane