This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from fc7bda6 drop unnecessary wxPython 2.6 code new 3a41e76 rebuild some i18n binary files. new 959fee8 rebuild PyHoca-GUI.pot new b5dada2 (Now really) Support Python wxWidgets 3.0. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 31799 -> 33346 bytes build/mo/fi/LC_MESSAGES/PyHoca-GUI.mo | Bin 435 -> 484 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 27826 -> 34839 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 29940 -> 33527 bytes debian/changelog | 2 +- po/PyHoca-GUI.pot | 567 +++++++++++++++++---------------- pyhoca-gui | 5 + pyhoca/wxgui/about.py | 5 - pyhoca/wxgui/brokerlogon.py | 7 - pyhoca/wxgui/frontend.py | 8 - pyhoca/wxgui/launcher.py | 14 +- pyhoca/wxgui/listdesktops.py | 7 - pyhoca/wxgui/logon.py | 7 - pyhoca/wxgui/menus_taskbar.py | 5 - pyhoca/wxgui/messages.py | 5 - pyhoca/wxgui/notify.py | 5 - pyhoca/wxgui/passphrase.py | 5 - pyhoca/wxgui/printingprefs.py | 5 - pyhoca/wxgui/profilemanager.py | 5 - pyhoca/wxgui/serverinfo.py | 7 - pyhoca/wxgui/sessiontitle.py | 7 - pyhoca/wxgui/splash.py | 5 - pyhoca/wxgui/taskbar.py | 7 - 23 files changed, 295 insertions(+), 383 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 3a41e76e504ae25cc22810478a1b269d53de914a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 30 14:59:05 2014 +0200 rebuild some i18n binary files. --- build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 31799 -> 33346 bytes build/mo/fi/LC_MESSAGES/PyHoca-GUI.mo | Bin 435 -> 484 bytes build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 27826 -> 34839 bytes build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 29940 -> 33527 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/es/LC_MESSAGES/PyHoca-GUI.mo index f03cd1e..41f5b2f 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/fi/LC_MESSAGES/PyHoca-GUI.mo b/build/mo/fi/LC_MESSAGES/PyHoca-GUI.mo index 13b1699..28591a3 100644 Binary files a/build/mo/fi/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/fi/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 b8052e3..2eef8da 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 d3e11d6..0caaaaa 100644 Binary files a/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo and b/build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo differ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 959fee83d13b3167304445a281787522c3806809 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 30 14:59:32 2014 +0200 rebuild PyHoca-GUI.pot --- po/PyHoca-GUI.pot | 567 +++++++++++++++++++++++++++-------------------------- 1 file changed, 284 insertions(+), 283 deletions(-) diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot index 89b7539..22e8304 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: 2014-06-29 14:29+0200\n" +"POT-Creation-Date: 2014-09-30 14:58+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" @@ -17,163 +17,163 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../pyhoca/wxgui/brokerlogon.py:69 +#: ../pyhoca/wxgui/brokerlogon.py:57 msgid "Logon" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:72 +#: ../pyhoca/wxgui/brokerlogon.py:60 msgid "Broker URL" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:75 ../pyhoca/wxgui/logon.py:99 -#: ../pyhoca/wxgui/logon.py:111 +#: ../pyhoca/wxgui/brokerlogon.py:63 ../pyhoca/wxgui/logon.py:87 +#: ../pyhoca/wxgui/logon.py:99 msgid "Username" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:78 ../pyhoca/wxgui/logon.py:101 -#: ../pyhoca/wxgui/logon.py:113 +#: ../pyhoca/wxgui/brokerlogon.py:66 ../pyhoca/wxgui/logon.py:89 +#: ../pyhoca/wxgui/logon.py:101 msgid "Password" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:99 ../pyhoca/wxgui/logon.py:104 +#: ../pyhoca/wxgui/brokerlogon.py:87 ../pyhoca/wxgui/logon.py:92 msgid "Authenticate" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:101 ../pyhoca/wxgui/logon.py:136 -#: ../pyhoca/wxgui/passphrase.py:103 ../pyhoca/wxgui/profilemanager.py:394 -#: ../pyhoca/wxgui/listdesktops.py:98 ../pyhoca/wxgui/messages.py:133 -#: ../pyhoca/wxgui/printingprefs.py:147 ../pyhoca/wxgui/sessiontitle.py:86 +#: ../pyhoca/wxgui/brokerlogon.py:89 ../pyhoca/wxgui/logon.py:124 +#: ../pyhoca/wxgui/passphrase.py:93 ../pyhoca/wxgui/profilemanager.py:394 +#: ../pyhoca/wxgui/listdesktops.py:86 ../pyhoca/wxgui/messages.py:133 +#: ../pyhoca/wxgui/printingprefs.py:148 ../pyhoca/wxgui/sessiontitle.py:74 msgid "Cancel" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:180 +#: ../pyhoca/wxgui/brokerlogon.py:168 #, python-format msgid "%s - success" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:180 +#: ../pyhoca/wxgui/brokerlogon.py:168 msgid "" "Authentication to session broker has been\n" "successful." msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:182 +#: ../pyhoca/wxgui/brokerlogon.py:170 #, python-format msgid "%s - failure" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:182 +#: ../pyhoca/wxgui/brokerlogon.py:170 msgid "Authentication to session broker failed." msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:186 +#: ../pyhoca/wxgui/brokerlogon.py:174 #, python-format msgid "%s: Connection refused error" msgstr "" -#: ../pyhoca/wxgui/brokerlogon.py:186 +#: ../pyhoca/wxgui/brokerlogon.py:174 #, python-format msgid "Connection to %s failed. Retry?" msgstr "" -#: ../pyhoca/wxgui/logon.py:93 +#: ../pyhoca/wxgui/logon.py:81 #, python-format msgid "%s (via %s)" msgstr "" -#: ../pyhoca/wxgui/logon.py:116 +#: ../pyhoca/wxgui/logon.py:104 msgid "Start SSH tunnel" msgstr "" -#: ../pyhoca/wxgui/logon.py:124 +#: ../pyhoca/wxgui/logon.py:112 msgid "Session login" msgstr "" -#: ../pyhoca/wxgui/logon.py:125 +#: ../pyhoca/wxgui/logon.py:113 msgid "SSH proxy server login" msgstr "" -#: ../pyhoca/wxgui/logon.py:308 ../pyhoca/wxgui/logon.py:361 -#: ../pyhoca/wxgui/passphrase.py:226 ../pyhoca/wxgui/passphrase.py:233 -#: ../pyhoca/wxgui/passphrase.py:240 ../pyhoca/wxgui/passphrase.py:247 -#: ../pyhoca/wxgui/frontend.py:651 +#: ../pyhoca/wxgui/logon.py:296 ../pyhoca/wxgui/logon.py:349 +#: ../pyhoca/wxgui/passphrase.py:216 ../pyhoca/wxgui/passphrase.py:223 +#: ../pyhoca/wxgui/passphrase.py:230 ../pyhoca/wxgui/passphrase.py:237 +#: ../pyhoca/wxgui/frontend.py:633 #, python-format msgid "%s - connect failure" msgstr "" -#: ../pyhoca/wxgui/logon.py:309 ../pyhoca/wxgui/frontend.py:651 +#: ../pyhoca/wxgui/logon.py:297 ../pyhoca/wxgui/frontend.py:633 msgid "User is not allowed to start X2Go sessions!" msgstr "" -#: ../pyhoca/wxgui/logon.py:314 ../pyhoca/wxgui/passphrase.py:208 -#: ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/logon.py:302 ../pyhoca/wxgui/passphrase.py:198 +#: ../pyhoca/wxgui/frontend.py:640 #, python-format msgid "%s - connect" msgstr "" -#: ../pyhoca/wxgui/logon.py:315 ../pyhoca/wxgui/passphrase.py:209 +#: ../pyhoca/wxgui/logon.py:303 ../pyhoca/wxgui/passphrase.py:199 msgid "Authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/logon.py:457 +#: ../pyhoca/wxgui/logon.py:345 ../pyhoca/wxgui/logon.py:445 msgid "SSH tunnel started" msgstr "" -#: ../pyhoca/wxgui/logon.py:362 ../pyhoca/wxgui/passphrase.py:241 +#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/passphrase.py:231 msgid "Authentication failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:370 +#: ../pyhoca/wxgui/logon.py:358 #, python-format msgid "%s - SSH proxy" msgstr "" -#: ../pyhoca/wxgui/logon.py:371 ../pyhoca/wxgui/passphrase.py:248 +#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/passphrase.py:238 msgid "Authentication to the SSH proxy server failed!" msgstr "" -#: ../pyhoca/wxgui/logon.py:398 ../pyhoca/wxgui/passphrase.py:254 -#: ../pyhoca/wxgui/frontend.py:763 +#: ../pyhoca/wxgui/logon.py:386 ../pyhoca/wxgui/passphrase.py:244 +#: ../pyhoca/wxgui/frontend.py:745 #, python-format msgid "%s - socket error" msgstr "" -#: ../pyhoca/wxgui/logon.py:405 ../pyhoca/wxgui/passphrase.py:261 -#: ../pyhoca/wxgui/frontend.py:742 ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/logon.py:393 ../pyhoca/wxgui/passphrase.py:251 +#: ../pyhoca/wxgui/frontend.py:724 ../pyhoca/wxgui/frontend.py:731 #, python-format msgid "%s - host key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:406 ../pyhoca/wxgui/passphrase.py:262 -#: ../pyhoca/wxgui/frontend.py:742 +#: ../pyhoca/wxgui/logon.py:394 ../pyhoca/wxgui/passphrase.py:252 +#: ../pyhoca/wxgui/frontend.py:724 msgid "" "The remote server's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/logon.py:413 ../pyhoca/wxgui/passphrase.py:269 -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/logon.py:401 ../pyhoca/wxgui/passphrase.py:259 +#: ../pyhoca/wxgui/frontend.py:759 #, python-format msgid "%s - missing home directory" msgstr "" -#: ../pyhoca/wxgui/logon.py:414 ../pyhoca/wxgui/passphrase.py:270 -#: ../pyhoca/wxgui/frontend.py:777 +#: ../pyhoca/wxgui/logon.py:402 ../pyhoca/wxgui/passphrase.py:260 +#: ../pyhoca/wxgui/frontend.py:759 msgid "The remote user's home directory does not exist." msgstr "" -#: ../pyhoca/wxgui/logon.py:421 ../pyhoca/wxgui/passphrase.py:292 +#: ../pyhoca/wxgui/logon.py:409 ../pyhoca/wxgui/passphrase.py:282 #, python-format msgid "%s - key error" msgstr "" -#: ../pyhoca/wxgui/logon.py:429 ../pyhoca/wxgui/passphrase.py:300 -#: ../pyhoca/wxgui/frontend.py:784 +#: ../pyhoca/wxgui/logon.py:417 ../pyhoca/wxgui/passphrase.py:290 +#: ../pyhoca/wxgui/frontend.py:766 #, python-format msgid "%s - auth error" msgstr "" -#: ../pyhoca/wxgui/logon.py:461 ../pyhoca/wxgui/passphrase.py:288 -#: ../pyhoca/wxgui/passphrase.py:319 ../pyhoca/wxgui/frontend.py:712 +#: ../pyhoca/wxgui/logon.py:449 ../pyhoca/wxgui/passphrase.py:278 +#: ../pyhoca/wxgui/passphrase.py:309 ../pyhoca/wxgui/frontend.py:694 msgid "" "Host key verification failed. The X2Go server may have been compromised.\n" "\n" @@ -182,78 +182,78 @@ msgid "" "However, for security reasons the connection will not be established!!!" msgstr "" -#: ../pyhoca/wxgui/logon.py:466 ../pyhoca/wxgui/passphrase.py:324 -#: ../pyhoca/wxgui/frontend.py:720 ../pyhoca/wxgui/frontend.py:740 +#: ../pyhoca/wxgui/logon.py:454 ../pyhoca/wxgui/passphrase.py:314 +#: ../pyhoca/wxgui/frontend.py:702 ../pyhoca/wxgui/frontend.py:722 #, python-format msgid "%s - SSH error" msgstr "" -#: ../pyhoca/wxgui/logon.py:476 ../pyhoca/wxgui/passphrase.py:332 +#: ../pyhoca/wxgui/logon.py:464 ../pyhoca/wxgui/passphrase.py:322 #, python-format msgid "%s - unknown error" msgstr "" -#: ../pyhoca/wxgui/logon.py:477 ../pyhoca/wxgui/passphrase.py:333 +#: ../pyhoca/wxgui/logon.py:465 ../pyhoca/wxgui/passphrase.py:323 msgid "An unknown error occured during authentication!" msgstr "" -#: ../pyhoca/wxgui/passphrase.py:79 +#: ../pyhoca/wxgui/passphrase.py:69 #, python-format msgid "%s (SSH proxy)" msgstr "" -#: ../pyhoca/wxgui/passphrase.py:81 +#: ../pyhoca/wxgui/passphrase.py:71 #, python-format msgid "%s (X2Go Server)" msgstr "" -#: ../pyhoca/wxgui/passphrase.py:91 +#: ../pyhoca/wxgui/passphrase.py:81 #, python-format msgid "Unlock SSH private key (%s)..." msgstr "" -#: ../pyhoca/wxgui/passphrase.py:93 +#: ../pyhoca/wxgui/passphrase.py:83 msgid "Unlock auto-discovered SSH private key..." msgstr "" -#: ../pyhoca/wxgui/passphrase.py:95 +#: ../pyhoca/wxgui/passphrase.py:85 msgid "Passphrase" msgstr "" -#: ../pyhoca/wxgui/passphrase.py:98 +#: ../pyhoca/wxgui/passphrase.py:88 msgid "Unlock SSH key" msgstr "" -#: ../pyhoca/wxgui/passphrase.py:227 +#: ../pyhoca/wxgui/passphrase.py:217 msgid "SSH key file (for X2Go server) could not be unlocked!" msgstr "" -#: ../pyhoca/wxgui/passphrase.py:234 +#: ../pyhoca/wxgui/passphrase.py:224 msgid "SSH key file (for SSH proxy) could not be unlocked!" msgstr "" -#: ../pyhoca/wxgui/taskbar.py:129 +#: ../pyhoca/wxgui/taskbar.py:117 #, python-format msgid "" "%s\n" "Connecting you to ,,%s''" msgstr "" -#: ../pyhoca/wxgui/taskbar.py:133 +#: ../pyhoca/wxgui/taskbar.py:121 #, python-format msgid "" "%s\n" "Currently connecting you to remote X2Go server ,,%s''" msgstr "" -#: ../pyhoca/wxgui/taskbar.py:143 +#: ../pyhoca/wxgui/taskbar.py:131 #, python-format msgid "" "%s\n" "Connecting you to X2Go..." msgstr "" -#: ../pyhoca/wxgui/taskbar.py:147 +#: ../pyhoca/wxgui/taskbar.py:135 #, python-format msgid "" "%s\n" @@ -320,19 +320,19 @@ msgstr "" msgid "Custom command" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:422 +#: ../pyhoca/wxgui/profilemanager.py:101 ../pyhoca/wxgui/menus_taskbar.py:412 msgid "Internet Browser" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:423 +#: ../pyhoca/wxgui/profilemanager.py:102 ../pyhoca/wxgui/menus_taskbar.py:413 msgid "Email Client" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:103 ../pyhoca/wxgui/menus_taskbar.py:424 +#: ../pyhoca/wxgui/profilemanager.py:103 ../pyhoca/wxgui/menus_taskbar.py:414 msgid "Office" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:104 ../pyhoca/wxgui/menus_taskbar.py:425 +#: ../pyhoca/wxgui/profilemanager.py:104 ../pyhoca/wxgui/menus_taskbar.py:415 msgid "Terminal" msgstr "" @@ -716,7 +716,7 @@ msgstr "" msgid "Reset" msgstr "" -#: ../pyhoca/wxgui/profilemanager.py:393 ../pyhoca/wxgui/printingprefs.py:143 +#: ../pyhoca/wxgui/profilemanager.py:393 ../pyhoca/wxgui/printingprefs.py:144 msgid "Apply" msgstr "" @@ -819,7 +819,7 @@ msgstr "" #: ../pyhoca/wxgui/profilemanager.py:2445 #: ../pyhoca/wxgui/profilemanager.py:2448 -#: ../pyhoca/wxgui/profilemanager.py:2451 ../pyhoca/wxgui/menus_taskbar.py:133 +#: ../pyhoca/wxgui/profilemanager.py:2451 ../pyhoca/wxgui/menus_taskbar.py:123 msgid "Profile Manager" msgstr "" @@ -851,350 +851,350 @@ msgstr "" msgid "Changes to profile have been saved." msgstr "" -#: ../pyhoca/wxgui/listdesktops.py:81 +#: ../pyhoca/wxgui/listdesktops.py:69 #, python-format msgid "Share Desktop Session - %s" msgstr "" -#: ../pyhoca/wxgui/listdesktops.py:83 +#: ../pyhoca/wxgui/listdesktops.py:71 msgid "Select one of the available desktop sessions on this server" msgstr "" -#: ../pyhoca/wxgui/listdesktops.py:89 +#: ../pyhoca/wxgui/listdesktops.py:77 msgid "View session only" msgstr "" -#: ../pyhoca/wxgui/listdesktops.py:90 +#: ../pyhoca/wxgui/listdesktops.py:78 msgid "Gain full access" msgstr "" -#: ../pyhoca/wxgui/listdesktops.py:94 +#: ../pyhoca/wxgui/listdesktops.py:82 msgid "Share Desktop" msgstr "" -#: ../pyhoca/wxgui/listdesktops.py:97 +#: ../pyhoca/wxgui/listdesktops.py:85 msgid "Refresh list" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:76 +#: ../pyhoca/wxgui/menus_taskbar.py:66 msgid "Edit Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:78 +#: ../pyhoca/wxgui/menus_taskbar.py:68 msgid "View Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:86 +#: ../pyhoca/wxgui/menus_taskbar.py:76 msgid "Use as Template for New Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:90 +#: ../pyhoca/wxgui/menus_taskbar.py:80 msgid "Export Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:94 +#: ../pyhoca/wxgui/menus_taskbar.py:84 msgid "Delete Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:120 ../pyhoca/wxgui/menus_taskbar.py:121 +#: ../pyhoca/wxgui/menus_taskbar.py:110 ../pyhoca/wxgui/menus_taskbar.py:111 #, python-format msgid "About %s (%s)..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:150 +#: ../pyhoca/wxgui/menus_taskbar.py:140 msgid "Manage Session Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:159 +#: ../pyhoca/wxgui/menus_taskbar.py:149 msgid "Disconnect from session broker" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:164 +#: ../pyhoca/wxgui/menus_taskbar.py:154 msgid "Printing Preferences" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:172 +#: ../pyhoca/wxgui/menus_taskbar.py:162 msgid "Client Options" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:180 ../pyhoca/wxgui/menus_taskbar.py:857 -#: ../pyhoca/wxgui/menus_taskbar.py:1078 +#: ../pyhoca/wxgui/menus_taskbar.py:170 ../pyhoca/wxgui/menus_taskbar.py:848 +#: ../pyhoca/wxgui/menus_taskbar.py:1069 msgid "E&xit" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:252 +#: ../pyhoca/wxgui/menus_taskbar.py:242 msgid "Window title" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:258 ../pyhoca/wxgui/menus_taskbar.py:657 +#: ../pyhoca/wxgui/menus_taskbar.py:248 ../pyhoca/wxgui/menus_taskbar.py:648 msgid "Resume Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:260 +#: ../pyhoca/wxgui/menus_taskbar.py:250 msgid "Resume Session (not possible)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:271 +#: ../pyhoca/wxgui/menus_taskbar.py:261 msgid "Transfer Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:273 +#: ../pyhoca/wxgui/menus_taskbar.py:263 msgid "Transfer Session (not possible)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:278 ../pyhoca/wxgui/menus_taskbar.py:648 +#: ../pyhoca/wxgui/menus_taskbar.py:268 ../pyhoca/wxgui/menus_taskbar.py:639 msgid "Suspend Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:280 ../pyhoca/wxgui/menus_taskbar.py:650 +#: ../pyhoca/wxgui/menus_taskbar.py:270 ../pyhoca/wxgui/menus_taskbar.py:641 msgid "Suspend Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:282 ../pyhoca/wxgui/menus_taskbar.py:652 +#: ../pyhoca/wxgui/menus_taskbar.py:272 ../pyhoca/wxgui/menus_taskbar.py:643 msgid "Suspend Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:288 ../pyhoca/wxgui/menus_taskbar.py:661 +#: ../pyhoca/wxgui/menus_taskbar.py:278 ../pyhoca/wxgui/menus_taskbar.py:652 msgid "Terminate Session (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:290 ../pyhoca/wxgui/menus_taskbar.py:663 +#: ../pyhoca/wxgui/menus_taskbar.py:280 ../pyhoca/wxgui/menus_taskbar.py:654 msgid "Terminate Session (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:292 ../pyhoca/wxgui/menus_taskbar.py:665 +#: ../pyhoca/wxgui/menus_taskbar.py:282 ../pyhoca/wxgui/menus_taskbar.py:656 msgid "Terminate Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:295 +#: ../pyhoca/wxgui/menus_taskbar.py:285 msgid "End Desktop Sharing (and disconnect/exit)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:297 +#: ../pyhoca/wxgui/menus_taskbar.py:287 msgid "End Desktop Sharing (and disconnect)" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:299 +#: ../pyhoca/wxgui/menus_taskbar.py:289 msgid "End Desktop Sharing" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:303 ../pyhoca/wxgui/menus_taskbar.py:645 +#: ../pyhoca/wxgui/menus_taskbar.py:293 ../pyhoca/wxgui/menus_taskbar.py:636 msgid "Refresh menu tree" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:312 +#: ../pyhoca/wxgui/menus_taskbar.py:302 msgid "Rename Session Window" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:313 +#: ../pyhoca/wxgui/menus_taskbar.py:303 msgid "Show Session Window" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:355 +#: ../pyhoca/wxgui/menus_taskbar.py:345 msgid "&Share custom local folder" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:366 +#: ../pyhoca/wxgui/menus_taskbar.py:356 msgid "Share:" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:375 +#: ../pyhoca/wxgui/menus_taskbar.py:365 msgid "Unshare:" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:383 +#: ../pyhoca/wxgui/menus_taskbar.py:373 msgid "Unshare &all local folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:389 +#: ../pyhoca/wxgui/menus_taskbar.py:379 msgid "Restore shares in next session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:470 +#: ../pyhoca/wxgui/menus_taskbar.py:460 msgid "Multimedia" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:471 +#: ../pyhoca/wxgui/menus_taskbar.py:461 msgid "Development" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:472 +#: ../pyhoca/wxgui/menus_taskbar.py:462 msgid "Education" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:473 +#: ../pyhoca/wxgui/menus_taskbar.py:463 msgid "Games" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:474 +#: ../pyhoca/wxgui/menus_taskbar.py:464 msgid "Graphics" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:475 +#: ../pyhoca/wxgui/menus_taskbar.py:465 msgid "Internet" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:476 +#: ../pyhoca/wxgui/menus_taskbar.py:466 msgid "Office Applications" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:477 +#: ../pyhoca/wxgui/menus_taskbar.py:467 msgid "System" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:478 +#: ../pyhoca/wxgui/menus_taskbar.py:468 msgid "Utilities" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:479 +#: ../pyhoca/wxgui/menus_taskbar.py:469 msgid "Other Applications" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:553 ../pyhoca/wxgui/menus_taskbar.py:1043 +#: ../pyhoca/wxgui/menus_taskbar.py:544 ../pyhoca/wxgui/menus_taskbar.py:1034 msgid "Connect to" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:558 ../pyhoca/wxgui/menus_taskbar.py:573 +#: ../pyhoca/wxgui/menus_taskbar.py:549 ../pyhoca/wxgui/menus_taskbar.py:564 #, python-format msgid "Connect %s" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:567 +#: ../pyhoca/wxgui/menus_taskbar.py:558 msgid "Currently connecting..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:582 +#: ../pyhoca/wxgui/menus_taskbar.py:573 msgid "Start &new Desktop Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:586 ../pyhoca/wxgui/menus_taskbar.py:686 +#: ../pyhoca/wxgui/menus_taskbar.py:577 ../pyhoca/wxgui/menus_taskbar.py:677 msgid "Start Desktop Sharing Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:592 ../pyhoca/wxgui/menus_taskbar.py:736 +#: ../pyhoca/wxgui/menus_taskbar.py:583 ../pyhoca/wxgui/menus_taskbar.py:727 msgid "Retrieving Application Menu..." msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:596 ../pyhoca/wxgui/menus_taskbar.py:739 +#: ../pyhoca/wxgui/menus_taskbar.py:587 ../pyhoca/wxgui/menus_taskbar.py:730 msgid "Retrieve Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:599 +#: ../pyhoca/wxgui/menus_taskbar.py:590 msgid "Start &new RDP Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:602 +#: ../pyhoca/wxgui/menus_taskbar.py:593 msgid "Start &new Session" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:682 +#: ../pyhoca/wxgui/menus_taskbar.py:673 msgid "Launch Single Application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:723 +#: ../pyhoca/wxgui/menus_taskbar.py:714 msgid "Manage Application Menu" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:778 +#: ../pyhoca/wxgui/menus_taskbar.py:769 msgid "Running" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:780 +#: ../pyhoca/wxgui/menus_taskbar.py:771 msgid "Suspended" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:799 +#: ../pyhoca/wxgui/menus_taskbar.py:790 msgid "&Clean all sessions" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:806 +#: ../pyhoca/wxgui/menus_taskbar.py:797 msgid "Customize &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:808 +#: ../pyhoca/wxgui/menus_taskbar.py:799 msgid "View &profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:823 +#: ../pyhoca/wxgui/menus_taskbar.py:814 msgid "Shared &folders" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:835 +#: ../pyhoca/wxgui/menus_taskbar.py:826 msgid "Server Information" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:842 +#: ../pyhoca/wxgui/menus_taskbar.py:833 msgid "&Disconnect from Server" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:849 +#: ../pyhoca/wxgui/menus_taskbar.py:840 msgid "Suspend Session and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:853 +#: ../pyhoca/wxgui/menus_taskbar.py:844 msgid "Disconnect and E&xit application" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:907 +#: ../pyhoca/wxgui/menus_taskbar.py:898 msgid "Add Profile" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:984 +#: ../pyhoca/wxgui/menus_taskbar.py:975 msgid "Session broker is not connected" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:986 +#: ../pyhoca/wxgui/menus_taskbar.py:977 msgid "No session profiles defined" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:997 +#: ../pyhoca/wxgui/menus_taskbar.py:988 msgid "Export all Profiles" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:999 +#: ../pyhoca/wxgui/menus_taskbar.py:990 msgid "Export Profile Group" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:1005 +#: ../pyhoca/wxgui/menus_taskbar.py:996 msgid "Import Session Profiles" msgstr "" -#: ../pyhoca/wxgui/menus_taskbar.py:1048 +#: ../pyhoca/wxgui/menus_taskbar.py:1039 msgid "Connect Server" msgstr "" -#: ../pyhoca/wxgui/about.py:88 ../pyhoca/wxgui/about.py:90 +#: ../pyhoca/wxgui/about.py:78 ../pyhoca/wxgui/about.py:80 #, python-format msgid "About %s ..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:502 +#: ../pyhoca/wxgui/frontend.py:484 msgid "Suspending sessions and exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:505 +#: ../pyhoca/wxgui/frontend.py:487 #, python-format msgid "Disconnecting %s and exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:507 +#: ../pyhoca/wxgui/frontend.py:489 msgid "Exiting application..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:607 +#: ../pyhoca/wxgui/frontend.py:589 #, python-format msgid "%s - server warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:607 +#: ../pyhoca/wxgui/frontend.py:589 msgid "The X2Go Server does not publish an application menu." msgstr "" -#: ../pyhoca/wxgui/frontend.py:658 +#: ../pyhoca/wxgui/frontend.py:640 msgid "SSH key authentication has been successful." msgstr "" -#: ../pyhoca/wxgui/frontend.py:732 +#: ../pyhoca/wxgui/frontend.py:714 msgid "" "Host key verification failed. The SSH proxy server may have been " "compromised.\n" @@ -1204,30 +1204,30 @@ msgid "" "However, for security reasons the connection will not be established!!!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:749 +#: ../pyhoca/wxgui/frontend.py:731 msgid "" "The SSH proxy's host key is invalid or has not been accepted by the user" msgstr "" -#: ../pyhoca/wxgui/frontend.py:770 +#: ../pyhoca/wxgui/frontend.py:752 #, python-format msgid "%s - EOF error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:770 +#: ../pyhoca/wxgui/frontend.py:752 msgid "Authentication protocol communication incomplete! Try again..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:791 +#: ../pyhoca/wxgui/frontend.py:773 msgid "An unknown error occurred during authentication!" msgstr "" -#: ../pyhoca/wxgui/frontend.py:820 +#: ../pyhoca/wxgui/frontend.py:802 #, python-format msgid "%s: DirectRDP not supported yet" msgstr "" -#: ../pyhoca/wxgui/frontend.py:821 +#: ../pyhoca/wxgui/frontend.py:803 #, python-format msgid "" "We apologize for the inconvenience...\n" @@ -1238,16 +1238,16 @@ msgid "" "DirectRDP support will be available in %s (>= 1.0.0.0)." msgstr "" -#: ../pyhoca/wxgui/frontend.py:836 +#: ../pyhoca/wxgui/frontend.py:818 msgid "Unknown session profile, configure before using it..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:897 +#: ../pyhoca/wxgui/frontend.py:879 #, python-format msgid "Desktop Sharing with %s not supported by server" msgstr "" -#: ../pyhoca/wxgui/frontend.py:898 +#: ../pyhoca/wxgui/frontend.py:880 #, python-format msgid "" "We apologize for the inconvenience...\n" @@ -1259,57 +1259,57 @@ msgid "" "X2Go Server 4.1.0.0 and above." msgstr "" -#: ../pyhoca/wxgui/frontend.py:956 ../pyhoca/wxgui/frontend.py:1743 +#: ../pyhoca/wxgui/frontend.py:938 ../pyhoca/wxgui/frontend.py:1725 #, python-format msgid "%s - session warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:956 +#: ../pyhoca/wxgui/frontend.py:938 #, python-format msgid "Execution of command ,,%s'' failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1097 +#: ../pyhoca/wxgui/frontend.py:1079 msgid "Cleaning X2Go sessions..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1145 +#: ../pyhoca/wxgui/frontend.py:1127 #, python-format msgid "%s - disconnect" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1145 +#: ../pyhoca/wxgui/frontend.py:1127 msgid "X2Go Profile is now disconnected." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1166 +#: ../pyhoca/wxgui/frontend.py:1148 msgid "New Session Profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1221 +#: ../pyhoca/wxgui/frontend.py:1203 #, python-format msgid "Really Delete Session Profile ,,%s''?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1226 +#: ../pyhoca/wxgui/frontend.py:1208 #, python-format msgid "%s - profile deleted" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1226 +#: ../pyhoca/wxgui/frontend.py:1208 msgid "The session profile has been deleted." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1238 +#: ../pyhoca/wxgui/frontend.py:1220 msgid "import session profile(s)" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1250 +#: ../pyhoca/wxgui/frontend.py:1232 #, python-format msgid "%s: Import of session profile(s) failed" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1251 +#: ../pyhoca/wxgui/frontend.py:1233 #, python-format msgid "" "The selected session profile(s) could not be imported from \n" @@ -1318,12 +1318,12 @@ msgid "" "Are you sure the session profiles file has the correct format?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1279 +#: ../pyhoca/wxgui/frontend.py:1261 #, python-format msgid "%s: Write failure after import" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1280 +#: ../pyhoca/wxgui/frontend.py:1262 msgid "" "The session profiles configuration could not be written to file after " "import\n" @@ -1331,47 +1331,47 @@ msgid "" "Check for common problems (disk full, insufficient access, etc.)." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1285 +#: ../pyhoca/wxgui/frontend.py:1267 msgid "None of the session profiles could be imported..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1288 ../pyhoca/wxgui/frontend.py:1298 +#: ../pyhoca/wxgui/frontend.py:1270 ../pyhoca/wxgui/frontend.py:1280 #, python-format msgid "For details, start %s from the command line and retry the import." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1292 +#: ../pyhoca/wxgui/frontend.py:1274 msgid "Only these session profiles could be imported..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1295 +#: ../pyhoca/wxgui/frontend.py:1277 msgid "Whereas these session profiles failed to import..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1301 +#: ../pyhoca/wxgui/frontend.py:1283 msgid "New session profiles have been imported..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1306 +#: ../pyhoca/wxgui/frontend.py:1288 msgid "New session profile has been imported..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1335 +#: ../pyhoca/wxgui/frontend.py:1317 #, python-format msgid "%s - export session profiles" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1340 +#: ../pyhoca/wxgui/frontend.py:1322 #, python-format msgid "%s - export session profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1352 +#: ../pyhoca/wxgui/frontend.py:1334 #, python-format msgid "%s: Export file already exists" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1353 +#: ../pyhoca/wxgui/frontend.py:1335 #, python-format msgid "" "The file »%s« already exists in this folder.\n" @@ -1379,32 +1379,32 @@ msgid "" "Do you want to replace it?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1374 +#: ../pyhoca/wxgui/frontend.py:1356 #, python-format msgid "%s - profiles exported" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1374 +#: ../pyhoca/wxgui/frontend.py:1356 #, python-format msgid "Successfully exported session profile group »%s« to file »%s«." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1376 +#: ../pyhoca/wxgui/frontend.py:1358 #, python-format msgid "%s - profile exported" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1376 +#: ../pyhoca/wxgui/frontend.py:1358 #, python-format msgid "Successfully exported single session profile »%s« to file »%s«." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1380 +#: ../pyhoca/wxgui/frontend.py:1362 #, python-format msgid "%s: Exporting session profile(s) failed" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1381 +#: ../pyhoca/wxgui/frontend.py:1363 #, python-format msgid "" "The selected session profile(s) could not be exported to the \n" @@ -1413,12 +1413,12 @@ msgid "" "Check for common problems (disk full, insufficient access, etc.)." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1400 +#: ../pyhoca/wxgui/frontend.py:1382 #, python-format msgid "%s - share local folder with sessions of this profile" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1566 +#: ../pyhoca/wxgui/frontend.py:1548 #, python-format msgid "" "The authenticity of host [%s]:%s can't be established.\n" @@ -1427,17 +1427,17 @@ msgid "" "Are you sure you want to continue connecting?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1574 +#: ../pyhoca/wxgui/frontend.py:1556 #, python-format msgid "%s: Confirm Host Authorization" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1620 +#: ../pyhoca/wxgui/frontend.py:1602 #, python-format msgid "%s - channel error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1620 +#: ../pyhoca/wxgui/frontend.py:1602 #, python-format msgid "" "Lost connection to server %s unexpectedly!\n" @@ -1445,12 +1445,12 @@ msgid "" "Try to re-authenticate to the server..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1638 +#: ../pyhoca/wxgui/frontend.py:1620 #, python-format msgid "%s - SFTP client error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1638 +#: ../pyhoca/wxgui/frontend.py:1620 msgid "" "New X2Go session will lack SFTP client support.\n" "Check your server setup.\n" @@ -1460,168 +1460,168 @@ msgid "" "Not starting new session..." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1655 ../pyhoca/wxgui/frontend.py:1668 -#: ../pyhoca/wxgui/frontend.py:1724 ../pyhoca/wxgui/frontend.py:1726 -#: ../pyhoca/wxgui/frontend.py:1769 +#: ../pyhoca/wxgui/frontend.py:1637 ../pyhoca/wxgui/frontend.py:1650 +#: ../pyhoca/wxgui/frontend.py:1706 ../pyhoca/wxgui/frontend.py:1708 +#: ../pyhoca/wxgui/frontend.py:1751 #, python-format msgid "%s - session failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1655 +#: ../pyhoca/wxgui/frontend.py:1637 msgid "The session startup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1668 +#: ../pyhoca/wxgui/frontend.py:1650 msgid "The session initialization failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1681 +#: ../pyhoca/wxgui/frontend.py:1663 #, python-format msgid "%s - desktop sharing failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1681 +#: ../pyhoca/wxgui/frontend.py:1663 msgid "" "Desktop sharing was denied by the other user or\n" "both of you have insufficient privileges to share one another's desktop." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1694 +#: ../pyhoca/wxgui/frontend.py:1676 #, python-format msgid "%s - timeout" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1694 +#: ../pyhoca/wxgui/frontend.py:1676 msgid "" "The server took long to provide a list of sharable desktops.\n" "This can happen from time to time, please try again" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1706 +#: ../pyhoca/wxgui/frontend.py:1688 #, python-format msgid "%s - desktop sharing failed" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1706 +#: ../pyhoca/wxgui/frontend.py:1688 #, python-format msgid "The desktop %s is not available for sharing (anymore)." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1724 +#: ../pyhoca/wxgui/frontend.py:1706 #, python-format msgid "The command ,,%s'' is not available on X2Go server." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1726 +#: ../pyhoca/wxgui/frontend.py:1708 #, python-format msgid "" "The command ,,%s'' is not available on X2Go server\n" "%s." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1743 +#: ../pyhoca/wxgui/frontend.py:1725 #, python-format msgid "" "Reverse TCP port forwarding request for session %s to server port %s has " "been denied." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1769 +#: ../pyhoca/wxgui/frontend.py:1751 #, python-format msgid "" "Forwarding tunnel request to [%s]:%s for session %s was denied by remote " "X2Go/SSH server. Subsystem %sstartup failed." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1788 +#: ../pyhoca/wxgui/frontend.py:1770 #, python-format msgid "%s - audio warning" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1788 +#: ../pyhoca/wxgui/frontend.py:1770 msgid "" "The X2Go PulseAudio system is not available within Remote Desktop sessions." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1795 ../pyhoca/wxgui/frontend.py:1802 +#: ../pyhoca/wxgui/frontend.py:1777 ../pyhoca/wxgui/frontend.py:1784 #, python-format msgid "%s - audio error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1795 +#: ../pyhoca/wxgui/frontend.py:1777 msgid "The X2Go PulseAudio system could not be started." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1802 +#: ../pyhoca/wxgui/frontend.py:1784 msgid "The X2Go PulseAudio system has died unexpectedly." msgstr "" -#: ../pyhoca/wxgui/frontend.py:1814 +#: ../pyhoca/wxgui/frontend.py:1796 #, python-format msgid "%s - audio problem" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1814 +#: ../pyhoca/wxgui/frontend.py:1796 #, python-format msgid "" "The audio connection could not be set up for this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1826 +#: ../pyhoca/wxgui/frontend.py:1808 #, python-format msgid "%s - client-side printing not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1826 +#: ../pyhoca/wxgui/frontend.py:1808 #, python-format msgid "" "The server denies client-side printing from within this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1838 +#: ../pyhoca/wxgui/frontend.py:1820 #, python-format msgid "%s - MIME box not available" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1838 +#: ../pyhoca/wxgui/frontend.py:1820 #, python-format msgid "" "The server does not support the X2Go MIME box.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1850 +#: ../pyhoca/wxgui/frontend.py:1832 #, python-format msgid "%s - client-side folders not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1850 +#: ../pyhoca/wxgui/frontend.py:1832 #, python-format msgid "" "The server denies client-side folder sharing with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1862 +#: ../pyhoca/wxgui/frontend.py:1844 #, python-format msgid "%s - client resources not sharable" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1862 +#: ../pyhoca/wxgui/frontend.py:1844 #, python-format msgid "" "Client-side folders and printers cannot be shared with this session.\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1881 ../pyhoca/wxgui/frontend.py:1883 +#: ../pyhoca/wxgui/frontend.py:1863 ../pyhoca/wxgui/frontend.py:1865 #, python-format msgid "%s - print error" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1881 +#: ../pyhoca/wxgui/frontend.py:1863 #, python-format msgid "" "%s\n" @@ -1629,7 +1629,7 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1883 +#: ../pyhoca/wxgui/frontend.py:1865 #, python-format msgid "" "%s\n" @@ -1637,86 +1637,86 @@ msgid "" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1898 ../pyhoca/wxgui/frontend.py:1913 +#: ../pyhoca/wxgui/frontend.py:1880 ../pyhoca/wxgui/frontend.py:1895 #, python-format msgid "%s - start" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1898 +#: ../pyhoca/wxgui/frontend.py:1880 #, python-format msgid "" "New X2Go session starting up...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1913 +#: ../pyhoca/wxgui/frontend.py:1895 #, python-format msgid "" "Another client started X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1928 ../pyhoca/wxgui/frontend.py:1943 +#: ../pyhoca/wxgui/frontend.py:1910 ../pyhoca/wxgui/frontend.py:1925 #, python-format msgid "%s - resume" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1928 +#: ../pyhoca/wxgui/frontend.py:1910 #, python-format msgid "" "Resuming X2Go session...\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1943 +#: ../pyhoca/wxgui/frontend.py:1925 #, python-format msgid "" "Another client resumed X2Go session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1958 +#: ../pyhoca/wxgui/frontend.py:1940 #, python-format msgid "%s - running" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1958 +#: ../pyhoca/wxgui/frontend.py:1940 #, python-format msgid "" "Found already running session\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1978 +#: ../pyhoca/wxgui/frontend.py:1960 #, python-format msgid "%s - suspend" msgstr "" -#: ../pyhoca/wxgui/frontend.py:1978 +#: ../pyhoca/wxgui/frontend.py:1960 #, python-format msgid "" "X2Go Session has been suspended\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:2005 +#: ../pyhoca/wxgui/frontend.py:1987 #, python-format msgid "%s - terminate" msgstr "" -#: ../pyhoca/wxgui/frontend.py:2005 +#: ../pyhoca/wxgui/frontend.py:1987 #, python-format msgid "" "X2Go Session has terminated\n" "%s" msgstr "" -#: ../pyhoca/wxgui/frontend.py:2029 ../pyhoca/wxgui/frontend.py:2035 +#: ../pyhoca/wxgui/frontend.py:2011 ../pyhoca/wxgui/frontend.py:2017 #, python-format msgid "%s: connection failure" msgstr "" -#: ../pyhoca/wxgui/frontend.py:2030 +#: ../pyhoca/wxgui/frontend.py:2012 #, python-format msgid "" "While initializing a session for profile '%s' the connection\n" @@ -1726,7 +1726,7 @@ msgid "" "want to continue?" msgstr "" -#: ../pyhoca/wxgui/frontend.py:2036 +#: ../pyhoca/wxgui/frontend.py:2018 #, python-format msgid "" "While connecting to profile '%s' the connection\n" @@ -1744,6 +1744,7 @@ msgid "" msgstr "" #: ../pyhoca/wxgui/messages.py:71 +#, python-brace-format msgid "" "{appname} is already running for user ,,{username}''!\n" "\n" @@ -1760,111 +1761,111 @@ msgstr "" msgid "No" msgstr "" -#: ../pyhoca/wxgui/messages.py:127 ../pyhoca/wxgui/printingprefs.py:142 +#: ../pyhoca/wxgui/messages.py:127 ../pyhoca/wxgui/printingprefs.py:143 msgid "Ok" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:66 +#: ../pyhoca/wxgui/printingprefs.py:67 #, python-format msgid "%s - Printing Preferences" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:68 +#: ../pyhoca/wxgui/printingprefs.py:69 #, python-format msgid "%s - Incoming Print Job from %s (%s)" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:73 +#: ../pyhoca/wxgui/printingprefs.py:74 msgid "Open this dialog window" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:74 +#: ../pyhoca/wxgui/printingprefs.py:75 msgid "Open with PDF viewer" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:75 +#: ../pyhoca/wxgui/printingprefs.py:76 msgid "Save to a local folder" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:76 +#: ../pyhoca/wxgui/printingprefs.py:77 msgid "Print to a local printer" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:77 +#: ../pyhoca/wxgui/printingprefs.py:78 msgid "Run custom print command" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:80 +#: ../pyhoca/wxgui/printingprefs.py:81 msgid "<Select a print action here>" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:114 +#: ../pyhoca/wxgui/printingprefs.py:115 msgid "Print action" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:116 +#: ../pyhoca/wxgui/printingprefs.py:117 msgid "Default action for incoming print jobs" msgstr "" #. widgets for print action PDFVIEW -#: ../pyhoca/wxgui/printingprefs.py:120 +#: ../pyhoca/wxgui/printingprefs.py:121 msgid "PDF viewer command" msgstr "" #. widgets for print action PDFSAVE -#: ../pyhoca/wxgui/printingprefs.py:127 +#: ../pyhoca/wxgui/printingprefs.py:128 msgid "Save PDFs to folder" msgstr "" #. widgets for print action PRINT -#: ../pyhoca/wxgui/printingprefs.py:134 +#: ../pyhoca/wxgui/printingprefs.py:135 msgid "Use this printer" msgstr "" #. widgets for print action PRINTCMD -#: ../pyhoca/wxgui/printingprefs.py:138 +#: ../pyhoca/wxgui/printingprefs.py:139 msgid "Custom print command" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:145 +#: ../pyhoca/wxgui/printingprefs.py:146 msgid "Print" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:249 +#: ../pyhoca/wxgui/printingprefs.py:250 msgid "- no printers installed -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:254 +#: ../pyhoca/wxgui/printingprefs.py:255 msgid "- print system is not available -" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:408 +#: ../pyhoca/wxgui/printingprefs.py:409 msgid "Choose PDF viewer application" msgstr "" -#: ../pyhoca/wxgui/printingprefs.py:431 +#: ../pyhoca/wxgui/printingprefs.py:432 msgid "Choose PDF saving location" msgstr "" -#: ../pyhoca/wxgui/sessiontitle.py:80 +#: ../pyhoca/wxgui/sessiontitle.py:68 #, python-format msgid "Session Title - %s" msgstr "" -#: ../pyhoca/wxgui/sessiontitle.py:82 +#: ../pyhoca/wxgui/sessiontitle.py:70 msgid "Change session title to" msgstr "" -#: ../pyhoca/wxgui/sessiontitle.py:84 +#: ../pyhoca/wxgui/sessiontitle.py:72 msgid "OK" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:76 +#: ../pyhoca/wxgui/serverinfo.py:64 #, python-format msgid "Server Information - %s" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:78 +#: ../pyhoca/wxgui/serverinfo.py:66 #, python-format msgid "" "Session Profile: %s\n" @@ -1872,30 +1873,30 @@ msgid "" "List of X2Go Server components, add-ons and their versions..." msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:83 +#: ../pyhoca/wxgui/serverinfo.py:71 msgid "Refresh" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:84 +#: ../pyhoca/wxgui/serverinfo.py:72 msgid "Close" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:153 +#: ../pyhoca/wxgui/serverinfo.py:141 msgid "X2Go Server" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:154 +#: ../pyhoca/wxgui/serverinfo.py:142 msgid "Server Core" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:162 +#: ../pyhoca/wxgui/serverinfo.py:150 msgid "Server Extensions" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:168 +#: ../pyhoca/wxgui/serverinfo.py:156 msgid "X2Go Server Add-ons" msgstr "" -#: ../pyhoca/wxgui/serverinfo.py:172 +#: ../pyhoca/wxgui/serverinfo.py:160 msgid "X2Go Server Features" msgstr "" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit b5dada2c7fd772e90d148c0a1403aef43138ea23 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 30 15:01:52 2014 +0200 (Now really) Support Python wxWidgets 3.0. --- debian/changelog | 2 +- pyhoca-gui | 5 +++++ pyhoca/wxgui/about.py | 5 ----- pyhoca/wxgui/brokerlogon.py | 7 ------- pyhoca/wxgui/frontend.py | 8 -------- pyhoca/wxgui/launcher.py | 14 +++++--------- pyhoca/wxgui/listdesktops.py | 7 ------- pyhoca/wxgui/logon.py | 7 ------- pyhoca/wxgui/menus_taskbar.py | 5 ----- pyhoca/wxgui/messages.py | 5 ----- pyhoca/wxgui/notify.py | 5 ----- pyhoca/wxgui/passphrase.py | 5 ----- pyhoca/wxgui/printingprefs.py | 5 ----- pyhoca/wxgui/profilemanager.py | 5 ----- pyhoca/wxgui/serverinfo.py | 7 ------- pyhoca/wxgui/sessiontitle.py | 7 ------- pyhoca/wxgui/splash.py | 5 ----- pyhoca/wxgui/taskbar.py | 7 ------- 18 files changed, 11 insertions(+), 100 deletions(-) diff --git a/debian/changelog b/debian/changelog index b742784..58bc84d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.5.0.0): - - Support Python wxWidgets 3.0. + - (Now really) Support Python wxWidgets 3.0. - Add X2Go Session Broker support. - Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). - Move most code of the pyhoca-gui executable into a dedicated class diff --git a/pyhoca-gui b/pyhoca-gui index c45acca..f1d2c0c 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -22,6 +22,11 @@ import os import sys +try: + import wxversion + wxversion.select(['3.0', '2.9', '2.8']) +except: pass + PROG_NAME = "PyHoca-GUI" try: from pyhoca.wxgui.mswin_logging import setup_mswinlog diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index ea846b1..ad9349e 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -22,11 +22,6 @@ modules ={} import os -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go diff --git a/pyhoca/wxgui/brokerlogon.py b/pyhoca/wxgui/brokerlogon.py index 29d2ec7..47e7f0a 100644 --- a/pyhoca/wxgui/brokerlogon.py +++ b/pyhoca/wxgui/brokerlogon.py @@ -20,18 +20,11 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go # gevent import gevent -import gevent.monkey -gevent.monkey.patch_all() import wx import os diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 53347af..6aba1de 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -20,18 +20,11 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import os # Python X2Go import x2go import gevent -import gevent.monkey -gevent.monkey.patch_all() import wx @@ -238,7 +231,6 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): x2go.X2GoClient.__init__(self, **_x2goclient_kwargs) wx.App.__init__(self, redirect=False, clearSigInt=False) - #SetExitHandler(self._exit_handler) if not self.args.disable_splash: diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py index 340d8ca..152d239 100644 --- a/pyhoca/wxgui/launcher.py +++ b/pyhoca/wxgui/launcher.py @@ -29,16 +29,13 @@ import gettext import subprocess import copy -import gevent.monkey -gevent.monkey.patch_all() - -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import wx +# we need to register a wx.App() instance before we load any +# of the X2Go modules. When importing x2go.*, gevent.monkey_patch_all() +# is called which seems to break wxPython 3.0... +_dummy_app = wx.App(redirect=False, clearSigInt=False) + from x2go import X2GOCLIENT_OS from x2go import CURRENT_LOCAL_USER from x2go import BACKENDS @@ -393,7 +390,6 @@ VERSION: %s if self.check_running(): sys.stderr.write("\n###############################\n### %s: already running for user %s\n###############################\n" % (self.PROG_NAME, CURRENT_LOCAL_USER)) - _dummy_app = wx.App() _dummy_app.appname = self.PROG_NAME m = PyHoca_MessageWindow_Ok(_dummy_app, shortmsg='ALREADY_RUNNING', title=u'%s (%s)...' % (self.PROG_NAME, self.VERSION), icon='{progname}_trayicon'.format(progname=self.PROG_NAME)) m.ShowModal() diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py index 8d553f0..d6010cf 100644 --- a/pyhoca/wxgui/listdesktops.py +++ b/pyhoca/wxgui/listdesktops.py @@ -20,18 +20,11 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go # gevent import gevent -import gevent.monkey -gevent.monkey.patch_all() import wx import os diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index dc35875..d02c108 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -20,18 +20,11 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go # gevent import gevent -import gevent.monkey -gevent.monkey.patch_all() import wx import os diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 0451227..2a1a674 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -18,11 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import os.path import wx import re diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 15ce000..c1a7330 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -21,11 +21,6 @@ # Dick Kniep <dick.kniep@lindix.nl> -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import wx import os diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 4e15251..db1ceba 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -18,11 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import wx from x2go import X2GOCLIENT_OS from x2go import log diff --git a/pyhoca/wxgui/passphrase.py b/pyhoca/wxgui/passphrase.py index 6929445..9b3c029 100644 --- a/pyhoca/wxgui/passphrase.py +++ b/pyhoca/wxgui/passphrase.py @@ -20,11 +20,6 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 49c1129..e3e72da 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -21,11 +21,6 @@ import os import re -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import wx import x2go.log as log diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 7fa9c83..1aae3d2 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -18,11 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import wx import os import copy diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py index 2a095b1..6e5bdd8 100644 --- a/pyhoca/wxgui/serverinfo.py +++ b/pyhoca/wxgui/serverinfo.py @@ -20,18 +20,11 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go # gevent import gevent -import gevent.monkey -gevent.monkey.patch_all() import wx import os diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index e9781a0..14edff8 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -20,18 +20,11 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go # gevent import gevent -import gevent.monkey -gevent.monkey.patch_all() import wx import os diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index cf9ff4c..4dc9531 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -18,11 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - import wx import os diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index d14b181..e8847cf 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -20,17 +20,10 @@ modules ={} -try: - import wxversion - wxversion.select(['3.0', '2.9', '2.8']) -except: pass - # Python X2Go import x2go import gevent -import gevent.monkey -gevent.monkey.patch_all() import wx -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org