[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.0.4-31-g2c5b98f

The branch, master has been updated via 2c5b98f0c3db1dd83e6789e6e4bff172ecab4a50 (commit) via c64bf0c058790384308e91503ee7a8e975ed0489 (commit) from 723ccbb41ce920aa9434d613a21ddbb7a4c551d9 (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 2c5b98f0c3db1dd83e6789e6e4bff172ecab4a50 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 29 01:43:46 2012 +0200 rebuild i18n data commit c64bf0c058790384308e91503ee7a8e975ed0489 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 29 01:42:21 2012 +0200 rework session profile manager ----------------------------------------------------------------------- Summary of changes: build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 24492 -> 24616 bytes build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 22910 -> 23032 bytes build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 23585 -> 23585 bytes build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 22553 -> 22553 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 22413 -> 22413 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 21992 -> 21992 bytes po/PyHoca-GUI.pot | 58 +++--- po/bg.po | 58 +++--- po/de.po | 60 +++--- po/en.po | 60 +++--- po/es.po | 59 +++--- po/fr.po | 58 +++--- po/nb_NO.po | 59 +++--- po/nl.po | 59 +++--- po/ru.po | 59 +++--- po/sv.po | 59 +++--- pyhoca/wxgui/profilemanager.py | 297 ++++++++++++++++++++---------- 18 files changed, 516 insertions(+), 370 deletions(-) The diff of changes is: diff --git a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo index 6d1ae92..ce612f7 100644 Binary files a/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/de/LC_MESSAGES/PyHoca-GUI.mo index 384d564..4580370 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 bb09f18..0f4d85f 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 e178c83..f0dbae7 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/nb_NO/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo index abd0d06..ace1150 100644 Binary files a/build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/nb_NO/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 543f012..1f32405 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/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo index d91d2b2..4d4e446 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 2218fca..54ab0c7 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-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\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" @@ -203,6 +203,10 @@ msgstr "" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "" +#: ../pyhoca/wxgui/profilemanager.py:93 +msgid "Windows Terminal Server (Direct RDP)" +msgstr "" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "" @@ -558,13 +562,13 @@ msgid "Reset" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "" @@ -602,62 +606,62 @@ msgstr "" msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -665,21 +669,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/bg.po b/po/bg.po index c296d13..393840d 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: Bulgarian <chepati@yahoo.com>\n" @@ -207,6 +207,10 @@ msgstr "" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "" +#: ../pyhoca/wxgui/profilemanager.py:93 +msgid "Windows Terminal Server (Direct RDP)" +msgstr "" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "" @@ -562,13 +566,13 @@ msgid "Reset" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "" @@ -606,62 +610,62 @@ msgstr "" msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -669,21 +673,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/de.po b/po/de.po index 33632e9..5e52fc6 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: 2012-09-28 17:33+0200\n" -"PO-Revision-Date: 2012-09-28 17:33+0100\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"PO-Revision-Date: 2012-09-29 01:43+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: de <mike.gabriel@das-netzwerkteam.de>\n" "Language: \n" @@ -215,6 +215,10 @@ msgstr "XDMCP-Serveranfrage (Query)" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminalserver (RDP via X2Go-Proxy)" +#: ../pyhoca/wxgui/profilemanager.py:93 +msgid "Windows Terminal Server (Direct RDP)" +msgstr "Windows Terminal Server (Direktes RDP)" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Benutzerdef. Kommando" @@ -576,13 +580,13 @@ msgid "Reset" msgstr "Zurücksetzen" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "automatisch" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "manuell" @@ -620,63 +624,63 @@ msgstr "Einstellungen" msgid "Sharing" msgstr "Ordnerfreigabe" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "pc105/de" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "de" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "nodeadkeys" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "Alle Dateien (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "Öffentlichen SSH-Schlüssel auswählen" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "Ordner zur Freigabe für Sitzungen auswählen" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profilmanager" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "Ein Sitzungsprofil mit dem Namen %s existiert bereits!!!" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "Die SSH Proxy Konfiguration ist unvollständig. Bitte nochmal versuchen." -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -687,21 +691,21 @@ msgstr "" "einen lokalen SSH Proxy Port daran zu binden. Bitte die SSH Proxy " "Einstellungen entsprechend ändern." -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "%s - Profil hinzugefügt" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "Ein neues Sitzungsprofil wurde hinzugefügt." -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "%s - modifiziert" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "Änderungen am Profil wurden übernommen." diff --git a/po/en.po b/po/en.po index d35b0d6..15d2d55 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: 2012-09-28 17:33+0200\n" -"PO-Revision-Date: 2012-09-28 17:33+0100\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" +"PO-Revision-Date: 2012-09-29 01:43+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: en <mike.gabriel@das-netzwerkteam.de>\n" "Language: \n" @@ -215,6 +215,10 @@ msgstr "XDMCP Query" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminal Server (X2Go-proxied RDP)" +#: ../pyhoca/wxgui/profilemanager.py:93 +msgid "Windows Terminal Server (Direct RDP)" +msgstr "Windows Terminal Server (Direct RDP)" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Custom command" @@ -572,13 +576,13 @@ msgid "Reset" msgstr "Reset" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "automatically" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "manually" @@ -616,62 +620,62 @@ msgstr "Settings" msgid "Sharing" msgstr "Sharing" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "basic" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Files (*.png)|*.png|All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "Choose an icon for this session profile" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "All files (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "Choose a public SSH key" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "Choose a folder to share within a session" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "Profile name is missing, profile unusable!!!" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profile name %s already exists!!!" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "The SSH proxy configuration is incomplete. Try again." -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -682,21 +686,21 @@ msgstr "" "proxy to.\n" "Please change the SSH proxy settings accordingly." -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "%s - profile added" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "A new session profile has been added." -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "%s - modified" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "Changes to profile have been saved." diff --git a/po/es.po b/po/es.po index 7c81d9b..4a9f3cc 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" "PO-Revision-Date: 2012-06-01 09:28+0200\n" "Last-Translator: Ricardo Díaz Martín <oceanosoftlapalma@gmail.com>\n" "Language-Team: Español; Castellano <>\n" @@ -223,6 +223,11 @@ msgstr "XDMCP Query" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:93 +#, fuzzy +msgid "Windows Terminal Server (Direct RDP)" +msgstr "Windows Terminal Server (RDP-proxy)" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Comando personalizado" @@ -582,13 +587,13 @@ msgid "Reset" msgstr "Reiniciar" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "automáticamente" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "manualmente" @@ -626,64 +631,64 @@ msgstr "Opciones" msgid "Sharing" msgstr "Compartir" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Iconos (*.png)|*.png|Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "Elige un icono para este perfil de sesión" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "Todos (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "Elige una clave pública SSH" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "Elige la carpeta que quieres compartir en la conexión" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Gestor de Perfiles" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "¡¡¡Nombre de pefil no encontrado o no válido!!!" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "El perfil de usuario %s ya existe!!!" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" "El protocolo de autenticación de comunicaciones está incompleto. Inténtalo " "otra vez." -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -694,21 +699,21 @@ msgstr "" "al proxy SSH local.\n" "Por favor, cambia los parámetros del proxy SSH en base a esta información." -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "%s - perfil añadido" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "Se ha añadido un nuevo perfil de sesión." -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "%s - modificado" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "Se han guardado los cambios en el perfil." diff --git a/po/fr.po b/po/fr.po index 5496dee..cdd0939 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" "PO-Revision-Date: 2011-09-17 02:17+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: Renaud Gaudin <rgaudin@gmail.com>\n" @@ -207,6 +207,10 @@ msgstr "" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "" +#: ../pyhoca/wxgui/profilemanager.py:93 +msgid "Windows Terminal Server (Direct RDP)" +msgstr "" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "" @@ -562,13 +566,13 @@ msgid "Reset" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "" @@ -606,62 +610,62 @@ msgstr "" msgid "Sharing" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -669,21 +673,21 @@ msgid "" "Please change the SSH proxy settings accordingly." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "" diff --git a/po/nb_NO.po b/po/nb_NO.po index 5ea2ded..43b8e9f 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" "PO-Revision-Date: 2012-06-03 14:30+0100\n" "Last-Translator: Terje Andersen <teranders@gmail.com>\n" "Language-Team: nb_NO <x2go-i18n@lists.berlios.de>\n" @@ -217,6 +217,11 @@ msgstr "XDMCP spørring" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:93 +#, fuzzy +msgid "Windows Terminal Server (Direct RDP)" +msgstr "Windows Terminal Server (RDP-proxy)" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Selvvalgt kommando" @@ -576,13 +581,13 @@ msgid "Reset" msgstr "Resett" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "automatisk" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "manuelt" @@ -620,62 +625,62 @@ msgstr "Innstillinger" msgid "Sharing" msgstr "Deling" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler(*.png)|*.png|Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "Velg et ikon for denne sesjonsprofilen" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "Alle filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "Velg en offentlig SSH nøkkel" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "Velg en mappe som skal deles i en sesjon" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profil håndterer" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnavnet mangler, profilen er ubrukelig!" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilnavnet %s eksisterer allerede!" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen." -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -686,21 +691,21 @@ msgstr "" "lokal SSH mellomtjener.\n" "Vennligst endre SSH mellomtjener innstillingene tilsvarende." -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "%s - profil lagt til" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "En ny sesjonsprofil har blitt lagt til." -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "%s - endret" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "Endringer til profilen har blitt lagret." diff --git a/po/nl.po b/po/nl.po index 7cdd890..31cdcd1 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: 2012-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" "PO-Revision-Date: 2012-06-10 21:16+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n" "Language-Team: nl <dick.kniep@lindix.nl>\n" @@ -215,6 +215,11 @@ msgstr "XDMCP Query" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminalserver (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:93 +#, fuzzy +msgid "Windows Terminal Server (Direct RDP)" +msgstr "Windows Terminalserver (RDP-proxy)" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Speciaal Commando" @@ -570,13 +575,13 @@ msgid "Reset" msgstr "Reset" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "automatisch" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "handmatig" @@ -614,62 +619,62 @@ msgstr "Instellingen" msgid "Sharing" msgstr "Delen" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "pc105/us" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "us" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "intl" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "Icon voor dit Profiel kiezen" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "Alle Bestanden (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "Kies een public SSH-key" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "Kies een map om te delen" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profiel manager" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "Profiel naam ontbreekt, kan niet gebruikt worden!!!" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profiel %s bestaat al" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..." -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -680,21 +685,21 @@ msgstr "" "SSH proxy.\n" "Verander de SSH proxy instelling om dit probleem te verhelpen." -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "%s - Profiel toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "Een nieuw Profiel is toegevoegd" -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "%s - gewijzigd" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "Wijzigingen in het profiel zijn opgeslagen." diff --git a/po/ru.po b/po/ru.po index 2a7de1c..a707128 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" "PO-Revision-Date: 2012-09-05 10:51+0200\n" "Last-Translator: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>\n" "Language-Team: Russian <x2go-i18n@lists.berlios.de>\n" @@ -219,6 +219,11 @@ msgstr "XDMCP Запрос" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Сервер терминалов Windows (RDP-прокси)" +#: ../pyhoca/wxgui/profilemanager.py:93 +#, fuzzy +msgid "Windows Terminal Server (Direct RDP)" +msgstr "Сервер терминалов Windows (RDP-прокси)" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Команда пользователя" @@ -574,13 +579,13 @@ msgid "Reset" msgstr "Восстановить" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "автоматически" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "в ручную" @@ -618,62 +623,62 @@ msgstr "Установки" msgid "Sharing" msgstr "Доступ" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "<xkbtype>" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "<xkblayout>" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "<xkbvariant>" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Графические файлы (*.png)|*.png|Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "Выбрать пиктограмму" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "Все файлы (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "Выбрать публичный ключ SSH" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "Выбрать экспортируемый каталог" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profile Manager" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "Имя профиля не установлено!!!" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "Профиль с именем %s существует!!!" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "Конфигурация SSH прокси не завершена. Попробуйте еще раз." -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -684,21 +689,21 @@ msgstr "" "прокси.\n" "Измените настройки SSH прокси." -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "%s - профиль добавлен" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "Новый профиль сессии добавлен." -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "%s - модифицирован" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "Изменения в профиле сохранены." diff --git a/po/sv.po b/po/sv.po index 0151bc2..78a1f63 100644 --- a/po/sv.po +++ b/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-28 17:33+0200\n" +"POT-Creation-Date: 2012-09-29 01:43+0200\n" "PO-Revision-Date: 2012-06-01 17:59+0100\n" "Last-Translator: Daniel Lindgren <dali.spam@gmail.com>\n" "Language-Team: Swedish <x2go-i18n@lists.berlios.de>\n" @@ -216,6 +216,11 @@ msgstr "XDMCP" msgid "Windows Terminal Server (X2Go-proxied RDP)" msgstr "Windows Terminal Server (RDP-proxy)" +#: ../pyhoca/wxgui/profilemanager.py:93 +#, fuzzy +msgid "Windows Terminal Server (Direct RDP)" +msgstr "Windows Terminal Server (RDP-proxy)" + #: ../pyhoca/wxgui/profilemanager.py:94 ../pyhoca/wxgui/profilemanager.py:227 msgid "Custom command" msgstr "Anpassat kommando" @@ -574,13 +579,13 @@ msgid "Reset" msgstr "Återställ" #: ../pyhoca/wxgui/profilemanager.py:396 -#: ../pyhoca/wxgui/profilemanager.py:1097 -#: ../pyhoca/wxgui/profilemanager.py:2006 +#: ../pyhoca/wxgui/profilemanager.py:1080 +#: ../pyhoca/wxgui/profilemanager.py:2107 msgid "automatically" msgstr "automatisk" #: ../pyhoca/wxgui/profilemanager.py:398 -#: ../pyhoca/wxgui/profilemanager.py:1099 +#: ../pyhoca/wxgui/profilemanager.py:1082 msgid "manually" msgstr "manuellt" @@ -618,62 +623,62 @@ msgstr "Inställningar" msgid "Sharing" msgstr "Delning" -#: ../pyhoca/wxgui/profilemanager.py:1015 +#: ../pyhoca/wxgui/profilemanager.py:950 msgid "<xkbtype>" msgstr "pc105" -#: ../pyhoca/wxgui/profilemanager.py:1016 +#: ../pyhoca/wxgui/profilemanager.py:951 msgid "<xkblayout>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:1017 +#: ../pyhoca/wxgui/profilemanager.py:952 msgid "<xkbvariant>" msgstr "se" -#: ../pyhoca/wxgui/profilemanager.py:1316 +#: ../pyhoca/wxgui/profilemanager.py:1373 msgid "Icon Files (*.png)|*.png|All files (*.*)|*" msgstr "Ikonfiler (*.png)|*.png|Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1319 +#: ../pyhoca/wxgui/profilemanager.py:1376 msgid "Choose an icon for this session profile" msgstr "Välj en ikon för denna sessionsprofil" -#: ../pyhoca/wxgui/profilemanager.py:1610 +#: ../pyhoca/wxgui/profilemanager.py:1697 msgid "All files (*.*)|*" msgstr "Alla filer (*.*)|*" -#: ../pyhoca/wxgui/profilemanager.py:1612 -#: ../pyhoca/wxgui/profilemanager.py:1636 +#: ../pyhoca/wxgui/profilemanager.py:1699 +#: ../pyhoca/wxgui/profilemanager.py:1723 msgid "Choose a public SSH key" msgstr "Välj en public SSH-nyckel" -#: ../pyhoca/wxgui/profilemanager.py:1958 +#: ../pyhoca/wxgui/profilemanager.py:2059 msgid "Choose a folder to share within a session" msgstr "Välj en mapp att dela i en session" -#: ../pyhoca/wxgui/profilemanager.py:2086 -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 -#: ../pyhoca/wxgui/profilemanager.py:2097 -#: ../pyhoca/wxgui/profilemanager.py:2107 ../pyhoca/wxgui/menus_taskbar.py:118 +#: ../pyhoca/wxgui/profilemanager.py:2187 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 +#: ../pyhoca/wxgui/profilemanager.py:2198 +#: ../pyhoca/wxgui/profilemanager.py:2208 ../pyhoca/wxgui/menus_taskbar.py:118 msgid "Profile Manager" msgstr "Profilhanterare" -#: ../pyhoca/wxgui/profilemanager.py:2086 +#: ../pyhoca/wxgui/profilemanager.py:2187 msgid "Profile name is missing, profile unusable!!!" msgstr "Profilnamn saknas, profil oanvändbar!" -#: ../pyhoca/wxgui/profilemanager.py:2089 -#: ../pyhoca/wxgui/profilemanager.py:2092 +#: ../pyhoca/wxgui/profilemanager.py:2190 +#: ../pyhoca/wxgui/profilemanager.py:2193 #, python-format msgid "Profile name %s already exists!!!" msgstr "Profilen %s finns redan!" -#: ../pyhoca/wxgui/profilemanager.py:2097 +#: ../pyhoca/wxgui/profilemanager.py:2198 msgid "The SSH proxy configuration is incomplete. Try again." msgstr "Konfigurationen av SSH-proxy är inte komplett. Försök igen." -#: ../pyhoca/wxgui/profilemanager.py:2107 +#: ../pyhoca/wxgui/profilemanager.py:2208 #, python-format msgid "" "Another session profile (%s) already uses [%s]:%s for binding a local SSH " @@ -684,21 +689,21 @@ msgstr "" "proxy.\n" "Ändra konfiguration för SSH-proxy ." -#: ../pyhoca/wxgui/profilemanager.py:2134 +#: ../pyhoca/wxgui/profilemanager.py:2235 #, python-format msgid "%s - profile added" msgstr "%s - profil tillagd" -#: ../pyhoca/wxgui/profilemanager.py:2135 +#: ../pyhoca/wxgui/profilemanager.py:2236 msgid "A new session profile has been added." msgstr "En ny sessionsprofil har lagts till." -#: ../pyhoca/wxgui/profilemanager.py:2139 +#: ../pyhoca/wxgui/profilemanager.py:2240 #, python-format msgid "%s - modified" msgstr "%s - ändrad" -#: ../pyhoca/wxgui/profilemanager.py:2140 +#: ../pyhoca/wxgui/profilemanager.py:2241 msgid "Changes to profile have been saved." msgstr "Ändringar av profil har sparats." diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 38e10fa..3e61ad5 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -90,7 +90,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): 'APPLICATION': _(u'Single Application'), 'XDMCP': _(u'XDMCP Query'), 'RDP': _(u'Windows Terminal Server (X2Go-proxied RDP)'), - 'DirectRDP': 'Windows Terminal Server (Direct RDP)', + 'DirectRDP': _(u'Windows Terminal Server (Direct RDP)'), 'CUSTOM': _(u'Custom command'), } if self.action == 'EDIT_CONNECTED': @@ -818,18 +818,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ProfileName.SetValue(self.profile_config['name']) self.SetSessionWindowTitle.SetValue(self.profile_config['setsessiontitle']) self.CustomSessionWindowTitle.SetValue(self.profile_config['sessiontitle']) - if not self.profile_config['setsessiontitle']: - self.CustomSessionWindowTitleLabel.Enable(False) - self.CustomSessionWindowTitle.Enable(False) - self.UseDefaultSessionWindowTitle.Enable(False) - else: - if self.profile_config['sessiontitle']: - self.UseDefaultSessionWindowTitle.SetValue(False) - else: - self.UseDefaultSessionWindowTitle.SetValue(True) - self.CustomSessionWindowTitleLabel.Enable(False) - self.CustomSessionWindowTitle.Enable(False) - self.Host.SetValue(self.profile_config['host']) self.UserName.SetValue(self.profile_config['user']) self.SSHPort.SetValue(self.profile_config['sshport']) @@ -872,7 +860,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UseSSHProxy.SetValue(_ssh_proxy) self.SSHProxySameUser.SetValue(self.profile_config['sshproxysameuser']) self.SSHProxySamePassword.SetValue(self.profile_config['sshproxysamepass']) - self.ToggleSSHProxy() + self._toggle_SSHProxy() self.AutoStartSession.SetValue(self.profile_config['autostart']) self.AutoLoginSessionProfile.SetValue(self.profile_config['autologin']) @@ -948,59 +936,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ImageQuality.SetValue(9) self.ImageQuality.Enable(False) - if _command == 'RDP': - if self.profile_config['directrdp']: - self.UseSSHProxy.SetValue(False) - self.ToggleSSHProxy() - self.enable_DirectRDP() - self.SSHPort.SetValue(self.profile_config['rdpport']) - self.RDPOptions.SetValue(self.profile_config['directrdpsettings']) - self.RDPServerLabel.Enable(True) - self.RDPServer.Enable(False) - self.RDPOptionsLabel.Enable(True) - self.RDPOptions.Enable(True) - self.UsePublishedApplications.SetValue(False) - self.UsePublishedApplications.Enable(False) - self.RootlessSession.SetValue(False) - self.RootlessSession.Enable(False) - else: - self.disable_DirectRDP() - self.RDPServerLabel.Enable(True) - self.RDPServer.Enable(True) - self.RDPOptionsLabel.Enable(True) - self.RDPOptions.Enable(True) - self.UsePublishedApplications.SetValue(False) - self.UsePublishedApplications.Enable(False) - self.RootlessSession.SetValue(False) - self.RootlessSession.Enable(False) - else: - self.disable_DirectRDP() - self.RDPServerLabel.Enable(False) - self.RDPServer.Enable(False) - self.RDPOptionsLabel.Enable(False) - self.RDPOptions.Enable(False) - - self.XDMCPServer.SetValue(self.profile_config['xdmcpserver']) - - self.DisplayTypeFullscreen.SetValue(self.profile_config['fullscreen'] and not self.profile_config['maxdim']) - self.DisplayTypeMaximize.SetValue(self.profile_config['maxdim']) - self.DisplayTypeCustom.SetValue(not (self.profile_config['fullscreen'] or self.profile_config['maxdim'])) - self.ScreenWidth.SetValue(self.profile_config['width']) - self.ScreenHeight.SetValue(self.profile_config['height']) - if self.profile_config['fullscreen']: - self.ScreenWidth.Enable(False) - self.ScreenHeight.Enable(False) - else: - self.ScreenWidth.Enable(True) - self.ScreenHeight.Enable(True) - - self.SetDisplayDPI.SetValue(self.profile_config['setdpi']) - self.DisplayDPI.SetValue(self.profile_config['dpi']) - if not self.profile_config['setdpi']: - self.DisplayDPI.Enable(False) - else: - self.DisplayDPI.Enable(True) - if self.profile_config['usekbd']: self.DontSetKeyboard.SetValue(False) if self.profile_config['type'] == 'auto': @@ -1038,12 +973,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.EnableSound.SetValue(self.profile_config['sound']) self.DefaultSoundPort.SetValue(self.profile_config['defsndport']) self.SoundPort.SetValue(self.profile_config['sndport']) - if self.profile_config['soundsystem'] == 'pulse': - self.PulseAudio.SetValue(True) - elif self.profile_config['soundsystem'] == 'arts': - self.Arts.SetValue(True) - elif self.profile_config['soundsystem'] == 'esd': - self.Esd.SetValue(True) if self.profile_config['sound']: self.PulseAudio.Enable(True) self.Esd.Enable(True) @@ -1063,6 +992,60 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ClientSidePrinting.SetValue(self.profile_config['print']) + if _command == 'RDP': + if self.profile_config['directrdp']: + self.UseSSHProxy.SetValue(False) + self._toggle_SSHProxy() + self.enable_DirectRDP() + self._toggle_SetKeyboard() + self.PulseAudio.SetValue(True) + self._toggle_DefaultSoundPort() + self.SSHPort.SetValue(self.profile_config['rdpport']) + self.RDPOptions.SetValue(self.profile_config['directrdpsettings']) + self.RDPServerLabel.Enable(True) + self.RDPServer.Enable(False) + self.RDPOptionsLabel.Enable(True) + self.RDPOptions.Enable(True) + self.UsePublishedApplications.SetValue(False) + self.UsePublishedApplications.Enable(False) + self.RootlessSession.SetValue(False) + self.RootlessSession.Enable(False) + else: + self.disable_DirectRDP() + self._toggle_SetKeyboard() + self.RDPServerLabel.Enable(True) + self.RDPServer.Enable(True) + self.RDPOptionsLabel.Enable(True) + self.RDPOptions.Enable(True) + self.UsePublishedApplications.SetValue(False) + self.UsePublishedApplications.Enable(False) + self.RootlessSession.SetValue(False) + self.RootlessSession.Enable(False) + else: + self.disable_DirectRDP() + self._toggle_SetKeyboard() + self.RDPServerLabel.Enable(False) + self.RDPServer.Enable(False) + self.RDPOptionsLabel.Enable(False) + self.RDPOptions.Enable(False) + + self.XDMCPServer.SetValue(self.profile_config['xdmcpserver']) + + self.DisplayTypeFullscreen.SetValue(self.profile_config['fullscreen'] and not self.profile_config['maxdim']) + self.DisplayTypeMaximize.SetValue(self.profile_config['maxdim']) + self.DisplayTypeCustom.SetValue(not (self.profile_config['fullscreen'] or self.profile_config['maxdim'])) + self.ScreenWidth.SetValue(self.profile_config['width']) + self.ScreenHeight.SetValue(self.profile_config['height']) + + self._toggle_DisplayProperties() + + self.SetDisplayDPI.SetValue(self.profile_config['setdpi']) + self.DisplayDPI.SetValue(self.profile_config['dpi']) + if not self.profile_config['setdpi']: + self.DisplayDPI.Enable(False) + else: + self.DisplayDPI.Enable(True) + self.UseLocalFolderSharing.SetValue(self.profile_config['useexports']) self._toggle_localFolderSharing() self.SharedFoldersList.DeleteAllItems() @@ -1123,6 +1106,65 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.disable_EditConnected_options() + def _toggle_DisplayProperties(self): + """\ + Toggle display properties, depend on activation/deactivation of rootless session mode. + + @param event: event + @type event: C{obj} + + """ + if not self.RootlessSession.GetValue(): + self.DisplayTypeFullscreen.Enable(True) + self.DisplayTypeMaximize.Enable(True) + self.DisplayTypeCustom.Enable(True) + if self.DisplayTypeFullscreen.GetValue() or self.DisplayTypeMaximize.GetValue(): + self.ScreenWidth.Enable(False) + self.ScreenHeightLabel.Enable(False) + self.ScreenHeight.Enable(False) + else: + self.ScreenWidth.Enable(True) + self.ScreenHeightLabel.Enable(True) + self.ScreenHeight.Enable(True) + + self.SetSessionWindowTitle.Enable(True) + self.SetSessionWindowTitle.SetValue(self.profile_config_bak['setsessiontitle']) + self.CustomSessionWindowTitle.SetValue(self.profile_config_bak['sessiontitle']) + + if not self.profile_config['setsessiontitle']: + self.CustomSessionWindowTitleLabel.Enable(False) + self.CustomSessionWindowTitle.Enable(False) + self.UseDefaultSessionWindowTitle.Enable(False) + else: + if self.profile_config['sessiontitle']: + self.UseDefaultSessionWindowTitle.SetValue(False) + else: + self.UseDefaultSessionWindowTitle.SetValue(True) + self.CustomSessionWindowTitleLabel.Enable(False) + self.CustomSessionWindowTitle.Enable(False) + + else: + self.DisplayTypeFullscreen.Enable(False) + self.DisplayTypeMaximize.Enable(False) + self.DisplayTypeCustom.Enable(False) + self.ScreenWidth.Enable(False) + self.ScreenHeightLabel.Enable(False) + self.ScreenHeight.Enable(False) + + self.SetSessionWindowTitle.Enable(False) + self.SetSessionWindowTitle.SetValue(False) + self.CustomSessionWindowTitleLabel.Enable(False) + self.CustomSessionWindowTitle.Enable(False) + self.UseDefaultSessionWindowTitle.Enable(False) + self.profile_config_bak['setsessiontitle'] = self.SetSessionWindowTitle.GetValue() + if self.UseDefaultSessionWindowTitle.GetValue(): + self.profile_config_bak['sessiontitle'] = '' + else: + self.profile_config_bak['sessiontitle'] = self.CustomSessionWindowTitle.GetValue() + self.SetSessionWindowTitle.SetValue(False) + self.UseDefaultSessionWindowTitle.SetValue(False) + self.CustomSessionWindowTitle.SetValue("") + def disable_EditConnected_options(self): """\ If C{action} in the constructor has been set to C{EDIT_CONNECTED} this @@ -1254,12 +1296,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['sound'] = self.EnableSound.GetValue() self.profile_config['defsndport'] = self.DefaultSoundPort.GetValue() self.profile_config['sndport'] = self.SoundPort.GetValue() - if self.PulseAudio.GetValue(): - self.profile_config['soundsystem'] = 'pulse' - elif self.Arts.GetValue(): - self.profile_config['soundsystem'] = 'arts' - elif self.Esd.GetValue(): - self.profile_config['soundsystem'] = 'esd' + + self.profile_config['soundsystem'] = self._get_SoundSystem() self.profile_config['print'] = self.ClientSidePrinting.GetValue() @@ -1302,6 +1340,25 @@ class PyHocaGUI_ProfileManager(wx.Dialog): _mimebox_action = 'OPEN' self.profile_config['mimeboxaction'] = _mimebox_action + def _get_SoundSystem(self): + if self.PulseAudio.GetValue(): + return 'pulse' + elif self.Arts.GetValue(): + return 'arts' + elif self.Esd.GetValue(): + return 'esd' + + def _set_SoundSystem(self, sound_system='pulse'): + self.PulseAudio.SetValue(False) + self.Arts.SetValue(False) + self.Esd.SetValue(False) + if self.profile_config['soundsystem'] == 'pulse': + self.PulseAudio.SetValue(True) + elif self.profile_config['soundsystem'] == 'arts': + self.Arts.SetValue(True) + elif self.profile_config['soundsystem'] == 'esd': + self.Esd.SetValue(True) + def OnIconChange(self, event): """\ Gets called on profile icon change requests. @@ -1388,7 +1445,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Compression.Enable(False) self.ImageQualityLabel.Enable(False) self.ImageQuality.Enable(False) - self.tab_Settings.Enable(False) + self.staticbox_Keyboard.Enable(False) + self.DontSetKeyboard.Enable(False) + self.AutoSetKeyboard.Enable(False) + self.CustomSetKeyboard.Enable(False) + self.CustomSetKeyboard.SetValue(True) + self.DefaultSoundPort.Enable(False) + self.SoundPortLabel.Enable(False) + self.SoundPort.Enable(False) + self.Esd.Enable(False) self.tab_SharedFilesAndFolders.Enable(True) self.RDPServer.Enable(False) self.RDPServer.SetValue(self.Host.GetValue()) @@ -1430,7 +1495,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.Compression.Enable(True) self.ImageQualityLabel.Enable(True) self.ImageQuality.Enable(True) - self.tab_Settings.Enable(True) + self.staticbox_Keyboard.Enable(True) + self.DontSetKeyboard.Enable(True) + self.AutoSetKeyboard.Enable(True) + self.CustomSetKeyboard.Enable(True) + self.EnableSound.Enable(True) + if self.EnableSound.GetValue(): + self.DefaultSoundPort.Enable(True) + self.DefaultSoundPort.SetValue(True) + self.Esd.Enable(True) self.tab_SharedFilesAndFolders.Enable(True) self.RDPServer.SetValue(self.profile_config_bak['rdpserver']) self.RDPOptions.SetValue(self.profile_config_bak['rdpoptions']) @@ -1496,7 +1569,14 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak['sshport'] = self.SSHPort.GetValue() self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue() self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue() + self.profile_config_bak['soundsystem'] = self._get_SoundSystem() + self.PulseAudio.SetValue(True) + self.Arts.SetValue(False) + self.Esd.SetValue(False) + self.DefaultSoundPort.SetValue(True) + self._toggle_DefaultSoundPort() self.enable_DirectRDP() + self._toggle_SetKeyboard() self.RDPServerLabel.Enable(True) self.RDPServer.Enable(False) self.RDPOptionsLabel.Enable(True) @@ -1509,6 +1589,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak['rdpport'] = self.SSHPort.GetValue() self.profile_config_bak['directrdpsettings'] = self.RDPOptions.GetValue() self.disable_DirectRDP() + self._toggle_SetKeyboard() + self._set_SoundSystem(self.profile_config_bak['soundsystem']) + self._toggle_DefaultSoundPort() self.RDPServerLabel.Enable(True) self.RDPServer.Enable(True) self.RDPOptionsLabel.Enable(True) @@ -1524,6 +1607,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue() self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue() self.disable_DirectRDP() + self._toggle_SetKeyboard() + self._set_SoundSystem(self.profile_config_bak['soundsystem']) + self._toggle_DefaultSoundPort() self.RDPServerLabel.Enable(False) self.RDPServer.Enable(False) self.RDPOptionsLabel.Enable(False) @@ -1547,6 +1633,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.AutoStartSession.SetValue(self._last_auto_start_value) self._last_auto_start_value = None + self._toggle_DisplayProperties() self.disable_EditConnected_options() def OnCompressionSelected(self, event): @@ -1653,7 +1740,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if self.UseSSHProxy.GetValue(): self.profile_config_bak['host'] = self.Host.GetValue() self.profile_config_bak['sshport'] = self.SSHPort.GetValue() - self.ToggleSSHProxy() + self._toggle_SSHProxy() def OnSSHProxySameUser(self, event): """\ @@ -1665,7 +1752,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): """ if self.SSHProxySameUser.GetValue(): self.profile_config_bak['sshproxyuser'] = self.SSHProxyUser.GetValue() - self.ToggleSSHProxy() + self._toggle_SSHProxy() def OnSSHProxySamePassword(self, event): """\ @@ -1677,9 +1764,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): """ if self.SSHProxySamePassword.GetValue(): self.profile_config_bak['sshproxykeyfile'] = self.SSHProxyKeyFile.GetValue() - self.ToggleSSHProxy() + self._toggle_SSHProxy() - def ToggleSSHProxy(self): + def _toggle_SSHProxy(self): """\ Gets called if the use-ssh-proxy checkbox gets marked. @@ -1777,6 +1864,16 @@ class PyHocaGUI_ProfileManager(wx.Dialog): @type event: C{obj} """ + self._toggle_SetKeyboard() + + def _toggle_SetKeyboard(self): + """\ + Toggle keyboard settings, depends on activation/deactivation of custom keyboard settings. + + @param event: event + @type event: C{obj} + + """ if self.CustomSetKeyboard.GetValue(): self.KeyboardModelLabel.Enable(True) self.KeyboardLayoutLabel.Enable(True) @@ -1800,13 +1897,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): @type event: C{obj} """ + _session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0] if self.EnableSound.GetValue(): self.PulseAudio.Enable(True) - self.Esd.Enable(True) - self.DefaultSoundPort.Enable(True) - if self.DefaultSoundPort.GetValue() is False: - self.SoundPortLabel.Enable(True) - self.SoundPort.Enable(True) + if _session_type != 'DirectRDP': + self.Esd.Enable(True) + self.DefaultSoundPort.Enable(True) + if self.DefaultSoundPort.GetValue() is False: + self.SoundPortLabel.Enable(True) + self.SoundPort.Enable(True) else: self.PulseAudio.Enable(False) self.Esd.Enable(False) @@ -1814,7 +1913,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SoundPortLabel.Enable(False) self.SoundPort.Enable(False) - def OnSetDisplayFullscreen(self, event): """\ Gets called whenever the fullscreen-display radion button gets checked. @@ -1897,6 +1995,16 @@ class PyHocaGUI_ProfileManager(wx.Dialog): @type event: C{obj} """ + self._toggle_DefaultSoundPort() + + def _toggle_DefaultSoundPort(self): + """\ + Gets called indirectly on activation/deactivation of the default-sound-port checkbox. + + @param event: event + @type event: C{obj} + + """ if not self.DefaultSoundPort.GetValue(): self.SoundPortLabel.Enable(True) self.SoundPort.Enable(True) @@ -1934,13 +2042,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ServerEncoding.Enable(False) def OnToggleLocalFolderSharing(self, event): - """\ - Gets called on activation/deactivation of client-side local folder sharing. - - @param event: event - @type event: C{obj} - - """ self._toggle_localFolderSharing() def OnSelectSharedFolderPath(self, event): 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)).