10 Jun '12
The branch, master has been updated
via 6e0930a6543de891b493d8868647e515f2b9985d (commit)
from 6739270822a083720a20b92c56df5acf9383d16e (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 6e0930a6543de891b493d8868647e515f2b9985d
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 21:17:33 2012 +0200
Dutch i18n update
-----------------------------------------------------------------------
Summary of changes:
po/nl.po | 218 +++++++++++++++++++++++++++++++-------------------------------
1 files changed, 110 insertions(+), 108 deletions(-)
The diff of changes is:
diff --git a/po/nl.po b/po/nl.po
index a6a21b0..51e505a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-07 09:16+0200\n"
-"PO-Revision-Date: 2012-05-28 14:51+0100\n"
+"PO-Revision-Date: 2012-06-10 21:16+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: nl <dick.kniep(a)lindix.nl>\n"
"Language: \n"
@@ -25,11 +25,13 @@ msgstr ""
msgid "%s (via %s)"
msgstr "%s (via %s)"
-#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96
+#: ../pyhoca/wxgui/logon.py:84
+#: ../pyhoca/wxgui/logon.py:96
msgid "Username"
msgstr "Gebruiker"
-#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98
+#: ../pyhoca/wxgui/logon.py:86
+#: ../pyhoca/wxgui/logon.py:98
msgid "Password"
msgstr "Wachtwoord"
@@ -49,23 +51,28 @@ msgstr "Sessie login"
msgid "SSH proxy server login"
msgstr "Login via SSH Proxy"
-#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:313
-#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
+#: ../pyhoca/wxgui/logon.py:121
+#: ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/messages.py:109
+#: ../pyhoca/wxgui/printingprefs.py:138
#: ../pyhoca/wxgui/sessiontitle.py:75
msgid "Cancel"
msgstr "Afbreken"
-#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
+#: ../pyhoca/wxgui/logon.py:277
+#: ../pyhoca/wxgui/logon.py:319
#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
+#: ../pyhoca/wxgui/logon.py:278
+#: ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr "Gebruiker mag geen X2Go sessie starten!"
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
+#: ../pyhoca/wxgui/logon.py:283
+#: ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
@@ -91,30 +98,32 @@ msgstr "%s - SSH Proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Authenticatie via SSH Proxy Server mislukt!"
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
+#: ../pyhoca/wxgui/logon.py:350
+#: ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr "%s - socket fout"
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/logon.py:357
+#: ../pyhoca/wxgui/frontend.py:519
#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr "%s - server sleutel fout"
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
-msgid ""
-"The remote server's host key is invalid or has not been accepted by the user"
-msgstr ""
-"De sleutel van de server is ongeldig of is niet geaccepteerd door de "
-"gebruiker"
+#: ../pyhoca/wxgui/logon.py:358
+#: ../pyhoca/wxgui/frontend.py:519
+msgid "The remote server's host key is invalid or has not been accepted by the user"
+msgstr "De sleutel van de server is ongeldig of is niet geaccepteerd door de gebruiker"
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
+#: ../pyhoca/wxgui/logon.py:365
+#: ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr "%s - home directory niet aanwezig"
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
+#: ../pyhoca/wxgui/logon.py:366
+#: ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr "De home directory op afstand van de gebruiker bestaat niet"
@@ -123,12 +132,14 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet"
msgid "%s - key error"
msgstr "%s - sleutel fout"
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/logon.py:381
+#: ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr "%s - authenticatie fout"
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
+#: ../pyhoca/wxgui/logon.py:389
+#: ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr "%s - sleutel fout"
@@ -215,23 +226,28 @@ msgid "Windows Terminal Server (RDP-proxy)"
msgstr "Windows Terminalserver (RDP-proxy)"
#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:84
+#: ../pyhoca/wxgui/profilemanager.py:198
msgid "Custom command"
msgstr "Speciaal Commando"
-#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/profilemanager.py:87
+#: ../pyhoca/wxgui/menus_taskbar.py:355
msgid "Internet Browser"
msgstr "Internetbrowser"
-#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:356
+#: ../pyhoca/wxgui/profilemanager.py:88
+#: ../pyhoca/wxgui/menus_taskbar.py:356
msgid "Email Client"
msgstr "E-Mail Programma"
-#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357
+#: ../pyhoca/wxgui/profilemanager.py:89
+#: ../pyhoca/wxgui/menus_taskbar.py:357
msgid "Office"
msgstr "Office"
-#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358
+#: ../pyhoca/wxgui/profilemanager.py:90
+#: ../pyhoca/wxgui/menus_taskbar.py:358
msgid "Terminal"
msgstr "Terminal"
@@ -357,7 +373,7 @@ msgstr "RDP Opties"
#: ../pyhoca/wxgui/profilemanager.py:206
msgid "Integrate remote application(s) into local desktop (rootless mode)"
-msgstr ""
+msgstr "Integreer remote toepassing in de lokale desktop (rootless mode)"
#: ../pyhoca/wxgui/profilemanager.py:207
msgid "Menu of published applications"
@@ -366,7 +382,8 @@ msgstr "Menu met gepubliceerde applicaties"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:214 ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:214
+#: ../pyhoca/wxgui/profilemanager.py:224
msgid "User"
msgstr "Gebruiker"
@@ -443,18 +460,15 @@ msgstr "DPI-waarde instellen"
#: ../pyhoca/wxgui/profilemanager.py:261
msgid "Do not set (use server-side tools to configure the keyboard)"
-msgstr ""
+msgstr "Uitzetten (gebruik server-side tools om het toetsenbord in te stellen)"
#: ../pyhoca/wxgui/profilemanager.py:262
-msgid ""
-"Automatically detect and use client-side keyboard configuration inside the "
-"session"
-msgstr ""
+msgid "Automatically detect and use client-side keyboard configuration inside the session"
+msgstr "Gebruik automatisch gedetecteerd toetsenbord in de sessie"
#: ../pyhoca/wxgui/profilemanager.py:263
-#, fuzzy
msgid "Use custom keyboard settings as provided below"
-msgstr "Huidige toetsenbord-instellingen behouden"
+msgstr "Gebruik de onderstaande speciale toetsenbord instellingen"
#: ../pyhoca/wxgui/profilemanager.py:264
msgid "Keyboard model"
@@ -462,11 +476,11 @@ msgstr "Toetsenbord model"
#: ../pyhoca/wxgui/profilemanager.py:266
msgid "Layout"
-msgstr ""
+msgstr "Layout"
#: ../pyhoca/wxgui/profilemanager.py:268
msgid "Layout variant"
-msgstr ""
+msgstr "Layout variant"
#: ../pyhoca/wxgui/profilemanager.py:270
msgid "Enable sound support"
@@ -506,7 +520,8 @@ msgstr "Delen van lokale mappen"
msgid "Path"
msgstr "Pad"
-#: ../pyhoca/wxgui/profilemanager.py:288 ../pyhoca/wxgui/profilemanager.py:307
+#: ../pyhoca/wxgui/profilemanager.py:288
+#: ../pyhoca/wxgui/profilemanager.py:307
msgid "Add"
msgstr "Toevoegen"
@@ -640,7 +655,8 @@ msgstr "Kies een map om te delen"
#: ../pyhoca/wxgui/profilemanager.py:1666
#: ../pyhoca/wxgui/profilemanager.py:1669
#: ../pyhoca/wxgui/profilemanager.py:1674
-#: ../pyhoca/wxgui/profilemanager.py:1684 ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1684
+#: ../pyhoca/wxgui/menus_taskbar.py:106
msgid "Profile Manager"
msgstr "Profiel manager"
@@ -661,12 +677,10 @@ msgstr "SSH Proxy Configuratie is niet volledig! Opnieuw proberen..."
#: ../pyhoca/wxgui/profilemanager.py:1684
#, python-format
msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
-"proxy to.\n"
+"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n"
"Please change the SSH proxy settings accordingly."
msgstr ""
-"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale "
-"SSH proxy.\n"
+"Een ander profiel (%s) gebruikt [%s]:%s voor de verbinding met een lokale SSH proxy.\n"
"Verander de SSH proxy instelling om dit probleem te verhelpen."
#: ../pyhoca/wxgui/profilemanager.py:1704
@@ -716,7 +730,8 @@ msgstr "Voorkeur voor afdrukken"
msgid "Client Options"
msgstr "Opties"
-#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723
+#: ../pyhoca/wxgui/menus_taskbar.py:144
+#: ../pyhoca/wxgui/menus_taskbar.py:723
#: ../pyhoca/wxgui/menus_taskbar.py:885
msgid "E&xit"
msgstr "&Beeindigen"
@@ -725,7 +740,8 @@ msgstr "&Beeindigen"
msgid "Window title"
msgstr "Scherm titel"
-#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551
+#: ../pyhoca/wxgui/menus_taskbar.py:209
+#: ../pyhoca/wxgui/menus_taskbar.py:551
msgid "Resume Session"
msgstr "Sessie hervatten"
@@ -741,31 +757,38 @@ msgstr "Sessie overnemen"
msgid "Transfer Session (not possible)"
msgstr "Sessie overnemen (niet mogelijk)"
-#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542
+#: ../pyhoca/wxgui/menus_taskbar.py:228
+#: ../pyhoca/wxgui/menus_taskbar.py:542
msgid "Suspend Session (and disconnect/exit)"
msgstr "Suspend Sessie (en Verbinding verbreken / e&xit)"
-#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544
+#: ../pyhoca/wxgui/menus_taskbar.py:230
+#: ../pyhoca/wxgui/menus_taskbar.py:544
msgid "Suspend Session (and disconnect)"
msgstr "Suspend Sessie (en Verbinding verbreken)"
-#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:232
+#: ../pyhoca/wxgui/menus_taskbar.py:546
msgid "Suspend Session"
msgstr "Suspend Sessie"
-#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555
+#: ../pyhoca/wxgui/menus_taskbar.py:238
+#: ../pyhoca/wxgui/menus_taskbar.py:555
msgid "Terminate Session (and disconnect/exit)"
msgstr "Sessie beëindigen (en Verbinding verbreken / e&xit)"
-#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557
+#: ../pyhoca/wxgui/menus_taskbar.py:240
+#: ../pyhoca/wxgui/menus_taskbar.py:557
msgid "Terminate Session (and disconnect)"
msgstr "Sessie beëindigen (en Verbinding verbreken)"
-#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559
+#: ../pyhoca/wxgui/menus_taskbar.py:242
+#: ../pyhoca/wxgui/menus_taskbar.py:559
msgid "Terminate Session"
msgstr "Sessie beëindigen"
-#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539
+#: ../pyhoca/wxgui/menus_taskbar.py:246
+#: ../pyhoca/wxgui/menus_taskbar.py:539
msgid "Refresh menu tree"
msgstr "Ververs menu"
@@ -833,7 +856,8 @@ msgstr "Hulpmiddelen"
msgid "Other Applications"
msgstr "Andere applicaties"
-#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476
+#: ../pyhoca/wxgui/menus_taskbar.py:464
+#: ../pyhoca/wxgui/menus_taskbar.py:476
#, python-format
msgid "Connect %s"
msgstr "Verbind %s"
@@ -846,11 +870,13 @@ msgstr "Nu aan het verbinden..."
msgid "Start &new Desktop Session"
msgstr "&Nieuwe Desktop Sessie starten"
-#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627
+#: ../pyhoca/wxgui/menus_taskbar.py:489
+#: ../pyhoca/wxgui/menus_taskbar.py:627
msgid "Retrieving Application Menu..."
msgstr "Bezig met ophalen applicatiemenu..."
-#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630
+#: ../pyhoca/wxgui/menus_taskbar.py:493
+#: ../pyhoca/wxgui/menus_taskbar.py:630
msgid "Retrieve Application Menu"
msgstr "Haal applicatiemenu op"
@@ -914,7 +940,8 @@ msgstr "Sessie starten/hervatten"
msgid "Connect Server"
msgstr "Verbinden met Server"
-#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68
+#: ../pyhoca/wxgui/about.py:66
+#: ../pyhoca/wxgui/about.py:68
#, python-format
msgid "About %s ..."
msgstr "About %s ..."
@@ -946,11 +973,8 @@ msgid "Public SSH key authentication has been successful."
msgstr "Public SSH-key authenticatie is gelukt."
#: ../pyhoca/wxgui/frontend.py:526
-msgid ""
-"The SSH proxy's host key is invalid or has not been accepted by the user"
-msgstr ""
-"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de "
-"gebruiker"
+msgid "The SSH proxy's host key is invalid or has not been accepted by the user"
+msgstr "De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de gebruiker"
#: ../pyhoca/wxgui/frontend.py:547
#, python-format
@@ -974,7 +998,8 @@ msgstr "Een onbekende fout is bij de authenticatie opgetreden"
msgid "Unknown session profile, configure before using it..."
msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..."
-#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
+#: ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr "%s - sessie waarschuwing"
@@ -982,7 +1007,7 @@ msgstr "%s - sessie waarschuwing"
#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
-msgstr ""
+msgstr "Uitvoering van commando \"%s\" faalde"
#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
@@ -1045,15 +1070,13 @@ msgstr "%s - Verbindingsfout (channel error)"
#: ../pyhoca/wxgui/frontend.py:956
#, python-format
-msgid ""
-"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
-"server..."
-msgstr ""
-"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u "
-"opnieuw aan te melden..."
+msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..."
+msgstr "De Verbinding met de server %s werd onverwacht verbroken! Probeer om u opnieuw aan te melden..."
-#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
-#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
+#: ../pyhoca/wxgui/frontend.py:967
+#: ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr "%s - sessie fout"
@@ -1078,21 +1101,13 @@ msgstr ""
#: ../pyhoca/wxgui/frontend.py:982
#, python-format
-msgid ""
-"Reverse TCP port forwarding request for session %s to server port %s has "
-"been denied."
-msgstr ""
-"Reverse TCP port forwarding request for session %s to server port %s has "
-"been denied."
+msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied."
+msgstr "Reverse TCP port forwarding request for session %s to server port %s has been denied."
#: ../pyhoca/wxgui/frontend.py:988
#, python-format
-msgid ""
-"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
-msgstr ""
-"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
-"X2go/SSH server. Session startup failed."
+msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed."
+msgstr "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed."
#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
@@ -1100,12 +1115,11 @@ msgid "%s - audio warning"
msgstr "%s - audio waarschuwing"
#: ../pyhoca/wxgui/frontend.py:1003
-msgid ""
-"The X2Go PulseAudio system is not available within Remote Desktop sessions."
-msgstr ""
-"Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies"
+msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions."
+msgstr "Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies"
-#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr "%s - audio fout"
@@ -1184,7 +1198,8 @@ msgstr ""
"Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
+#: ../pyhoca/wxgui/frontend.py:1038
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr "%s - Printfout"
@@ -1211,7 +1226,8 @@ msgstr ""
"...veroorzaakt door sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
+#: ../pyhoca/wxgui/frontend.py:1044
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr "%s - Start"
@@ -1234,7 +1250,8 @@ msgstr ""
"Een andere X2Go-client heeft deze sessie gestart\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
+#: ../pyhoca/wxgui/frontend.py:1052
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr "%s - hervatten"
@@ -1331,7 +1348,8 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133
+#: ../pyhoca/wxgui/messages.py:103
+#: ../pyhoca/wxgui/printingprefs.py:133
msgid "Ok"
msgstr "Ok"
@@ -1436,32 +1454,24 @@ msgstr "OK"
#~ msgid "us"
#~ msgstr "us"
-
#~ msgid "pc105/us"
#~ msgstr "altgr/intl"
-
#~ msgid "Keyboard layout"
#~ msgstr "Toetsenbord layout"
-
#~ msgid "%s - DNS error"
#~ msgstr "%s - DNS fout"
-
#~ msgid "still loading"
#~ msgstr "nog aan het laden"
-
#~ msgid ""
#~ "On slow connections, the loading of the application menu can take a "
#~ "couple of seconds."
#~ msgstr ""
#~ "Bij een langzame verbinding kan het laden van het menu met de applicaties "
#~ "enige seconden duren"
-
#~ msgid "Disconnect and E&xit"
#~ msgstr "Verbreek verbinding en e&xit"
-
#~ msgid "%s - connect error"
#~ msgstr "%s - Verbindingsfout"
-
#~ msgid "new session profile"
#~ msgstr "Nieuw Profiel"
@@ -1472,34 +1482,26 @@ msgstr "OK"
#, fuzzy
#~ msgid "Retrieving Application menu..."
#~ msgstr "Enkelvoudige Applicatie"
-
#~ msgid "RDP settings"
#~ msgstr "RDP instellingen"
-
#~ msgid "Session Profile"
#~ msgstr "Sessie Profiel"
-
#~ msgid "Icon"
#~ msgstr "Icon"
-
#~ msgid "All session profiles are connected"
#~ msgstr "Alle profielen zijn verbonden"
-
#~ msgid "New Profile"
#~ msgstr "Profiel"
-
#~ msgid "%s - print job"
#~ msgstr "%s - print job"
-
#~ msgid ""
#~ "Opening print job dialog not implemented yet!!!\n"
#~ "%s"
#~ msgstr ""
#~ "De Print job dialog is nog niet geimplementeerd!!!\n"
#~ "%s"
-
#~ msgid "Profile icon"
#~ msgstr "Profile icon"
-
#~ msgid "Arts"
#~ msgstr "Arts"
+
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)).
1
0
python-x2go.git - build-main (branch) updated: 0.2.0.2-2-g05fea02
by git-adminï¼ x2go.org 10 Jun '12
by git-adminï¼ x2go.org 10 Jun '12
10 Jun '12
The branch, build-main has been updated
via 05fea02e4e32457cd90936469db5b6232e5f6f9e (commit)
from 56223c33fa9c13bb64ffa0bb0d6c6bb4884651bc (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 05fea02e4e32457cd90936469db5b6232e5f6f9e
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 09:04:18 2012 +0200
whitespace fix
-----------------------------------------------------------------------
Summary of changes:
x2go/client.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
The diff of changes is:
diff --git a/x2go/client.py b/x2go/client.py
index e568112..c9527bb 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -463,6 +463,7 @@ class X2goClient(object):
@type fingerprint: C{str}
@param fingerprint_type: finger print type (like RSA, DSA, ...)
@type fingerprint_type: C{str}
+
@return: if host validity is verified, this hook method should return C{True}
@rtype: C{bool}
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
10 Jun '12
The branch, master has been updated
via 6739270822a083720a20b92c56df5acf9383d16e (commit)
from 99e23c35af1a3fe3a1e06cd55a29d605d928c561 (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 6739270822a083720a20b92c56df5acf9383d16e
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 09:35:32 2012 +0200
changelog cleanup (pre-release)
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 57 ++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 35 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ad33a26..9bc6946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,66 +7,62 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low
- Add switch that enables/disables custom/server-side session window
titles.
- Add switch that enables/disables default/custom session window title.
- - Update of i18n files: en, de, es.
- - Drop handling of session icon, not used in pyhoca-gui, anyway.
- Fix profile manager window size (shrinking for usage on netbooks).
- Existing profiles can be used as templates for new session profiles.
- Session profile menu: allow multi-depth submenu structures, use '/'
as submenu separator item in session profile name.
- - Enable session profile submenus functionality to profile manager.
+ - Port session profile submenus functionality to profile manager.
- Rename single application OFFICE from Openoffice.org to Office (more
generic name).
- Add extra menu: launch single application, once a session profile is
connected.
- - Add extra session menu titem: Rename Session Window.
+ - Add extra session menu item: Rename Session Window.
- Show desktop session name in menu for ,,start session'' item.
- Show session window title in session menu.
- Add support for bringing a session window on top of all other
- windows (i.e. to foreground).
+ windows (i.e. to foreground). Currently only works on MS Windows.
- Add icons folder ,,icons_symlinked'' for people who will package
PyHoca-GUI on Debian or other Distros that also ship the
gnome-colors-common icon theme.
- Replace non-code string ,,X2go'' by ,,X2Go''.
- Rearrange profile manager. Add one more tab to the profile manager
window.
- Reintroduce window icon in profile manager.
- Use x2golistmounts to detect server-side unsharing of client-side
folders.
- Remove pointed brackets from new/derived session profile names.
- - Mark master sessions with a marker ,,(*)''.
+ - Introduce master session concept. Only master sessions can mount
+ client-side folders into a session. Mark master sessions with a
+ marker ,,(*)''.
- Catch AttributeError during taskbar menu generation that occured
during querying the session command from a non-existent session.
- Enforce startup of rootless session if launching a single application.
- - Provide empty translation file sv.po.
- - Provide empty translation file nb_NO.po.
- Fix profile manager GUI layout, make default keyboard layout i18n
capable.
- Handle the situation that no printer is installed with CUPS/WinSpool
gracefully.
- Hook methods that notify about non-availabilities around printing,
MIME box, local folder sharing.
- - Update i18n files: en, de.
- Only allow session window manipulations for sessions that are associated
to the running PyHoca-GUI client.
- Fix icon and button sizes in profile manager.
- Use different textfield sizes for wxMSWin and wxGTK.
- Beautify MIME box configuration block in profile manager.
- - Add published appications support.
+ - Add published applications support.
- Send a libnotify warning if server does not support published
applications.
- Add icon support for the published applications menu (any icon
- type except SVGs works).
+ type except SVGs work).
- On exit only suspend running sessions we are associated with.
- Provide icons for category submenus.
- Provide 'en' as default language if --lang has not been given on the
command line (MS Windows issue).
- Published Applications on MS Windows: icon size is 16x16.
- - Catch X2GoSessionRegistryException if used session uuid is not valid
+ - Catch X2GoSessionRegistryException if used session UUID is not valid
anymore.
- Implement single session profile support (--single-session-profile
- Boolean command line option).
- - Move rendering of menu tree partially into Python X2Go.
- - Update of en/de i18n files.
+ boolean command line option).
+ - Rendering of published applications menu tree has partially been moved
+ into Python X2Go.
- Fix disabling of published applications tick box in profile manager.
- Show the detected GUI language in GUI output.
- Add support for published applications with no category submenus.
@@ -80,14 +76,14 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low
to session profiles has been moved into Python X2Go.
- Do not let wx.EndBusyCursor crash the application on Windows.
- Add connect and exit menu items if in single-session-profile mode.
- - Properly catch CTRL-C and SIGTERM signals.
+ - Properly catch CTRL-C and SIGTERM signals (not working on MS Windows,
+ yet).
- Make sure application really exits gracefully.
- - Provide a separate SetExitHandler function to catch signals from outside.
- - Use Pulseaudio 1.0 for developmental testing.
- - Windows binary: include pulseaudio 1.0 and vcxsrv 1.11.4.0.
+ - Provide a separate SetExitHandler function to catch signals from outside
+ (currently unused, though).
+ - Windows binary: include pulseaudio 1.1 and vcxsrv 1.12.0.1.
- Provide code for Windows packaging (py2exe, NSIS) in PyHoca-GUI's
setup.py.
- - Ship PulseAudio 1.1 with PyHoca-GUI.
- Stdout/stderr diversion when frozen with py2exe: stdout will overwrite
the last log file, stderr will append to the very same file.
- Allow TCP ports higher than 64000 for SSH and sound server connections.
@@ -108,10 +104,8 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low
applications mode.
- Fix/improve --non-interactive command line option.
- When packaging Windows binary with py2exe, use nxproxy-3.5.0.12.
- - When packaging Windows binary with py2exe, use VcXsrv-1.12.0.1.
- Fix missing declaration of notificationmessage_NotifierPopup.timeout.
- Make sure the log file on Windows does not grow limitlessly.
- - Fix initialization of published applications sessions.
- Catch AttributeError in case a published applications session has not yet
fully started.
- Catch and notify command startup failures for published applications
@@ -132,9 +126,9 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low
- Fallback to default splash image if the custom splash does not exist.
- Do not crash if a provided system tray icon cannot be found. Use a
fallback icon instead.
- - os.path.is<type> require string option, not Unicode.
+ - os.path.is<type> require string options, not Unicode.
- Add option --about-image. Allow changing the application's name by
- renaming the ,,pyhoca-gui'' script.
+ renaming (or symlinking) the ,,pyhoca-gui'' script.
- Allow custom commands to be desktop sessions.
- Make new session option keyboard ,,variant'' configurable in profile
manager.
@@ -142,10 +136,11 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low
- Update man page.
- Let logon and session title window appear at top of screen for pyhoca-gui
running within a Ubuntu Unity session.
+ - Provide README.Unity that explains how to re-allow the PyHoca-GUI icon in
+ the systray of the panel.
- Make auto-detected keyboard setup (i.e. usage of x2gosetkeyboard)
configurable in the profile manager.
- - Fix published application startup.
- * Depend on Python X2Go 0.2.0.1.
+ * Depend on Python X2Go 0.2.0.2.
* Install GNOME icons via dh_links.
* Install X2Go icons with explicit install paths.
* Add /debian/source/options file with entry single-debian-patch. Fix control
@@ -154,22 +149,14 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low
* Include dialog-*.png icons for 64x64 pixel size as they are missing in
gnome-colors-common package.
* Install published applications icons in Debian package.
- * Provide README.Unity that explains how to re-allow the PyHoca-GUI icon in
- the systray of the panel.
[ Terje Andersen ]
* New upstream version (0.2.0.0):
- Add Bokmal (Norway) translation file (not complete, yet).
- - Fine-tune Bokmal (Norway translation file.
- - Update Bokmal translation (pre-release).
[ Daniel Lindgren ]
* New upstream version (0.2.0.0):
- Add Swedish translation file.
- - Fine-tune Swedish translation.
- - Update Swedish translation.
- - Update Swedish translation (published applications).
- - Update Swedish translation (pre-release).
[ Dick Kniep ]
* New upstream version (0.2.0.0):
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)).
1
0
10 Jun '12
The branch, master has been updated
via 99e23c35af1a3fe3a1e06cd55a29d605d928c561 (commit)
from dbd4e8c2126de479b9b3d8c190ae744e78ecf51e (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 99e23c35af1a3fe3a1e06cd55a29d605d928c561
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 09:20:23 2012 +0200
be more tolerant to later API changes
-----------------------------------------------------------------------
Summary of changes:
pyhoca/wxgui/frontend.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 9c5276d..77e9d75 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -364,7 +364,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if not self.args.session_profile:
self._X2goClient__register_all_session_profiles()
- def session_auto_connect(self, session_uuid):
+ def session_auto_connect(self, session_uuid, **kwargs):
"""\
Override C{X2goClient.session_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
@@ -376,7 +376,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if self.auto_connect and self.get_session(session_uuid).get_session_profile_option('auto_connect'):
self.HOOK_profile_auto_connect(self.get_session_profile_name(session_uuid))
- def HOOK_profile_auto_connect(self, profile_name):
+ def HOOK_profile_auto_connect(self, profile_name, **kwargs):
"""\
Override C{X2goClient.HOOK_profile_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
@@ -395,7 +395,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.OnSessionAuthenticate(evt, session_uuid=session_uuid)
- def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False):
+ def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False, **kwargs):
"""\
Override C{X2goClient.session_auto_start_or_resume()} to differentiate between the application options
C{resume_newest_on_connect}, C{resume_oldest_on_connect} and C{resume_all_on_connect}.
@@ -406,11 +406,11 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
if not self.get_session(session_uuid).published_applications:
if self.resume_newest_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect)
+ self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect, **kwargs)
elif self.resume_oldest_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect)
+ self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect, **kwargs)
elif self.resume_all_on_connect:
- self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect)
+ self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect, **kwargs)
def _exit_handler(self, *args):
"""\
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)).
1
0
10 Jun '12
The branch, master has been updated
via dbd4e8c2126de479b9b3d8c190ae744e78ecf51e (commit)
via afce9ce43af2f911111034e243a4921cd771345c (commit)
via df14fe3300c259f228c05dca265eeba5ac094bb4 (commit)
via 33c9583bfe8b14569224ef28995c8006e6d10205 (commit)
from 81cd8e0962a066eeab9945148e853cfcefe407d2 (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 dbd4e8c2126de479b9b3d8c190ae744e78ecf51e
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 09:18:07 2012 +0200
finished work on __doc__ strings
commit afce9ce43af2f911111034e243a4921cd771345c
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 05:46:56 2012 +0200
typo fix
commit df14fe3300c259f228c05dca265eeba5ac094bb4
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 05:46:35 2012 +0200
add __doc__ strings to profilemanager.py
commit 33c9583bfe8b14569224ef28995c8006e6d10205
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Jun 9 18:41:15 2012 +0200
remove duplicate line
-----------------------------------------------------------------------
Summary of changes:
pyhoca/wxgui/frontend.py | 616 +++++++++++++++++++++++++++++++++++-----
pyhoca/wxgui/messages.py | 157 ++++++++++-
pyhoca/wxgui/notify.py | 1 -
pyhoca/wxgui/printingprefs.py | 81 ++++++-
pyhoca/wxgui/profilemanager.py | 285 ++++++++++++++++++-
5 files changed, 1055 insertions(+), 85 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 1c291fd..9c5276d 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -70,7 +70,13 @@ wx.SetDefaultPyEncoding("utf-8")
wx.InitAllImageHandlers()
def SetExitHandler(func):
+ """\
+ An exit handler function for MS Windows / Unix. Currently unused.
+ @param func: function that shall get registered with win32api as exit handler.
+ @type func: C{func}
+
+ """
if os.name == 'nt' :
try :
import win32api
@@ -91,13 +97,52 @@ def SetExitHandler(func):
class PyHocaGUI(wx.App, x2go.X2goClient):
+ """\
+ The main application instance.
+
+ L{PyHocaGUI} provides a system tray icon (like the GNOME network manager applet) that
+ provides a multi-session / multi-connection X2Go client.
+
+ L{PyHocaGUI} has been developed with the focus of easy customization by SaaS providers.
+ Product branding is a wanted feature. The customizable elements are:
+
+ - application name
+ - system tray icon (idle icon, while-connecting icon)
+ - splash screen
+ - window that shows the ,,About'' dialog
+ With L{PyHocaGUI} you can also restrict several functionalities: For example, it is possible
+ to disable the multi-session support completely and use L{PyHocaGUI} only or one
+ session in published applications mode. This turns L{PyHocaGUI} into a pseudo-startmenu that
+ blends in X2Go server-side application into one's desktop shell.
+
+ L{PyHocaGUI}'s main challenge is to combine two different event handlers:
+ wxPython and gevent.
+
+ """
def __init__(self, args, logger, liblogger,
appname='PyHoca-GUI',
vendorname='Open Source Software Foundation',
version=None,):
"""\
- STILL UNDOCUMENTED
+ Initialize the application (constructor).
+
+ The main control data structure if the C{args} object that gets passed on to L{PyHocaGUI}'s constructor.
+
+ @param args: a class with properties representing the command-line options that are available to L{PyHocaGUI} instances.
+ @type args: C{argparse.ArgumentParser} (or similar)
+ @param logger: you can pass an L{X2goLogger} object to the
+ L{PyHocaCLI} constructor for logging application events
+ @type logger: Python X2Go C{X2goLogger} instance
+ @param liblogger: you can pass an L{X2goLogger} object to the
+ L{PyHocaCLI} constructor for logging application events, this object is forwarded to the C{X2goClient} class in Python X2Go
+ @type liblogger: Python X2Go C{X2goLogger} instance
+ @param appname: name of the application instance
+ @type appname: C{str}
+ @param vendorname: name of the company distributing this application
+ @type vendorname: C{str}
+ @param version: version of the application
+ @type version: C{str}
"""
if appname == 'pyhoca-gui':
@@ -190,7 +235,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnInit(self):
"""\
- STILL UNDOCUMENTED
+ Gets called once the application (wx.App) gets initialized.
+
+ @return: always C{True}
+ @rtype: C{bool}
"""
wx.BeginBusyCursor()
@@ -205,7 +253,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnIdle(self, evt):
"""\
- STILL UNDOCUMENTED
+ Integration of gevent/libevent and wxPython.
+
+ Whenever wxPython seems to be idle, inject a gevent.sleep().
+
+ @return: always C{True}
+ @rtype: C{bool}
"""
try:
@@ -223,7 +276,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def startGUI(self):
"""\
- STILL UNDOCUMENTED
+ Startup method for L{PyHocaGUI}.
"""
# cmd line options
@@ -298,7 +351,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
gevent.spawn(self._auto_connect)
def _auto_connect(self):
+ """\
+ Register all available session profiles on application start.
+
+ The auto-registration of all session profiles will trigger the auto-connect feature
+ implemented in C{X2goClient} of Python X2Go.
+ """
# wait for splash to appear
if not self.args.disable_splash:
gevent.sleep(1)
@@ -306,13 +365,25 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._X2goClient__register_all_session_profiles()
def session_auto_connect(self, session_uuid):
+ """\
+ Override C{X2goClient.session_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
+
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+ """
# override X2goClient method
if self.auto_connect and self.get_session(session_uuid).get_session_profile_option('auto_connect'):
self.HOOK_profile_auto_connect(self.get_session_profile_name(session_uuid))
def HOOK_profile_auto_connect(self, profile_name):
+ """\
+ Override C{X2goClient.HOOK_profile_auto_connect()} to always divert authentication to L{OnSessionAuthenticate}.
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+
+ """
session_uuids = self.client_registered_sessions_of_profile_name(profile_name=profile_name)
if session_uuids:
session_uuid = session_uuids[0]
@@ -325,7 +396,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.OnSessionAuthenticate(evt, session_uuid=session_uuid)
def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False):
+ """\
+ Override C{X2goClient.session_auto_start_or_resume()} to differentiate between the application options
+ C{resume_newest_on_connect}, C{resume_oldest_on_connect} and C{resume_all_on_connect}.
+
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+ """
if not self.get_session(session_uuid).published_applications:
if self.resume_newest_on_connect:
self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect)
@@ -335,13 +413,23 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect)
def _exit_handler(self, *args):
+ """\
+ L{PyHocaGUI}'s exit handler method.
+
+ Currently unused.
+
+ """
self.WakeUpIdle()
self.ExitMainLoop()
# wx.App's OnExit method
def OnExit(self):
"""\
- STILL UNDOCUMENTED
+ Cleanly exit the application.
+
+ - suspend all sessions
+ - disconnect all connected session profiles
+ - close all associated windows
"""
# close open password dialogs (or other remaining windows)
@@ -361,7 +449,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
# the taskbar's OnExit method...
def OnTaskbarExit(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to exit the application via the system tray icon in the taskbar.
+
+ @param evt: event
+ @type evt: C{obj}
"""
self._pyhoca_logger('exit application', loglevel=x2go.log.loglevel_INFO, )
@@ -379,7 +470,17 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.ExitMainLoop()
def _init_pubapp_session(self, session_uuid=None, profile_name=None):
+ """\
+ Initialize a single session in published applications mode for a given profile.
+
+ NOTE: L{PyHocaGUI} by design only supports _one_ published applications session per connected profile.
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+
+ """
if profile_name is None and session_uuid:
profile_name = self._X2goClient__get_session_profile_name(session_uuid)
@@ -461,7 +562,15 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
return None
def _post_authenticate(self, evt, session_uuid):
+ """\
+ Tasks that have to be done directly after authentication of a session profile.
+
+ @param evt: event
+ @type evt: C{obj}
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+ """
try:
profile_name = self.get_session(session_uuid).get_profile_name()
@@ -473,6 +582,15 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
pass
def _do_authenticate(self, evt, session_uuid):
+ """\
+ Perform authentication for a given session.
+
+ @param evt: event
+ @type evt: C{obj}
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+
+ """
connect_failed = False
profile_name = self.get_session(session_uuid).get_profile_name()
try:
@@ -589,7 +707,12 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnSessionAuthenticate(self, evt, session_uuid=None):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests connecting to a session profile.
+
+ @param evt: event
+ @type evt: C{obj}
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -606,7 +729,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnSessionStart(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to start a new X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -618,7 +744,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnPubAppSessionStart(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to start a new X2Go session in published applications mode.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -626,26 +755,23 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnPubAppRefreshMenu(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests a reload of the published applications menu tree from the X2Go server.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
gevent.spawn(self.profile_get_published_applications, profile_name=profile_name, refresh=True, max_no_submenus=self.args.published_applications_no_submenus)
- def OnApplicationStart(self, evt):
+ def OnPubAppExecution(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called for sessions in published applications mode if the user requests the startup of a published application.
- """
- profile_name = self._eventid_profilenames_map[evt.GetId()]
- _application = self._eventid_applications_map[evt.GetId()]
- _query_session = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
- session_uuid = self._X2goClient__register_session(profile_name=profile_name, cmd=_application, session_type="application")
- if self._X2goClient__server_is_alive(session_uuid):
- gevent.spawn(self._X2goClient__start_session, session_uuid)
- _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+ @param evt: event
+ @type evt: C{obj}
- def OnPubAppExecution(self, evt):
+ """
profile_name = self._eventid_profilenames_map[evt.GetId()]
_session_name = self._eventid_sessionnames_map[evt.GetId()]
try:
@@ -659,21 +785,75 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
except KeyError:
pass
+ def OnApplicationStart(self, evt):
+ """\
+ Gets called if the user requests the start up of a single application session.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
+ profile_name = self._eventid_profilenames_map[evt.GetId()]
+ _application = self._eventid_applications_map[evt.GetId()]
+ _query_session = self._X2goClient__client_registered_sessions_of_profile_name(profile_name)[0]
+ session_uuid = self._X2goClient__register_session(profile_name=profile_name, cmd=_application, session_type="application")
+ if self._X2goClient__server_is_alive(session_uuid):
+ gevent.spawn(self._X2goClient__start_session, session_uuid)
+ _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+
def _disable_session_name(self, profile_name, session_name):
+ """\
+ Mark a session name for a given session profile as disabled.
+ Disabled sessions are greyed out in the application's menu tree.
+
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+
+ """
if profile_name not in self._temp_disabled_session_names.keys():
self._temp_disabled_session_names[profile_name] = []
self._temp_disabled_session_names[profile_name].append(session_name)
def _enable_session_name(self, profile_name, session_name):
+ """\
+ Mark a session name for a given session profile as enabled.
+ Disabled sessions are greyed out in the application's menu tree.
+
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+
+ """
try:
self._temp_disabled_session_names[profile_name].remove(session_name)
except (KeyError, ValueError):
pass
def is_session_name_enabled(self, profile_name, session_name):
+ """\
+ Test if the GUI elements for a given session name and profile name are enabled.
+
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+
+ """
return not self.is_session_name_disabled(profile_name, session_name)
def is_session_name_disabled(self, profile_name, session_name):
+ """\
+ Test if the GUI elements for a given session name and profile name are disabled.
+
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+ @param session_uuid: session UUID
+ @type session_uuid: C{str}
+
+ """
try:
return session_name in self._temp_disabled_session_names[profile_name]
except KeyError:
@@ -681,7 +861,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnSessionResume(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to resume an available X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -695,7 +878,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnSessionSuspend(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to suspend an associated or available X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -709,7 +895,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnSessionTerminate(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to terminate an associated or available X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -723,7 +912,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnCleanSessions(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to terminate all available X2Go session for the selected session profile.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -745,7 +937,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnServerDisconnect(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user disconnects from a selected session profile (i.e. X2Go server).
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -772,7 +967,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnProfileAdd(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to add a new session profile.
+
+ @param evt: event
+ @type evt: C{obj}
"""
self._pyhoca_logger('adding new X2Go session profile', loglevel=x2go.log.loglevel_INFO, )
@@ -780,7 +978,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnProfileEdit(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to edit an existing session profile.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -793,7 +994,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnProfileCopy(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to add a new session profile by using an existing session profile as template.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -802,7 +1006,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnProfileEditWhileConnected(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to edit an existing session profile while the session profile is connected.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -811,7 +1018,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnProfileDelete(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to delete an existing session profile.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -828,7 +1038,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnShareCustomLocalFolder(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to share a non-configured local folder with the running X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -846,7 +1059,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnUnshareAllLocalFolders(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to unshare all shared local folders from the running X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -854,7 +1070,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnShareLocalFolder(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to share a previously configured local folder with the running X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -863,7 +1082,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnUnshareLocalFolder(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user chooses to unshare a previously shared local folder from the running X2Go session.
+
+ @param evt: event
+ @type evt: C{obj}
"""
profile_name = self._eventid_profilenames_map[evt.GetId()]
@@ -872,17 +1094,34 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnListSessions(self, evt):
"""\
- STILL UNDOCUMENTED
+ Not implemented, yet.
+
+ @param evt: event
+ @type evt: C{obj}
"""
self._pyhoca_logger('The ,,List Sessions\'\' information window is not implemented yet', loglevel=x2go.log.loglevel_WARN, )
def OnSessionRename(self, evt):
+ """\
+ Gets called if the user requests to rename the title of a session window.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
profile_name = self._eventid_profilenames_map[evt.GetId()]
session_name = self._eventid_sessionnames_map[evt.GetId()]
sessiontitle.PyHocaGUI_DialogBoxSessionTitle(self, profile_name, session_name)
def OnSessionFocus(self, evt):
+ """\
+ Gets called if the user requests to raise a session window and bring it to focus.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
profile_name = self._eventid_profilenames_map[evt.GetId()]
session_name = self._eventid_sessionnames_map[evt.GetId()]
_s = self._X2goClient__get_session_of_session_name(session_name, return_object=True)
@@ -890,7 +1129,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnAbout(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to see the application's ,,About'' window.
+
+ @param evt: event
+ @type evt: C{obj}
"""
self._pyhoca_logger('Showing the ,,About...\'\' window', loglevel=x2go.log.loglevel_INFO, )
@@ -898,14 +1140,20 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnOptions(self, evt):
"""\
- STILL UNDOCUMENTED
+ Not implemented, yet.
+
+ @param evt: event
+ @type evt: C{obj}
"""
self._pyhoca_logger('The ,,Options\'\' configuration window is not implemented yet', loglevel=x2go.log.loglevel_WARN, )
def OnPrintingPreferences(self, evt):
"""\
- STILL UNDOCUMENTED
+ Gets called if the user requests to view/modify the application's ,,Printing Preferences'' (window).
+
+ @param evt: event
+ @type evt: C{obj}
"""
self._pyhoca_logger('opening the printing preferences window', loglevel=x2go.log.loglevel_INFO, )
@@ -913,7 +1161,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
def OnClose(self, evt):
"""\
- STILL UNDOCUMENTED
+ Introduce the clean closure of the application.
+
+ @param evt: event
+ @type evt: C{obj}
"""
self.OnExit(evt)
@@ -921,9 +1172,23 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
##
## Python X2Go (X2goClient) interactive HOOK's...
##
- def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA', ):
+ def HOOK_check_host_dialog(self, profile_name='UNKNOWN', host='UNKNOWN', port=22, fingerprint='no fingerprint', fingerprint_type='RSA', **kwargs):
"""\
- STILL UNDOCUMENTED
+ Provide a GUI-based host key check for unknown remote X2Go(=SSH) servers.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param host: SSH server name to validate
+ @type host: C{str}
+ @param port: SSH server port to validate
+ @type port: C{int}
+ @param fingerprint: the server's fingerprint
+ @type fingerprint: C{str}
+ @param fingerprint_type: finger print type (like RSA, DSA, ...)
+ @type fingerprint_type: C{str}
+
+ @return: if host validity is verified, this hook method should return C{True}
+ @rtype: C{bool}
"""
_message = _(u'The authenticity of host [%s]:%s can\'t be established.\n%s key fingerprint is ,,%s\'\'.\n\nAre you sure you want to continue connecting?') % (host, port, fingerprint_type, fingerprint)
@@ -947,12 +1212,38 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
m.Destroy()
return retval
+ # this hook gets called from Python X2Go classes if a print job is coming in and the print action is ,,DIALOG''...
+ def HOOK_open_print_dialog(self, profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Open an interactive print preferences dialog for an incoming print job.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
+ _print_action = None
+ _pp_dialog = printingprefs.PyHocaGUI_PrintingPreferences(self, mode='print', profile_name=profile_name, session_name=session_name)
+ while _pp_dialog in self._sub_windows:
+ _print_action = _pp_dialog.get_print_action()
+ gevent.sleep(.2)
+
+ return _print_action
+
##
## Python X2Go (X2goClient) notification HOOK's...
##
# this hook gets called from Python X2Go classes if profile_name's control session has died...
- def HOOK_on_control_session_death(self, profile_name):
+ def HOOK_on_control_session_death(self, profile_name='UNKNOWN', **kwargs):
+ """\
+ Notify about connection failures.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+
+ """
self.notifier.send(_(u'%s - channel error') % profile_name, _(u'Lost connection to server %s unexpectedly! Try to re-authenticate to the server...') % profile_name, icon='session_warning', timeout=10000)
try:
del self._temp_disabled_session_names[profile_name]
@@ -963,13 +1254,31 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.ExitMainLoop()
- def HOOK_session_startup_failed(self, profile_name='UNKNOWN'):
+ def HOOK_session_startup_failed(self, profile_name='UNKNOWN', **kwargs):
+ """\
+ Notify about session startup failures.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+
+ """
self.notifier.send(_(u'%s - session failure') % profile_name, _('The session startup failed.'), icon='session_error', timeout=10000)
if self.exit_on_disconnect:
self.WakeUpIdle()
self.ExitMainLoop()
- def HOOK_no_such_command(self, cmd, profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_no_such_command(self, cmd, profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about commands that are not available on the remote server.
+
+ @param cmd: the command that failed
+ @type cmd: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
if session_name == 'UNKNOWN':
self.notifier.send(_(u'%s - session failure') % profile_name, _('The command ,,%s\'\' is not available on X2Go server.') % cmd, icon='session_error', timeout=10000)
else:
@@ -978,13 +1287,37 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.WakeUpIdle()
self.ExitMainLoop()
- def HOOK_rforward_request_denied(self, profile_name='UNKNOWN', session_name='UNKNOWN', server_port=0):
+ def HOOK_rforward_request_denied(self, profile_name='UNKNOWN', session_name='UNKNOWN', server_port=0, **kwargs):
+ """\
+ Notify about reverse port forwarding requests that get denied.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+ @param server_port: remote server port (starting point of reverse forwarding tunnel)
+ @type server_port: C{str}
+
+ """
self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Reverse TCP port forwarding request for session %s to server port %s has been denied.') % (session_name, server_port), icon='session_warning', timeout=10000)
if self.exit_on_disconnect:
self.WakeUpIdle()
self.ExitMainLoop()
- def HOOK_forwarding_tunnel_setup_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN', chain_host='UNKNOWN', chain_port=0):
+ def HOOK_forwarding_tunnel_setup_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN', chain_host='UNKNOWN', chain_port=0, **kwargs):
+ """\
+ Notify about port forwarding tunnel setup failures.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+ @param chain_host: hostname of chain host (forwarding tunnel end point)
+ @type chain_host: C{str}
+ @param chain_port: port of chain host (forwarding tunnel end point)
+ @type chain_port: C{str}
+
+ """
self.notifier.send(_(u'%s - session failure') % profile_name, _(u'Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed.') % (chain_host, chain_port, session_name), icon='session_error', timeout=10000)
if not self._hide_notifications_map.has_key(profile_name):
self._hide_notifications_map[profile_name] = []
@@ -999,67 +1332,195 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.WakeUpIdle()
self.ExitMainLoop()
- def HOOK_pulseaudio_not_supported_in_RDPsession(self):
+ def HOOK_pulseaudio_not_supported_in_RDPsession(self, **kwargs):
+ """\
+ Notify that pulseaudio is not available in RDP sessions.
+
+ """
self.notifier.send(_(u'%s - audio warning') % self.appname, _(u'The X2Go PulseAudio system is not available within Remote Desktop sessions.'), icon='audio_error', timeout=10000)
- def HOOK_pulseaudio_server_startup_failed(self):
+ def HOOK_pulseaudio_server_startup_failed(self, **kwargs):
+ """\
+ Notify about pulseaudio daemon startup failures.
+
+ """
self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2Go PulseAudio system could not be started.'), icon='audio_error', timeout=10000)
- def HOOK_pulseaudio_server_died(self):
+ def HOOK_pulseaudio_server_died(self, **kwargs):
+ """\
+ Notify about sudden pulseaudio crashes.
+
+ """
self.notifier.send(_(u'%s - audio error') % self.appname, _(u'The X2Go PulseAudio system has died unexpectedly.'), icon='audio_error', timeout=10000)
- def HOOK_on_sound_tunnel_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_sound_tunnel_failed(self, profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about failures while setting up the audio tunnel for a session.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self.notifier.send(_(u'%s - audio problem') % profile_name, _(u'The audio connection could not be set up for this session.\n%s') % session_name, icon='session_warning', timeout=5000)
- def HOOK_printing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_printing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify that client-side printing is not available for a session.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self.notifier.send(_(u'%s - client-side printing not available') % profile_name, _(u'The server denies client-side printing from within this session.\n%s') % session_name, icon='session_warning', timeout=5000)
- def HOOK_mimebox_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_mimebox_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify that the MIME box feature is not available for a session.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self.notifier.send(_(u'%s - MIME box not available') % profile_name, _(u'The server does not support the X2Go MIME box.\n%s') % session_name, icon='session_warning', timeout=5000)
- def HOOK_foldersharing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_foldersharing_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify that client-side folder sharing is not available for a session.
+
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self.notifier.send(_(u'%s - client-side folders not sharable') % profile_name, _(u'The server denies client-side folder sharing with this session.\n%s') % session_name, icon='session_warning', timeout=5000)
- def HOOK_sshfs_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
- self.notifier.send(_(u'%s - client resources not sharable') % profile_name, _(u'Client-side folders and printers cannot be shared with this session.\n%s') % session_name, icon='session_warning', timeout=5000)
+ def HOOK_sshfs_not_available(self, profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify that SSHFS support is not available on a connected X2Go server.
- # this hook gets called from Python X2Go classes if a print job is coming in and the print action is ,,DIALOG''...
- def HOOK_open_print_dialog(self, profile_name='UNKNOWN', session_name='UNKNOWN'):
- _print_action = None
- _pp_dialog = printingprefs.PyHocaGUI_PrintingPreferences(self, mode='print', profile_name=profile_name, session_name=session_name)
- while _pp_dialog in self._sub_windows:
- _print_action = _pp_dialog.get_print_action()
- gevent.sleep(.2)
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
- return _print_action
+ """
+ self.notifier.send(_(u'%s - client resources not sharable') % profile_name, _(u'Client-side folders and printers cannot be shared with this session.\n%s') % session_name, icon='session_warning', timeout=5000)
+
+ def HOOK_printaction_error(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN', err_msg='GENERIC_ERROR', printer=None, **kwargs):
+ """\
+ Notify about a problem while processing a pring job.
+
+ @param filename: file name of the print job that failed
+ @type filename: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+ @param err_msg: if available, an appropriate error message
+ @type err_msg: C{str}
+ @param printer: if available, the printer name the print job failed on
+ @type printer: C{str}
- def HOOK_printaction_error(self, filename, profile_name='UNKNOWN', session_name='UNKNOWN', err_msg='GENERIC_ERROR', printer=None):
+ """
if printer:
self.notifier.send(_(u'%s - print error') % profile_name, _(u'%s\n...caused on printer %s by session\n%s') % (err_msg, printer, session_name), icon='session_error', timeout=5000)
else:
self.notifier.send(_(u'%s - print error') % profile_name, _(u'%s\n...caused by session\n%s') % (err_msg, session_name), icon='session_error', timeout=5000)
- def HOOK_on_session_has_started_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_session_has_started_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about a session that has been started by this instance of L{PyHocaGUI}.
+
+ @param session_uuid: unique session identifier of the calling session
+ @type session_uuid: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self._enable_session_name(profile_name, session_name)
self.notifier.send(_(u'%s - start') % profile_name, _(u'New X2Go session starting up...\n%s') % session_name, icon='session_start', timeout=5000)
- def HOOK_on_session_has_started_by_other(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_session_has_started_by_other(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about a session that has been started by another X2Go client application.
+
+ @param session_uuid: unique session identifier of the calling session
+ @type session_uuid: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self._enable_session_name(profile_name, session_name)
self.notifier.send(_(u'%s - start') % profile_name, _(u'Another client started X2Go session\n%s') % session_name, icon='session_start', timeout=5000)
- def HOOK_on_session_has_resumed_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_session_has_resumed_by_me(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about a session that has been resumed by this instance of L{PyHocaGUI}.
+
+ @param session_uuid: unique session identifier of the calling session
+ @type session_uuid: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self._enable_session_name(profile_name, session_name)
self.notifier.send(_(u'%s - resume') % profile_name, _(u'Resuming X2Go session...\n%s') % session_name, icon='session_resume', timeout=5000)
- def HOOK_on_session_has_resumed_by_other(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_session_has_resumed_by_other(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about a session that has been resumed by another X2Go client application.
+
+ @param session_uuid: unique session identifier of the calling session
+ @type session_uuid: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self._enable_session_name(profile_name, session_name)
self.notifier.send(_(u'%s - resume') % profile_name, _(u'Another client resumed X2Go session\n%s') % session_name, icon='session_resume', timeout=5000)
- def HOOK_on_found_session_running_after_connect(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_found_session_running_after_connect(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about already running sessions that have been directly after the client-server connection had been established..
+
+ @param session_uuid: unique session identifier of the calling session
+ @type session_uuid: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self._enable_session_name(profile_name, session_name)
gevent.spawn_later(5, self.notifier.send, _(u'%s - running') % profile_name, _(u'Found already running session\n%s') % session_name, icon='session_resume', timeout=5000)
- def HOOK_on_session_has_been_suspended(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_session_has_been_suspended(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about a session that has been suspended.
+
+ @param session_uuid: unique session identifier of the calling session
+ @type session_uuid: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self._enable_session_name(profile_name, session_name)
if self._hide_notifications_map.has_key(profile_name) and session_name in self._hide_notifications_map[profile_name]:
self._hide_notifications_map[profile_name].remove(session_name)
@@ -1074,7 +1535,18 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
evt.SetId(_dummy_id)
self.OnServerDisconnect(evt)
- def HOOK_on_session_has_terminated(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN'):
+ def HOOK_on_session_has_terminated(self, session_uuid='UNKNOWN', profile_name='UNKNOWN', session_name='UNKNOWN', **kwargs):
+ """\
+ Notify about a session that has (been) terminated.
+
+ @param session_uuid: unique session identifier of the calling session
+ @type session_uuid: C{str}
+ @param profile_name: profile name of session that called this hook method
+ @type profile_name: C{str}
+ @param session_name: X2Go session name
+ @type session_name: C{str}
+
+ """
self._enable_session_name(profile_name, session_name)
# avoid notification if X2goClient.clean_sessions has been used to terminate sessions
if self._hide_notifications_map.has_key(profile_name) and session_name in self._hide_notifications_map[profile_name]:
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index cc3e4a1..95a0a43 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -159,59 +159,204 @@ class PyHoca_MessageWindow(wx.Dialog):
pass
def OnTrue(self, evt):
+ """\
+ Gets called if the user clicks on ,,Yes'' or ,,Ok''.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
self.result = True
self.Hide()
def OnFalse(self, evt):
+ """\
+ Gets called if the user clicks on ,,No'' or ,,Cancel''.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
self.result = False
self.Hide()
def Ok(self):
+ """\
+ Evaluate the result what the user chose in the message window.
+
+ @return: C{True}, if ,,Ok'' had been chosen
+ @rtype: C{bool}
+
+ """
return self.Yes()
def Cancel(self):
+ """\
+ Evaluate the result what the user chose in the message window.
+
+ @return: C{True}, if ,,Cancel'' had been chosen
+ @rtype: C{bool}
+
+ """
return not self.No()
def Yes(self):
+ """\
+ Evaluate the result what the user chose in the message window.
+
+ @return: C{True}, if ,,Yes'' had been chosen
+ @rtype: C{bool}
+
+ """
return self.result
def No(self):
+ """\
+ Evaluate the result what the user chose in the message window.
+
+ @return: C{True}, if ,,No'' had been chosen
+ @rtype: C{bool}
+
+ """
return not self.Yes()
def Hide(self):
+ """\
+ When hiding the message box, remove it from the list of open windows in the main application instance.
+
+ """
try:
self._PyHocaGUI._sub_windows.remove(self)
except AttributeError:
pass
self.Show(False)
- def Close(self):
- wx.Dialog.Close(self)
-
- def Destroy(self):
- wx.Dialog.Destroy(self)
-
class PyHoca_MessageWindow_Ok(PyHoca_MessageWindow):
+ """\
+ A simple ,,Ok'' message window for L{PyHocaGUI}.
+
+ """
def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+ """\
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param parent: the parent (calling) object
+ @type parent: C{obj}
+ @param title: window title
+ @type title: C{str}
+ @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
+ @type shortmsg: C{str}
+ @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
+ @type custom_message: C{str}
+ @param icon: icon name for an icon to be shown left of the text in this message box
+ @type icon: C{str}
+ @param kwargs: any other optional argument (will be ignored)
+ @type kwargs: C{dict}
+
+ """
PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='ok', **kwargs)
class PyHoca_MessageWindow_OkCancel(PyHoca_MessageWindow):
+ """\
+ A simple ,,Ok+Cancel'' (default: Ok) message window for L{PyHocaGUI}.
+
+ """
def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+ """\
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param parent: the parent (calling) object
+ @type parent: C{obj}
+ @param title: window title
+ @type title: C{str}
+ @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
+ @type shortmsg: C{str}
+ @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
+ @type custom_message: C{str}
+ @param icon: icon name for an icon to be shown left of the text in this message box
+ @type icon: C{str}
+ @param kwargs: any other optional argument (will be ignored)
+ @type kwargs: C{dict}
+
+ """
PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='okcancel', **kwargs)
class PyHoca_MessageWindow_CancelOk(PyHoca_MessageWindow):
+ """\
+ A simple ,,Ok+Cancel'' (default: Cancel) message window for L{PyHocaGUI}.
+
+ """
def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+ """\
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param parent: the parent (calling) object
+ @type parent: C{obj}
+ @param title: window title
+ @type title: C{str}
+ @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
+ @type shortmsg: C{str}
+ @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
+ @type custom_message: C{str}
+ @param icon: icon name for an icon to be shown left of the text in this message box
+ @type icon: C{str}
+ @param kwargs: any other optional argument (will be ignored)
+ @type kwargs: C{dict}
+
+ """
PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='cancelok', **kwargs)
class PyHoca_MessageWindow_YesNo(PyHoca_MessageWindow):
+ """\
+ A simple ,,Yes+No'' (default: Yes) message window for L{PyHocaGUI}.
+
+ """
def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+ """\
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param parent: the parent (calling) object
+ @type parent: C{obj}
+ @param title: window title
+ @type title: C{str}
+ @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
+ @type shortmsg: C{str}
+ @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
+ @type custom_message: C{str}
+ @param icon: icon name for an icon to be shown left of the text in this message box
+ @type icon: C{str}
+ @param kwargs: any other optional argument (will be ignored)
+ @type kwargs: C{dict}
+
+ """
PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='yesno', **kwargs)
class PyHoca_MessageWindow_NoYes(PyHoca_MessageWindow):
+ """\
+ A simple ,,Yes+No'' (default: No) message window for L{PyHocaGUI}.
+
+ """
def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon='session_warning', **kwargs):
+ """\
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param parent: the parent (calling) object
+ @type parent: C{obj}
+ @param title: window title
+ @type title: C{str}
+ @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
+ @type shortmsg: C{str}
+ @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
+ @type custom_message: C{str}
+ @param icon: icon name for an icon to be shown left of the text in this message box
+ @type icon: C{str}
+ @param kwargs: any other optional argument (will be ignored)
+ @type kwargs: C{dict}
+
+ """
PyHoca_MessageWindow.__init__(self, _PyHocaGUI, parent=parent, title=title, shortmsg=shortmsg, custom_message=custom_message, icon=icon, buttontype='noyes', **kwargs)
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index df7e7ac..476842c 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -220,7 +220,6 @@ class notificationmessage_NotifierPopup(object):
"""
if context is not None:
- if context is not None:
try:
title = self.title[context]
del self.title[context]
diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py
index 3bfc35a..f18cad7 100644
--- a/pyhoca/wxgui/printingprefs.py
+++ b/pyhoca/wxgui/printingprefs.py
@@ -178,7 +178,7 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
def __do_layout(self):
"""\
- Arrange the frame's widget layout.
+ Arrange the frame's widget layout.
"""
sizer_1 = wx.BoxSizer(wx.VERTICAL)
@@ -307,6 +307,10 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
return self._print_action_properties
def _onPrintActionChange(self):
+ """\
+ Helper method for L{OnPrintActionChange}.
+
+ """
if self._print_action == 'PDFVIEW':
self.PdfViewSelected()
elif self._print_action == 'PDFSAVE':
@@ -320,9 +324,20 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
self.__update_from_screen()
def OnPrintActionChange(self, evt):
+ """
+ Gets called whenever a print action change has been requested.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
self._onPrintActionChange()
def _disable_PrintOptions(self):
+ """\
+ Helper method for L{PdfViewSelected}, L{PdfSaveToFolderSelected}, L{PrintPrinterSelected}, and L{PrintCmdSelected}.
+
+ """
self.PdfViewCmdLabel.Enable(False)
self.PdfViewCmd.Enable(False)
self.PdfViewCmdBrowseButton.Enable(False)
@@ -341,29 +356,52 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
self.OKButton.Enable(True)
def PdfViewSelected(self):
+ """\
+ Enable/disable widgets for PDFVIEW print action.
+
+ """
self._disable_PrintOptions()
self.PdfViewCmdLabel.Enable(True)
self.PdfViewCmd.Enable(True)
self.PdfViewCmdBrowseButton.Enable(True)
def PdfSaveToFolderSelected(self):
+ """\
+ Enable/disable widgets for PDFSAVE print action.
+
+ """
self._disable_PrintOptions()
self.PdfSaveToFolderLabel.Enable(True)
self.PdfSaveToFolder.Enable(True)
self.PdfSaveToFolderBrowseButton.Enable(True)
def PrintPrinterSelected(self):
+ """\
+ Enable/disable widgets for PRINT print action.
+
+ """
self._disable_PrintOptions()
if self._defaultPrinter != '#PRINTSYSTEM_UNAVAILABLE#':
self.PrintPrinterLabel.Enable(True)
self.PrintPrinter.Enable(True)
def PrintCmdSelected(self):
+ """\
+ Enable/disable widgets for PRINTCMD print action.
+
+ """
self._disable_PrintOptions()
self.PrintCmdLabel.Enable(True)
self.PrintCmd.Enable(True)
def OnPdfViewCmdBrowseButton(self, evt):
+ """\
+ Gets called if the user requests to browse for a PDF view executable.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
wildcard = "All files (*.*)|*"
dlg = wx.FileDialog(
self, message=_(u"Choose PDF viewer application"), defaultDir=_LOCAL_HOME,
@@ -376,6 +414,13 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
self.PdfViewCmd.SetValue(_pdfview_cmd)
def OnPdfSaveToFolderBrowseButton(self, evt):
+ """\
+ Gets called if the user requests to set the PDFSAVE folder location.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
_start_dir = self.PdfSaveToFolder.GetValue()
if not utils.is_abs_path(_start_dir):
if not _start_dir.startswith('~'):
@@ -397,10 +442,18 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
self.PdfSaveToFolder.SetValue(_save_to_folder)
def __validate(self):
+ """\
+ Dummy field validation method. Always returns C{True}.
+
+ """
validateOk = True
return validateOk
def _apply_changes(self):
+ """\
+ Apply changes in the dialog to the client printing configuration.
+
+ """
self.__update_from_screen()
if self.__validate():
if self.mode == 'edit': self.client_printing.write()
@@ -408,6 +461,13 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
return False
def OnOKButton(self, evt):
+ """\
+ Gets called if the user presses the ,,Ok'' button.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
wx.BeginBusyCursor()
if self._apply_changes():
try: wx.EndBusyCursor()
@@ -419,17 +479,36 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
except: pass
def OnApplyButton(self, evt):
+ """\
+ Gets called if the user presses the ,,Apply'' button.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
wx.BeginBusyCursor()
self._apply_changes()
try: wx.EndBusyCursor()
except: pass
def OnCancel(self, evt):
+ """\
+ Gets called if the user presses the ,,Cancel'' button.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
self.client_printing.load()
self.Close()
self.Destroy()
def Destroy(self):
+ """\
+ Tidy up some stuff in the main application instance before allowing desctruction of the
+ printing preferences window.
+
+ """
try:
self._PyHocaGUI._sub_windows.remove(self)
except ValueError:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 8789778..ea5f823 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -50,12 +50,21 @@ class CheckListCtrl(wx.ListCtrl, CheckListCtrlMixin):
class PyHocaGUI_ProfileManager(wx.Dialog):
"""\
- STILL UNDOCUMENTED
+ L{PyHocaGUI}'s profile manager window that allows to tweak all session related settings.
"""
def __init__(self, _PyHocaGUI, action, profile_id=None, profile_name=None):
"""\
- STILL UNDOCUMENTED
+ Profile manager window (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param action: profile manager action (use either of C{ADD}, C{ADD_EXPLICITLY}, C{EDIT}, C{EDIT_CONNECTED}, (C{EDIT_EXPLICITLY})
+ @type action: C{str}
+ @param profile_id: X2Go session profile ID
+ @type profile_id: C{str}
+ @param profile_name: X2Go session profile name
+ @type profile_name: C{str}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -167,7 +176,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.ProfileNameLabel = wx.StaticText(self.tab_Profile, -1, _(u"Name")+":")
self.ProfileName = wx.TextCtrl(self.tab_Profile, -1, "")
- if self.action in ("EDIT_EXPLICITLY", "EDIT_EXPLICITLY"):
+ if self.action in ("ADD_EXPLICITLY", "EDIT_EXPLICITLY"):
self.ProfileNameLabel.Enable(False)
self.ProfileName.Enable(False)
@@ -359,6 +368,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SharedFoldersList.OnCheckItem = _SharedFoldersList_OnCheckItem
def __set_properties(self):
+ """\
+ Set hard-coded widget properties.
+
+ """
if self.action == 'ADD':
self.SetTitle(_(u"PyHoca-GUI Profile Manager - new profile"))
elif self.action == 'EDIT_CONNECTED':
@@ -458,7 +471,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.DefaultButton.SetMinSize((-1, 30))
def __do_layout(self):
+ """\
+ Arrange/layout widgets on screen.
+ """
# PROFILE TAB
sizer_1 = wx.BoxSizer(wx.VERTICAL)
sizer_1_1 = wx.StaticBoxSizer(self.staticbox_Profile, wx.VERTICAL)
@@ -772,7 +788,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SharedFoldersList.SetColumnWidth(1, abs(_sizer_width*.3))
def __update_fields(self):
+ """\
+ Update widget fields/values from session profile configuration.
+ """
self.ProfileName.SetValue(self.profile_config['name'])
self.SetSessionWindowTitle.SetValue(self.profile_config['setsessiontitle'])
self.CustomSessionWindowTitle.SetValue(self.profile_config['sessiontitle'])
@@ -1086,6 +1105,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.disable_EditConnected_options()
def disable_EditConnected_options(self):
+ """\
+ If C{action} in the constructor has been set to C{EDIT_CONNECTED} this
+ method will disable several profile manager widgets.
+
+ """
# disable widgets when editing connected sessions
if self.action == 'EDIT_CONNECTED':
@@ -1120,6 +1144,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.tab_SharedFilesAndFolders.Enable(False)
def __update_from_screen(self):
+ """\
+ Update session profile configuration from the widget fields and their values.
+
+ """
self.profile_config['name'] = self.ProfileName.GetValue()
self.profile_config['setsessiontitle'] = self.SetSessionWindowTitle.GetValue()
if self.UseDefaultSessionWindowTitle.GetValue():
@@ -1242,12 +1270,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config['mimeboxaction'] = _mimebox_action
def OnIconChange(self, event):
+ """\
+ Gets called on profile icon change requests.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
_share_location = os.path.split(_icons_location)[0]
iconsdir = _icons_location
if not os.path.exists(iconsdir):
iconsdir = os.getcwd()
- wildcard = _(u"Icon Files (*.png)|*.png|" \
- "All files (*.*)|*")
+ wildcard = _(u"Icon Files (*.png)|*.png|" \
+ u"All files (*.*)|*")
dlg = wx.FileDialog(
self, message=_(u"Choose an icon for this session profile"), defaultDir=iconsdir,
defaultFile="", wildcard=wildcard, style=wx.OPEN | wx.CHANGE_DIR )
@@ -1262,6 +1297,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.IconPath = rel_path
def OnSetSessionWindowTitle(self, event):
+ """\
+ Gets called if the change-session-window-title checkbox gets marked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.SetSessionWindowTitle.GetValue():
self.UseDefaultSessionWindowTitle.Enable(True)
if not self.UseDefaultSessionWindowTitle.GetValue():
@@ -1273,6 +1315,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.CustomSessionWindowTitle.Enable(False)
def OnUseDefaultSessionWindowTitle(self, event):
+ """\
+ Gets called if the use-default-session-window-title checkbox gets marked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.UseDefaultSessionWindowTitle.GetValue():
self.CustomSessionWindowTitleLabel.Enable(False)
self.CustomSessionWindowTitle.Enable(False)
@@ -1281,6 +1330,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.CustomSessionWindowTitle.Enable(True)
def enable_DirectRDP(self):
+ """\
+ Gets called if the use-direct-RDP checkbox gets marked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.HostLabel.Enable(False)
self.Host.Enable(False)
self.SSHPortLabel.Enable(False)
@@ -1303,6 +1359,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.tab_SharedFilesAndFolders.Enable(False)
def disable_DirectRDP(self):
+ """\
+ Gets called if the use-direct-RDP checkbox gets unmarked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if not self.UseSSHProxy.GetValue():
self.HostLabel.Enable(True)
self.Host.Enable(True)
@@ -1326,6 +1389,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.tab_SharedFilesAndFolders.Enable(True)
def OnSessionTypeSelected(self, event):
+ """\
+ Gets called if another session type gets selected.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
_session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0]
self.UsePublishedApplications.Enable(True)
self.AutoStartSession.Enable(True)
@@ -1412,7 +1482,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.disable_EditConnected_options()
def OnCompressionSelected(self, event):
+ """\
+ Gets called if another compression method gets selected.
+
+ @param event: event
+ @type event: C{obj}
+ """
_pack = self.Compression.GetValue()
if _pack.endswith('-%'):
self.ImageQuality.Enable(True)
@@ -1420,6 +1496,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.ImageQuality.Enable(False)
def OnSSHKeyFileBrowse(self, event):
+ """\
+ Gets called if the user requests to browse for an SSH key file (for X2Go client/server connection).
+
+ @param event: event
+ @type event: C{obj}
+
+ """
sshdir = os.path.expanduser('~/.ssh')
if not os.path.exists(sshdir):
sshdir = os.getcwd()
@@ -1435,6 +1518,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHKeyFile.SetValue(path)
def OnSSHProxyKeyFileBrowse(self, event):
+ """\
+ Gets called if the user requests to browse for an SSH key file (for SSH proxy client/server connection).
+
+ @param event: event
+ @type event: C{obj}
+
+ """
sshdir = os.path.expanduser('~/.ssh')
if not os.path.exists(sshdir):
sshdir = os.getcwd()
@@ -1450,6 +1540,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyKeyFile.SetValue(path)
def OnUseSSHProxy(self, event):
+ """\
+ Gets called if the use-ssh-proxy checkbox gets marked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.UseSSHProxy.GetValue():
self.SSHProxyHostLabel.Enable(True)
self.SSHProxyHost.Enable(True)
@@ -1492,12 +1589,33 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHPort.SetValue(self.profile_config_bak['sshport'])
def OnUpdateSSHProxyTunnelFromHost(self, event):
+ """\
+ Gets called whenever the ssh-proxy-tunnel-from-host gets modified.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.Host.SetValue(self.SSHProxyTunnelFromHost.GetValue())
def OnUpdateSSHProxyTunnelFromPort(self, event):
+ """\
+ Gets called whenever the ssh-proxy-tunnel-from-port gets modified.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
def OnSetKeyboard(self, event):
+ """\
+ Gets called whenever the either of the keyboard-settings radio buttons is selected.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.CustomSetKeyboard.GetValue():
self.KeyboardModelLabel.Enable(True)
self.KeyboardLayoutLabel.Enable(True)
@@ -1514,6 +1632,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.KeyboardVariant.Enable(False)
def OnSoundEnable(self, event): # wxGlade: X2goMaintProfile.<event_handler>
+ """\
+ Gets called whenever the enable-sound checkbox gets marked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.EnableSound.GetValue():
self.PulseAudio.Enable(True)
self.Esd.Enable(True)
@@ -1530,32 +1655,74 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
def OnSetDisplayFullscreen(self, event):
+ """\
+ Gets called whenever the fullscreen-display radion button gets checked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.ScreenWidthLabel.Enable(False)
self.ScreenWidth.Enable(False)
self.ScreenHeightLabel.Enable(False)
self.ScreenHeight.Enable(False)
def OnSetDisplayCustom(self, event):
+ """\
+ Gets called whenever the custom-size-display radion button gets checked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.ScreenWidthLabel.Enable(True)
self.ScreenWidth.Enable(True)
self.ScreenHeightLabel.Enable(True)
self.ScreenHeight.Enable(True)
def OnSetDisplayDPI(self, event):
+ """\
+ Gets called whenever the set-dpi checkbox gets marked.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.SetDisplayDPI.GetValue():
self.DisplayDPI.Enable(True)
else:
self.DisplayDPI.Enable(False)
def OnPulseAudio(self, event):
+ """\
+ Gets called whenever the pulseaudio system is seleced.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.DefaultSoundPort.GetValue():
self.SoundPort.SetValue(self.audioPorts['pulse'])
def OnEsd(self, event):
+ """\
+ Gets called whenever the esound system is seleced.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if self.DefaultSoundPort.GetValue():
self.SoundPort.SetValue(self.audioPorts['esd'])
def OnDefaultSoundPort(self, event):
+ """\
+ Gets called if the user chooses to use the audio system's default audio port.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
if not self.DefaultSoundPort.GetValue():
self.SoundPortLabel.Enable(True)
self.SoundPort.Enable(True)
@@ -1568,6 +1735,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SoundPort.Enable(False)
def _toggle_localFolderSharing(self):
+ """\
+ Helper method for L{OnToggleLocalFolderSharing}.
+
+ """
if self.UseLocalFolderSharing.GetValue():
self.SharedFolderPathLabel.Enable(True)
self.SharedFolderPath.Enable(True)
@@ -1589,9 +1760,23 @@ 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):
+ """\
+ Gets called whenever the uses evokes a file browser dialog that allows to choose a folder for sharing.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
shared_folder = os.path.expanduser('~')
if not os.path.exists(shared_folder):
shared_folder = os.getcwd()
@@ -1604,15 +1789,43 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SharedFolderPath.SetValue(dlg.GetPath())
def OnSharedFolderListItemSelected(self, event):
+ """\
+ Gets called whenever a shared folder in the list of already configured locally shared folders is selected.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.DeleteSharedFolderPathButton.Enable(True)
def OnSharedFolderListItemDeselected(self, event):
+ """\
+ Gets called whenever a shared folder in the list of already configured locally shared folders is deselected.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.DeleteSharedFolderPathButton.Enable(False)
def OnSharedFolderPathKeyPressed(self, event):
+ """\
+ Gets called whenever something gets typed in the sharable folder path field.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.AddSharedFolderPathButton.Enable(True)
def OnAddSharedFolderPath(self, event):
+ """\
+ Gets called whenever the user requests to add a folder name to the list of locally shared folders.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
_shared_folder_path = self.SharedFolderPath.GetValue()
if _shared_folder_path and (self.SharedFoldersList.FindItem(0, _shared_folder_path) == -1):
idx = self.SharedFoldersList.InsertStringItem(0, _shared_folder_path)
@@ -1622,11 +1835,22 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.AddSharedFolderPathButton.Enable(False)
def OnDeleteSharedFolderPath(self, event):
+ """\
+ Gets called whenever the user requests to remove a folder name from the list of locally shared folders.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
_item = self.SharedFoldersList.GetFocusedItem()
self.SharedFoldersList.DeleteItem(_item)
self.DeleteSharedFolderPathButton.Enable(False)
def _toggle_useEncodingConverter(self):
+ """\
+ Helper method for L{OnToggleEncodingConverter}.
+
+ """
if self.UseEncodingConverter.GetValue():
self.ClientEncodingLabel.Enable(True)
self.ClientEncoding.Enable(True)
@@ -1639,9 +1863,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.ServerEncoding.Enable(False)
def OnToggleEncodingConverter(self, event):
+ """\
+ Gets called whenever the encoding conversion gets enabled/disabled.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self._toggle_useEncodingConverter()
def _toggle_useFileMIMEbox(self):
+ """\
+ Helper method for L{OnToggleFileMIMEbox}.
+
+ """
if self.UseFileMIMEbox.GetValue():
self.FileMIMEboxExtensionsLabel.Enable(True)
self.FileMIMEboxExtensions.Enable(True)
@@ -1654,9 +1889,23 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.FileMIMEboxAction.Enable(False)
def OnToggleFileMIMEbox(self, event):
+ """\
+ Gets called whenever the user enables/disabled the MIME box feature.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self._toggle_useFileMIMEbox()
def __validate(self):
+ """\
+ Validation of all widget fields, called when the user requests to save the session profile.
+
+ @return: status of validation; C{True} for successfully validated, C{False} otherwise
+ @rtype: C{bool}
+
+ """
validateOk = True
if len(self.profile_config['name'].strip()) == 0:
validateOk = False
@@ -1685,6 +1934,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
return validateOk
def OnOKButton(self, event):
+ """\
+ Gets called if the users clicks on the ,,Save'' button.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
wx.BeginBusyCursor()
self.__update_from_screen()
if self.__validate():
@@ -1721,14 +1977,33 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
except: pass
def OnCancel(self, event):
+ """\
+ Gets called if the users clicks on the ,,Cancel'' button.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.Close()
self.Destroy()
def OnDefault(self, event):
+ """\
+ Gets called if the users clicks on the ,,Defaults'' button.
+
+ @param event: event
+ @type event: C{obj}
+
+ """
self.profile_config = copy.deepcopy(self.profile_config_bak)
self.__update_fields()
def Destroy(self):
+ """\
+ Tidy up some stuff in the main application instance before allowing desctruction of the
+ profile manager window.
+
+ """
try:
self._PyHocaGUI._sub_windows.remove(self)
except ValueError:
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)).
1
0
python-x2go.git - build-main (branch) updated: 0.2.0.2-1-g56223c3
by git-adminï¼ x2go.org 10 Jun '12
by git-adminï¼ x2go.org 10 Jun '12
10 Jun '12
The branch, build-main has been updated
via 56223c33fa9c13bb64ffa0bb0d6c6bb4884651bc (commit)
from 1e28d700dd71f9ff121f6ad702717020b95bade0 (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 56223c33fa9c13bb64ffa0bb0d6c6bb4884651bc
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sun Jun 10 05:22:45 2012 +0200
Only notify HOOK_auto_connect, if the session really is configured to auto-connect (while at the same time no SSH key is present).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++++
x2go/session.py | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index aabb0d9..5ee8965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.2.0.3-0~x2go1) UNRELEASED; urgency=low
+
+ * Bugfix release (0.2.0.3):
+ - Only notify HOOK_auto_connect, if the session really is configured
+ to auto-connect (while at the same time no SSH key is present).
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 10 Jun 2012 05:20:51 +0200
+
python-x2go (0.2.0.2-0~x2go1) unstable; urgency=low
* Bugfix release (0.2.0.2):
diff --git a/x2go/session.py b/x2go/session.py
index 9368d96..b455a18 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1051,7 +1051,7 @@ class X2goSession(object):
else:
if self.can_auto_connect() and self.auto_connect:
gevent.spawn(self.connect)
- else:
+ elif self.auto_connect:
gevent.spawn(self.HOOK_auto_connect)
def connect(self, username='', password='', add_to_known_hosts=False, force_password_auth=False,
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
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 "python-x2go.git" (Python X2Go Client API).
1
0
09 Jun '12
The branch, master has been updated
via 81cd8e0962a066eeab9945148e853cfcefe407d2 (commit)
via 3f5d4fb0c89186b000bce06e538a0a97f4baba6e (commit)
via 9fa9cca1acf9595583500ef0d3835763cdba0081 (commit)
from d79526f48ac661c653fe35866b685bde9bb52cde (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 81cd8e0962a066eeab9945148e853cfcefe407d2
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Jun 9 17:47:20 2012 +0200
add __doc__ strings to many code items
commit 3f5d4fb0c89186b000bce06e538a0a97f4baba6e
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Jun 9 17:46:26 2012 +0200
Fix published application startup.
commit 9fa9cca1acf9595583500ef0d3835763cdba0081
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Sat Jun 9 17:31:38 2012 +0200
re-merge i18n files
-----------------------------------------------------------------------
Summary of changes:
build/mo/bg/LC_MESSAGES/PyHoca-GUI.mo | Bin 541 -> 541 bytes
build/mo/de/LC_MESSAGES/PyHoca-GUI.mo | Bin 23789 -> 23789 bytes
build/mo/en/LC_MESSAGES/PyHoca-GUI.mo | Bin 22238 -> 22238 bytes
build/mo/es/LC_MESSAGES/PyHoca-GUI.mo | Bin 23773 -> 23773 bytes
build/mo/nb_NO/LC_MESSAGES/PyHoca-GUI.mo | Bin 18139 -> 22740 bytes
build/mo/nl/LC_MESSAGES/PyHoca-GUI.mo | Bin 21826 -> 21826 bytes
build/mo/sv/LC_MESSAGES/PyHoca-GUI.mo | Bin 22180 -> 22180 bytes
debian/changelog | 1 +
po/PyHoca-GUI.pot | 144 +++++++-------
po/bg.po | 144 +++++++-------
po/de.po | 144 +++++++-------
po/en.po | 144 +++++++-------
po/es.po | 144 +++++++-------
po/nb_NO.po | 307 ++++++++++++++----------------
po/nl.po | 144 +++++++-------
po/sv.po | 144 +++++++-------
pyhoca/wxgui/about.py | 24 ++-
pyhoca/wxgui/frontend.py | 5 +-
pyhoca/wxgui/logon.py | 30 +++-
pyhoca/wxgui/menus_taskbar.py | 126 +++++++++++--
pyhoca/wxgui/messages.py | 29 +++-
pyhoca/wxgui/notify.py | 107 +++++++++++
pyhoca/wxgui/printingprefs.py | 31 +++-
pyhoca/wxgui/sessiontitle.py | 27 +++-
pyhoca/wxgui/splash.py | 15 ++-
pyhoca/wxgui/taskbar.py | 63 ++++++-
26 files changed, 1069 insertions(+), 704 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 8a6e609..ddb8635 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 2cc0168..bdc33b7 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 04515a6..4be2182 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 4d5771f..3b12420 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 bb2ec47..fb3d9c5 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 e8e70ef..bb46034 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 305f3e2..6940424 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/debian/changelog b/debian/changelog
index de95b0f..ad33a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -144,6 +144,7 @@ pyhoca-gui (0.2.0.0-0~x2go1) UNRELEASED; urgency=low
running within a Ubuntu Unity session.
- Make auto-detected keyboard setup (i.e. usage of x2gosetkeyboard)
configurable in the profile manager.
+ - Fix published application startup.
* Depend on Python X2Go 0.2.0.1.
* Install GNOME icons via dh_links.
* Install X2Go icons with explicit install paths.
diff --git a/po/PyHoca-GUI.pot b/po/PyHoca-GUI.pot
index 5b55e13..d5209be 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-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -53,16 +53,16 @@ msgid "Cancel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr ""
@@ -88,28 +88,28 @@ msgstr ""
msgid "Authentication to the SSH proxy server failed!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr ""
@@ -118,12 +118,12 @@ msgstr ""
msgid "%s - key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr ""
@@ -917,93 +917,93 @@ msgstr ""
msgid "Exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/frontend.py:526
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1012,148 +1012,148 @@ msgid ""
"Are you sure you want to continue connecting?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
"X2go/SSH server. Session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1161,7 +1161,7 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1169,74 +1169,74 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
diff --git a/po/bg.po b/po/bg.po
index 7331ea1..9f7770f 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-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: 2011-09-17 02:17+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: Bulgarian <chepati(a)yahoo.com>\n"
@@ -57,16 +57,16 @@ msgid "Cancel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr ""
@@ -92,28 +92,28 @@ msgstr ""
msgid "Authentication to the SSH proxy server failed!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr ""
@@ -122,12 +122,12 @@ msgstr ""
msgid "%s - key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr ""
@@ -921,93 +921,93 @@ msgstr ""
msgid "Exiting application..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/frontend.py:526
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1016,148 +1016,148 @@ msgid ""
"Are you sure you want to continue connecting?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
"X2go/SSH server. Session startup failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1165,7 +1165,7 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1173,74 +1173,74 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
diff --git a/po/de.po b/po/de.po
index 84eed3b..3e0056b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: 2012-05-31 22:04+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: de <mike.gabriel(a)das-netzwerkteam.de>\n"
@@ -56,16 +56,16 @@ msgid "Cancel"
msgstr "Abbrechen"
#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr "Benutzer darf keine X2Go Sitzungen starten!"
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
@@ -91,30 +91,30 @@ msgstr "%s - SSH Proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen"
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr "%s - Socket-Fehler"
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr "%s - ungültiger Server-Schlüssel"
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
"Der Host-Schlüssel des X2Go Servers ist ungültig oder wurde vom Benutzer "
"nicht akzeptiert"
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr "%s - Benutzerverzeichnis nicht vorhanden"
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr ""
"Das serverseitige Benutzerverzeichnis (HOME-Verzeichnis) existiert nicht."
@@ -124,12 +124,12 @@ msgstr ""
msgid "%s - key error"
msgstr "%s - ungültiger Schlüssel"
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr "%s - Anmeldefehler"
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH-Fehler"
@@ -939,97 +939,97 @@ msgstr "Trenne %s und schließe Anwendung..."
msgid "Exiting application..."
msgstr "Programm wird beendet..."
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr "%s - Serverwarnung"
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr "Der X2Go-Server publiziert kein Anwendungsmenü."
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich."
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/frontend.py:526
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
"Der Host-Schlüssel des SSH Proxy-Servers ist ungültig oder wurde vom "
"Benutzer nicht akzeptiert"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF-Fehler"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal "
"versuchen..."
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr "%s - ungültiger Benutzerschlüssel"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!"
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr "Unbekanntes Sitzungsprofil, vor Benutzung bitte einrichten..."
-#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr "%s - Sitzungsfunktion eingeschränkt"
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Das Ausführen des Befehls ,,%s'' ist fehlgeschlagen."
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr "Beende X2Go Sitzungen..."
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr "%s - trennen"
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr "X2Go Profil ist nun nicht mehr verbunden."
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr "Neues Sitzungsprofil"
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profil gelöscht"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr "Das Sitzungsprofil wurde gelöscht."
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - lokalen Ordner für dieses Sitzungsprofile freigeben"
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1042,17 +1042,17 @@ msgstr ""
"\n"
"Sind Sie sicher, dass sie fortfahren möchten? "
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Echtheit des Servers bestätigen"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindungsfehler"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1061,22 +1061,22 @@ msgstr ""
"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen "
"Sie, sich neu am Server anzumelden..."
-#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr "Der Start der Sitzung ist fehlgeschlagen."
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar."
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1085,7 +1085,7 @@ msgstr ""
"Der Befehl ,,%s'' ist auf dem X2Go Server nicht verfügbar\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1094,7 +1094,7 @@ msgstr ""
"Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s "
"wurde vom X2Go Server abgelehnt."
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1103,37 +1103,37 @@ msgstr ""
"SSH Forwarding Tunnel zu [%s]:%s wurde für Sitzung %s vom X2go/SSH Server "
"verweigert. Die Sitzung konnte nicht gestartet werden."
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr "%s - Warnung Audiosystem"
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
"Das X2Go PulseAudio System ist innerhalb von Remote Desktop Sitzungen nicht "
"verfügbar."
-#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr "%s - Audiofehler"
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr "Das X2Go PulseAudio System konnte nicht gestartet werden."
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "Das X2Go PulseAudio System ist soeben abgestürzt."
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr "%s - Audioproblem"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1142,12 +1142,12 @@ msgstr ""
"Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - Client-seitiges Drucken nicht verfügbar"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1157,12 +1157,12 @@ msgstr ""
"Server verweigert die Verbindung.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME box nicht verfügbar"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1171,12 +1171,12 @@ msgstr ""
"Der Server unterstützt die X2Go MIME box nicht.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - keine Freigabe Client-seitiger Ordner"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1186,12 +1186,12 @@ msgstr ""
"Server verweigert die Verbindung.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - keine Client-seitigen Ordner- und Druckerfreigaben möglich"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1201,12 +1201,12 @@ msgstr ""
"werden.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr "%s - Druckfehler"
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1217,7 +1217,7 @@ msgstr ""
"...verursacht an Drucker durch Sitzung\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1228,12 +1228,12 @@ msgstr ""
"...verursacht von Sitzung\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr "%s - starten"
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1242,7 +1242,7 @@ msgstr ""
"Neue X2Go Sitzung wird gestartet...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1251,12 +1251,12 @@ msgstr ""
"Ein anderes X2Go Programm hat diese Sitzung gestartet\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr "%s - fortsetzen"
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1265,7 +1265,7 @@ msgstr ""
"X2Go Sitzung wird fortgesetzt...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1274,12 +1274,12 @@ msgstr ""
"Eine andere X2Go Anwendung hat die Sitzung fortgesetzt\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
@@ -1288,12 +1288,12 @@ msgstr ""
"Bereits aktive Sitzung gefunden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr "%s - anhalten"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1302,12 +1302,12 @@ msgstr ""
"X2Go Sitzung wurde angehalten\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr "%s - beenden"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
diff --git a/po/en.po b/po/en.po
index 4ee2ebf..a92d02d 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: 2012-05-31 21:44+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: en <mike.gabriel(a)das-netzwerkteam.de>\n"
@@ -56,16 +56,16 @@ msgid "Cancel"
msgstr "Cancel"
#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr "%s - connect failure"
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr "User is not allowed to start X2Go sessions!"
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr "%s - connect"
@@ -91,29 +91,29 @@ msgstr "%s - SSH proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Authentication to the SSH proxy server failed!"
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr "%s - socket error"
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr "%s - host key error"
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
"The remote server's host key is invalid or has not been accepted by the user"
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr "%s - missing home directory"
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr "The remote user's home directory does not exist."
@@ -122,12 +122,12 @@ msgstr "The remote user's home directory does not exist."
msgid "%s - key error"
msgstr "%s - key error"
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr "%s - auth error"
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH error"
@@ -934,94 +934,94 @@ msgstr "Disconnecting %s and exiting application..."
msgid "Exiting application..."
msgstr "Exiting Application..."
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr "%s - server warning"
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr "The X2Go Server does not publish an application menu."
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr "Public SSH key authentication has been successful."
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/frontend.py:526
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF error"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authentication protocol communication incomplete! Try again..."
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr "%s - auth key error"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr "An unknown error occurred during authentication!"
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr "Unknown session profile, configure before using it..."
-#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr "%s - session warning"
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Execution of command ,,%s'' failed."
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr "Cleaning X2Go sessions..."
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr "%s - disconnect"
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr "X2Go Profile is now disconnected."
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr "New Session Profile"
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Really Delete Session Profile ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profile deleted"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr "The session profile has been deleted."
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - share local folder with sessions of this profile"
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1034,17 +1034,17 @@ msgstr ""
"\n"
"Are you sure you want to continue connecting?"
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Confirm Host Authorization"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr "%s - channel error"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1053,22 +1053,22 @@ msgstr ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
-#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr "%s - session failure"
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr "The session startup failed."
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "The command ,,%s'' is not available on X2Go server."
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1077,7 +1077,7 @@ msgstr ""
"The command ,,%s'' is not available on X2Go server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1086,7 +1086,7 @@ msgstr ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1095,36 +1095,36 @@ msgstr ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
"X2go/SSH server. Session startup failed."
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr "%s - audio warning"
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
-#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr "%s - audio error"
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr "The X2Go PulseAudio system could not be started."
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "The X2Go PulseAudio system has died unexpectedly."
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr "%s - audio problem"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1133,12 +1133,12 @@ msgstr ""
"The audio connection could not be set up for this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - client-side printing not available"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1147,12 +1147,12 @@ msgstr ""
"The server denies client-side printing from within this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME box not available"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1161,12 +1161,12 @@ msgstr ""
"The server does not support the X2Go MIME box.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - client-side folders not sharable"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1175,12 +1175,12 @@ msgstr ""
"The server denies client-side folder sharing with this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - client resources not sharable"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1189,12 +1189,12 @@ msgstr ""
"Client-side folders and printers cannot be shared with this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr "%s - print error"
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1205,7 +1205,7 @@ msgstr ""
"...caused on printer %s by session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1216,12 +1216,12 @@ msgstr ""
"...caused by session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr "%s - start"
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1230,7 +1230,7 @@ msgstr ""
"New X2Go session starting up...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1239,12 +1239,12 @@ msgstr ""
"Another client started X2Go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr "%s - resume"
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1253,7 +1253,7 @@ msgstr ""
"Resuming X2Go session...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1262,12 +1262,12 @@ msgstr ""
"Another client resumed X2Go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr "%s - running"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
@@ -1276,12 +1276,12 @@ msgstr ""
"Found already running session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1290,12 +1290,12 @@ msgstr ""
"X2Go Session has been suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr "%s - terminate"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
diff --git a/po/es.po b/po/es.po
index e58998d..2fb7d79 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-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: 2012-06-01 09:28+0200\n"
"Last-Translator: Ricardo DÃaz MartÃn <oceanosoftlapalma(a)gmail.com>\n"
"Language-Team: Español; Castellano <>\n"
@@ -61,16 +61,16 @@ msgid "Cancel"
msgstr "Cancelar"
#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr "%s - fallo en la conexión"
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!"
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr "%s - conectado"
@@ -96,30 +96,30 @@ msgstr "%s - proxy SSH"
msgid "Authentication to the SSH proxy server failed!"
msgstr "¡Nombre de usuario o contraseña erróneo en el servidor proxy SSH!"
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr "%s - error de socket"
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr "%s - error en la clave del equipo"
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
"La clave del servidor remoto no es válida o no ha sido aceptada por el "
"usuario"
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr "%s - carpeta home desconocida"
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr "La carpeta home del usuario no existe en el servidor"
@@ -128,12 +128,12 @@ msgstr "La carpeta home del usuario no existe en el servidor"
msgid "%s - key error"
msgstr "%s - error en la clave"
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr "%s - error en la autenticación"
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr "%s - error de SSH"
@@ -945,97 +945,97 @@ msgstr "Desconectando %s y saliendo de las aplicaciones..."
msgid "Exiting application..."
msgstr "Saliendo de la aplicación..."
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr "%s - advertencia del servidor"
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr "El servidor X2GO no publica menú de la aplicación"
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr "Se ha iniciado sesión con éxito usando la clave pública SSH."
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/frontend.py:526
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
"La clave SSH del proxy no es válida o no ha sido aceptada por el usuario"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr "%s - error EOF"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
"¡El protocolo de autenticación de comunicaciones está incompleto! Inténtalo "
"otra vez..."
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr "%s - error en la clave de identificación"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr ""
"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!"
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr "Perfil de Sesión Desconocido, configúralo antes de usar..."
-#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr "%s - advertencia de la sesión"
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Fallo al ejecutar el comando \"%s\"."
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr "Limpiando sesiones X2Go..."
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr "%s - desconectado"
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr "Se ha desconectado el Perfil X2Go."
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr "Nuevo Perfil de Sesión"
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Eliminar el Perfil de Sesión \"%s''?"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr "%s - perfil eliminado"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr "Se ha eliminado el perfil de sesión."
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - compartir carpetas locales con las sesiones de este perfil"
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1048,17 +1048,17 @@ msgstr ""
"\n"
"¿Continuar con la conexión?"
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Se confirma la autorización del equipo"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr "%s - error en el canal"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1067,22 +1067,22 @@ msgstr ""
"¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta "
"iniciar sesión nuevamente..."
-#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr "%s - fallo en la sesión"
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr "El inicio de sesión ha fallado"
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "El comando \"%s'' no está presente en el servidor X2Go."
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1091,7 +1091,7 @@ msgstr ""
"El comando \"%s\" no está disponible en el servidor X2go\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1100,7 +1100,7 @@ msgstr ""
"Se ha denegado la redirección del túnel TCP inverso para la sesión %s al "
"puerto %s del servidor X2Go."
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1109,37 +1109,37 @@ msgstr ""
"La solicitud de túnel a %s:%s para la sesión %s ha sido denegada por el "
"servidor X2go/SSH . Fallo en el inicio de sesión."
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr "%s - advertencia en el sistema de audio"
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
"El sistema X2Go PulseAudio no está disponible en las sesiones del tipo "
"Remote Desktop"
-#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr "%s - error en el audio"
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr "El sistema X2Go PulseAudio no puede iniciarse"
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "El sistema X2Go PulseAudio ha finalizado inesperadamente"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr "%s - problema en el audio"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1148,13 +1148,13 @@ msgstr ""
"La conexión de audio puede que no esté configurada para esta sesión.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr ""
"%s - el sistema de impresión en el lado del cliente no está disponible -"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1163,12 +1163,12 @@ msgstr ""
"El servidor no permite la impresión del lado del cliente para esta sesión.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - No está disponible el contexto MIME"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1177,12 +1177,12 @@ msgstr ""
"El servidor no soporta el contexto X2Go MIME.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - las carpetas del lado del cliente no están compartidas"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1192,12 +1192,12 @@ msgstr ""
"sesión.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - el recurso del cliente no está marcado como compartido"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1207,12 +1207,12 @@ msgstr ""
"permitidas en esta sesión.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr "%s - error de impresión"
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1223,7 +1223,7 @@ msgstr ""
"...provocado en la impresora %s por la sesión\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1234,12 +1234,12 @@ msgstr ""
"...provocado por la sesión\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr "%s - inicio"
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1248,7 +1248,7 @@ msgstr ""
"Iniciando nueva sesión X2Go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1257,12 +1257,12 @@ msgstr ""
"Otro cliente ha iniciado sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr "%s - retornar a la sesión"
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1271,7 +1271,7 @@ msgstr ""
"Retornando sesión X2Go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1280,12 +1280,12 @@ msgstr ""
"Otro cliente retornó a la sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr "%s - en ejecución"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
@@ -1294,12 +1294,12 @@ msgstr ""
"La sesión ya está en ejecución\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr "%s - suspender"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1308,12 +1308,12 @@ msgstr ""
"Se ha suspendido la Sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr "%s - finalizar"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 31133c6..7207104 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-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: 2012-06-03 14:30+0100\n"
"Last-Translator: Terje Andersen <teranders(a)gmail.com>\n"
"Language-Team: nb_NO <x2go-i18n(a)lists.berlios.de>\n"
@@ -25,13 +25,11 @@ msgstr ""
msgid "%s (via %s)"
msgstr "%s (via %s)"
-#: ../pyhoca/wxgui/logon.py:84
-#: ../pyhoca/wxgui/logon.py:96
+#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96
msgid "Username"
msgstr "Brukernavn"
-#: ../pyhoca/wxgui/logon.py:86
-#: ../pyhoca/wxgui/logon.py:98
+#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98
msgid "Password"
msgstr "Passord"
@@ -51,28 +49,23 @@ msgstr "Sesjons innlogging"
msgid "SSH proxy server login"
msgstr "logg inn via en SSH mellomtjener"
-#: ../pyhoca/wxgui/logon.py:121
-#: ../pyhoca/wxgui/profilemanager.py:313
-#: ../pyhoca/wxgui/messages.py:109
-#: ../pyhoca/wxgui/printingprefs.py:138
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:313
+#: ../pyhoca/wxgui/messages.py:109 ../pyhoca/wxgui/printingprefs.py:138
#: ../pyhoca/wxgui/sessiontitle.py:75
msgid "Cancel"
msgstr "Avbryt"
-#: ../pyhoca/wxgui/logon.py:277
-#: ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr "%s - tilkoblingsfeil"
-#: ../pyhoca/wxgui/logon.py:278
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr "Bruker kontoen har ikke tillatelse til å starte X2Go sesjoner!"
-#: ../pyhoca/wxgui/logon.py:283
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr "%s - koble til"
@@ -98,32 +91,30 @@ msgstr "%s - ssh mellomtjener"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Autentiseringenen til SSH mellomtjeneren feilet!"
-#: ../pyhoca/wxgui/logon.py:350
-#: ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr "%s - sokkel feil"
-#: ../pyhoca/wxgui/logon.py:357
-#: ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr "%s - verts nøkkel feil"
-#: ../pyhoca/wxgui/logon.py:358
-#: ../pyhoca/wxgui/frontend.py:516
-msgid "The remote server's host key is invalid or has not been accepted by the user"
-msgstr "Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert av brukeren"
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
+msgid ""
+"The remote server's host key is invalid or has not been accepted by the user"
+msgstr ""
+"Den eksterne serverens verts nøkkel er ugyldig, eller ikke blitt akseptert "
+"av brukeren"
-#: ../pyhoca/wxgui/logon.py:365
-#: ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr "%s - mangler hjemmekatalog"
-#: ../pyhoca/wxgui/logon.py:366
-#: ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke."
@@ -132,14 +123,12 @@ msgstr "Brukerens hjemmekatalog på den eksterne serveren finnes ikke."
msgid "%s - key error"
msgstr "%s - nøkkel feil"
-#: ../pyhoca/wxgui/logon.py:381
-#: ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr "%s - autentiseringens feil"
-#: ../pyhoca/wxgui/logon.py:389
-#: ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH feil"
@@ -228,28 +217,23 @@ msgid "Windows Terminal Server (RDP-proxy)"
msgstr "Windows Terminal Server (RDP-proxy)"
#. 'DirectRDP': 'Windows Terminal Server (RDP-direct)',
-#: ../pyhoca/wxgui/profilemanager.py:84
-#: ../pyhoca/wxgui/profilemanager.py:198
+#: ../pyhoca/wxgui/profilemanager.py:84 ../pyhoca/wxgui/profilemanager.py:198
msgid "Custom command"
msgstr "Selvvalgt kommando"
-#: ../pyhoca/wxgui/profilemanager.py:87
-#: ../pyhoca/wxgui/menus_taskbar.py:355
+#: ../pyhoca/wxgui/profilemanager.py:87 ../pyhoca/wxgui/menus_taskbar.py:355
msgid "Internet Browser"
msgstr "Nettleser"
-#: ../pyhoca/wxgui/profilemanager.py:88
-#: ../pyhoca/wxgui/menus_taskbar.py:356
+#: ../pyhoca/wxgui/profilemanager.py:88 ../pyhoca/wxgui/menus_taskbar.py:356
msgid "Email Client"
msgstr "Epost klient"
-#: ../pyhoca/wxgui/profilemanager.py:89
-#: ../pyhoca/wxgui/menus_taskbar.py:357
+#: ../pyhoca/wxgui/profilemanager.py:89 ../pyhoca/wxgui/menus_taskbar.py:357
msgid "Office"
msgstr "Kontor"
-#: ../pyhoca/wxgui/profilemanager.py:90
-#: ../pyhoca/wxgui/menus_taskbar.py:358
+#: ../pyhoca/wxgui/profilemanager.py:90 ../pyhoca/wxgui/menus_taskbar.py:358
msgid "Terminal"
msgstr "Terminal"
@@ -375,7 +359,9 @@ msgstr "RDP alternativer"
#: ../pyhoca/wxgui/profilemanager.py:206
msgid "Integrate remote application(s) into local desktop (rootless mode)"
-msgstr "Integrer eksterne applikasjon(er) inn i det lokale skrivebordet (rotløs modus)"
+msgstr ""
+"Integrer eksterne applikasjon(er) inn i det lokale skrivebordet (rotløs "
+"modus)"
#: ../pyhoca/wxgui/profilemanager.py:207
msgid "Menu of published applications"
@@ -384,8 +370,7 @@ msgstr "Meny med publiserte applikasjoner"
#. ##
#. ## widgets for the CONNECTION tab
#. ##
-#: ../pyhoca/wxgui/profilemanager.py:214
-#: ../pyhoca/wxgui/profilemanager.py:224
+#: ../pyhoca/wxgui/profilemanager.py:214 ../pyhoca/wxgui/profilemanager.py:224
msgid "User"
msgstr "Bruker"
@@ -465,8 +450,12 @@ msgid "Do not set (use server-side tools to configure the keyboard)"
msgstr "Ikke angi (benytt server-side verktøy for å konfigurere tastaturet)"
#: ../pyhoca/wxgui/profilemanager.py:262
-msgid "Automatically detect and use client-side keyboard configuration inside the session"
-msgstr "Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i sesjonen"
+msgid ""
+"Automatically detect and use client-side keyboard configuration inside the "
+"session"
+msgstr ""
+"Automatisk oppdag og benytt klient-side konfigurasjon for tastaturet inne i "
+"sesjonen"
#: ../pyhoca/wxgui/profilemanager.py:263
msgid "Use custom keyboard settings as provided below"
@@ -522,8 +511,7 @@ msgstr "Benytt lokal mappedeling"
msgid "Path"
msgstr "Sti"
-#: ../pyhoca/wxgui/profilemanager.py:288
-#: ../pyhoca/wxgui/profilemanager.py:307
+#: ../pyhoca/wxgui/profilemanager.py:288 ../pyhoca/wxgui/profilemanager.py:307
msgid "Add"
msgstr "Legg til"
@@ -657,8 +645,7 @@ msgstr "Velg en mappe som skal deles i en sesjon"
#: ../pyhoca/wxgui/profilemanager.py:1666
#: ../pyhoca/wxgui/profilemanager.py:1669
#: ../pyhoca/wxgui/profilemanager.py:1674
-#: ../pyhoca/wxgui/profilemanager.py:1684
-#: ../pyhoca/wxgui/menus_taskbar.py:106
+#: ../pyhoca/wxgui/profilemanager.py:1684 ../pyhoca/wxgui/menus_taskbar.py:106
msgid "Profile Manager"
msgstr "Profil håndterer"
@@ -679,10 +666,12 @@ msgstr "SSH mellomtjener konfigurasjonen er ufullstendig. Forsøk igjen."
#: ../pyhoca/wxgui/profilemanager.py:1684
#, python-format
msgid ""
-"Another session profile (%s) already uses [%s]:%s for binding a local SSH proxy to.\n"
+"Another session profile (%s) already uses [%s]:%s for binding a local SSH "
+"proxy to.\n"
"Please change the SSH proxy settings accordingly."
msgstr ""
-"En annen sesjonsprofil (%s) benytter allerede [%s]:%s for å portbinde en lokal SSH mellomtjener.\n"
+"En annen sesjonsprofil (%s) benytter allerede [%s]:%s for å portbinde en "
+"lokal SSH mellomtjener.\n"
"Vennligst endre SSH mellomtjener innstillingene tilsvarende."
#: ../pyhoca/wxgui/profilemanager.py:1704
@@ -732,8 +721,7 @@ msgstr "Utksriftsinnstillinger"
msgid "Client Options"
msgstr "Klient alternativer"
-#: ../pyhoca/wxgui/menus_taskbar.py:144
-#: ../pyhoca/wxgui/menus_taskbar.py:723
+#: ../pyhoca/wxgui/menus_taskbar.py:144 ../pyhoca/wxgui/menus_taskbar.py:723
#: ../pyhoca/wxgui/menus_taskbar.py:885
msgid "E&xit"
msgstr "&Avslutt"
@@ -742,8 +730,7 @@ msgstr "&Avslutt"
msgid "Window title"
msgstr "Vindustittel"
-#: ../pyhoca/wxgui/menus_taskbar.py:209
-#: ../pyhoca/wxgui/menus_taskbar.py:551
+#: ../pyhoca/wxgui/menus_taskbar.py:209 ../pyhoca/wxgui/menus_taskbar.py:551
msgid "Resume Session"
msgstr "Gjenoppta sesjon"
@@ -759,38 +746,31 @@ msgstr "Overfør sesjon"
msgid "Transfer Session (not possible)"
msgstr "Overfør sesjon (ikke mulig)"
-#: ../pyhoca/wxgui/menus_taskbar.py:228
-#: ../pyhoca/wxgui/menus_taskbar.py:542
+#: ../pyhoca/wxgui/menus_taskbar.py:228 ../pyhoca/wxgui/menus_taskbar.py:542
msgid "Suspend Session (and disconnect/exit)"
msgstr "Koble fra sesjonen (og avslutte)"
-#: ../pyhoca/wxgui/menus_taskbar.py:230
-#: ../pyhoca/wxgui/menus_taskbar.py:544
+#: ../pyhoca/wxgui/menus_taskbar.py:230 ../pyhoca/wxgui/menus_taskbar.py:544
msgid "Suspend Session (and disconnect)"
msgstr "Koble fra sesjonen"
-#: ../pyhoca/wxgui/menus_taskbar.py:232
-#: ../pyhoca/wxgui/menus_taskbar.py:546
+#: ../pyhoca/wxgui/menus_taskbar.py:232 ../pyhoca/wxgui/menus_taskbar.py:546
msgid "Suspend Session"
msgstr "Frakoble sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:238
-#: ../pyhoca/wxgui/menus_taskbar.py:555
+#: ../pyhoca/wxgui/menus_taskbar.py:238 ../pyhoca/wxgui/menus_taskbar.py:555
msgid "Terminate Session (and disconnect/exit)"
msgstr "Avslutte sesjonen (og "
-#: ../pyhoca/wxgui/menus_taskbar.py:240
-#: ../pyhoca/wxgui/menus_taskbar.py:557
+#: ../pyhoca/wxgui/menus_taskbar.py:240 ../pyhoca/wxgui/menus_taskbar.py:557
msgid "Terminate Session (and disconnect)"
msgstr "Avslutte sesjon (og koble fra)"
-#: ../pyhoca/wxgui/menus_taskbar.py:242
-#: ../pyhoca/wxgui/menus_taskbar.py:559
+#: ../pyhoca/wxgui/menus_taskbar.py:242 ../pyhoca/wxgui/menus_taskbar.py:559
msgid "Terminate Session"
msgstr "Avslutte sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:246
-#: ../pyhoca/wxgui/menus_taskbar.py:539
+#: ../pyhoca/wxgui/menus_taskbar.py:246 ../pyhoca/wxgui/menus_taskbar.py:539
msgid "Refresh menu tree"
msgstr "Oppfrisk menytreet"
@@ -858,8 +838,7 @@ msgstr "Verktøy"
msgid "Other Applications"
msgstr "Andre applikasjoner"
-#: ../pyhoca/wxgui/menus_taskbar.py:464
-#: ../pyhoca/wxgui/menus_taskbar.py:476
+#: ../pyhoca/wxgui/menus_taskbar.py:464 ../pyhoca/wxgui/menus_taskbar.py:476
#, python-format
msgid "Connect %s"
msgstr "Koble til %s"
@@ -872,13 +851,11 @@ msgstr "Kobler til..."
msgid "Start &new Desktop Session"
msgstr "Start &ny sesjon"
-#: ../pyhoca/wxgui/menus_taskbar.py:489
-#: ../pyhoca/wxgui/menus_taskbar.py:627
+#: ../pyhoca/wxgui/menus_taskbar.py:489 ../pyhoca/wxgui/menus_taskbar.py:627
msgid "Retrieving Application Menu..."
msgstr "Henter applikasjonsmenyen..."
-#: ../pyhoca/wxgui/menus_taskbar.py:493
-#: ../pyhoca/wxgui/menus_taskbar.py:630
+#: ../pyhoca/wxgui/menus_taskbar.py:493 ../pyhoca/wxgui/menus_taskbar.py:630
msgid "Retrieve Application Menu"
msgstr "Hent applikasjonsmenyen"
@@ -942,8 +919,7 @@ msgstr "Start/gjenoppta sesjon"
msgid "Connect Server"
msgstr "Koble til server"
-#: ../pyhoca/wxgui/about.py:66
-#: ../pyhoca/wxgui/about.py:68
+#: ../pyhoca/wxgui/about.py:66 ../pyhoca/wxgui/about.py:68
#, python-format
msgid "About %s ..."
msgstr "Om %s ..."
@@ -961,93 +937,96 @@ msgstr "Kobler fra %s og avslutter applikasjonen..."
msgid "Exiting application..."
msgstr "Avslutter applikasjonen..."
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr "%s - server advarsel"
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr "X2Go serveren publiserer ikke en applikasjonsmeny"
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr "Offentlig SSH nøkkel autentisering var vellykket."
-#: ../pyhoca/wxgui/frontend.py:523
-msgid "The SSH proxy's host key is invalid or has not been accepted by the user"
-msgstr "SSH mellomtjenerens vertsnøkkel er ugyldig, eller har ikke blitt akseptert av brukeren"
+#: ../pyhoca/wxgui/frontend.py:526
+msgid ""
+"The SSH proxy's host key is invalid or has not been accepted by the user"
+msgstr ""
+"SSH mellomtjenerens vertsnøkkel er ugyldig, eller har ikke blitt akseptert "
+"av brukeren"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF feil"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
-msgstr "Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen."
+msgstr ""
+"Autentiseringens protokoll kommunikasjon er ufullstendig! Forsøk igjen."
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr "%s - Feil med autentiseringsnøkkel"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr "En ukjent feil oppstod under autentiseringen! "
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr "Ukjent sesjonsprofil, konfigurer den først..."
-#: ../pyhoca/wxgui/frontend.py:655
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr "%s - advarsel om sesjon"
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Utførelsen av kommandoen \"%s\" feilet."
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr "Rensker opp i X2Go sesjoner..."
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr "%s - koble fra"
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr "X2Go profilen er nå frakoblet."
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr "Ny sesjonsprofil"
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Virkelig slette sesjonsprofilen \"%s\"?"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profilen er slettet"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr "Sesjonsprofilen har blitt slettet."
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - del lokal mappe med sesjoner av denne profilen"
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1060,39 +1039,41 @@ msgstr ""
"\n"
"Er du sikker på at du vil fortsette tilkoblingen?"
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Verifiser vert autorisasjonen"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr "%s - feil med kanalen"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
-msgid "Lost connection to server %s unexpectedly! Try to re-authenticate to the server..."
-msgstr "Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på nytt til serveren..."
+msgid ""
+"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
+"server..."
+msgstr ""
+"Mistet uventet forbindelsen til server %s ! Forsøk å autentisiere deg på "
+"nytt til serveren..."
-#: ../pyhoca/wxgui/frontend.py:964
-#: ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr "%s - sesjonsfeil"
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr "Oppstart av sesjonen feilet."
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Kommandoen \"%s\" er ikke tilgjengelig på X2Go serveren."
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1101,45 +1082,55 @@ msgstr ""
"Kommandoen \"%s\" er ikke tilgjengelig på X2Go server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
-msgid "Reverse TCP port forwarding request for session %s to server port %s has been denied."
-msgstr "Revers TCP port videresendingsforespørselen for sesjon %s til server port %s har blitt avvist."
+msgid ""
+"Reverse TCP port forwarding request for session %s to server port %s has "
+"been denied."
+msgstr ""
+"Revers TCP port videresendingsforespørselen for sesjon %s til server port %s "
+"har blitt avvist."
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
-msgid "Forwarding tunnel request to [%s]:%s for session %s was denied by remote X2go/SSH server. Session startup failed."
-msgstr "Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet."
+msgid ""
+"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
+"X2go/SSH server. Session startup failed."
+msgstr ""
+"Tunnel videresendingsforespørsel til [%s]:%s for sesjon %s ble avvist av den "
+"eksterne X2Go/SSH serveren. Oppstart av sesjonen feilet."
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr "%s - advarsel om lyd"
-#: ../pyhoca/wxgui/frontend.py:1000
-msgid "The X2Go PulseAudio system is not available within Remote Desktop sessions."
-msgstr "X2Go PulseAudio systemet er ikke tilgjengelig inne i Terminal server sesjoner (RDP)."
-
#: ../pyhoca/wxgui/frontend.py:1003
-#: ../pyhoca/wxgui/frontend.py:1006
+msgid ""
+"The X2Go PulseAudio system is not available within Remote Desktop sessions."
+msgstr ""
+"X2Go PulseAudio systemet er ikke tilgjengelig inne i Terminal server "
+"sesjoner (RDP)."
+
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr "%s - feil med lyden"
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr "X2Go PulseAudio systemet kan ikke bli startet."
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "X2Go PulseAudio systemet har uventet stoppet."
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr "%s - problem med lyden"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1148,12 +1139,12 @@ msgstr ""
"Klarte ikke å sette opp lydforbindelsen for denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - klient-side utskrift er ikke tilgjengelig"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1162,12 +1153,12 @@ msgstr ""
"Serveren nekter klient-side utskrift innenfra denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME boks ikke tilgjengelig"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1176,12 +1167,12 @@ msgstr ""
"Serveren støtter ikke X2Go MIME boks.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - klient-side mapper er ikke mulig å dele"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1190,12 +1181,12 @@ msgstr ""
"Serveren nekter klient-side mapperdeling med denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - klient ressurser er ikke mulig å dele"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1204,13 +1195,12 @@ msgstr ""
"Klient-side mapper og skrivere kan ikke bli delt med denne sesjonen.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1035
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr "%s - feil ved utskrift"
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1221,7 +1211,7 @@ msgstr ""
"...oppstod på skriver %s fra sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1232,13 +1222,12 @@ msgstr ""
"...oppstod fra sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1041
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr "%s - start"
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1247,7 +1236,7 @@ msgstr ""
"Ny X2Go sesjon starter opp...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1256,13 +1245,12 @@ msgstr ""
"En annen klient startet X2Go sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1049
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr "%s - gjenoppta"
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1271,7 +1259,7 @@ msgstr ""
"Gjenopptar X2Go sesjon...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1280,12 +1268,12 @@ msgstr ""
"En annen klient gjenopptok X2Go sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
@@ -1294,12 +1282,12 @@ msgstr ""
"Fant allerede kjørende sesjon\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr "%s - koble fra"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1308,12 +1296,12 @@ msgstr ""
"X2Go sesjonen har blitt frakoblet\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr "%s - avslutt"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
@@ -1354,8 +1342,7 @@ msgstr "Ja"
msgid "No"
msgstr "Nei"
-#: ../pyhoca/wxgui/messages.py:103
-#: ../pyhoca/wxgui/printingprefs.py:133
+#: ../pyhoca/wxgui/messages.py:103 ../pyhoca/wxgui/printingprefs.py:133
msgid "Ok"
msgstr "Ok"
diff --git a/po/nl.po b/po/nl.po
index c67b39c..a6a21b0 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-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: 2012-05-28 14:51+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n"
"Language-Team: nl <dick.kniep(a)lindix.nl>\n"
@@ -56,16 +56,16 @@ msgid "Cancel"
msgstr "Afbreken"
#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr "Gebruiker mag geen X2Go sessie starten!"
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
@@ -91,30 +91,30 @@ msgstr "%s - SSH Proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Authenticatie via SSH Proxy Server mislukt!"
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr "%s - socket fout"
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr "%s - server sleutel fout"
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
"De sleutel van de server is ongeldig of is niet geaccepteerd door de "
"gebruiker"
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr "%s - home directory niet aanwezig"
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr "De home directory op afstand van de gebruiker bestaat niet"
@@ -123,12 +123,12 @@ msgstr "De home directory op afstand van de gebruiker bestaat niet"
msgid "%s - key error"
msgstr "%s - sleutel fout"
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr "%s - authenticatie fout"
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr "%s - sleutel fout"
@@ -932,95 +932,95 @@ msgstr "Bezig met verbreken verbinding %s en afsluiten applicatie..."
msgid "Exiting application..."
msgstr "Afsluiten van applicatie..."
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr "%s - server waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr "De X2go server publiceert geen applicatie menu"
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr "Public SSH-key authenticatie is gelukt."
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/frontend.py:526
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
"De sleutel van de SSH proxy is ongeldig of is niet geaccepteerd door de "
"gebruiker"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF fout"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authenticatie was niet volledig! Opnieuw proberen..."
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr "%s - Verbindingsfout met auth. key"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr "Een onbekende fout is bij de authenticatie opgetreden"
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr "Onekend sessie profiel, stel dit in voordat je het gebruikt..."
-#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr "%s - sessie waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr "Opschonen X2Go sessies..."
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr "%s - verbinding verbreken"
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr "X2Go Profiel is nu niet meer verbonden."
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr "Nieuw Profiel"
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Verwijder sessie profiel ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profiel is verwijderd!"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr "Het sessie profiel is verwijderd."
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - deel lokale map met dit Profiel"
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1033,17 +1033,17 @@ msgstr ""
"\n"
"Weet u zeker dat u de verbinding wilt maken?"
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Bevestig dat de Host geautoriseerd is"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindingsfout (channel error)"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1052,22 +1052,22 @@ msgstr ""
"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u "
"opnieuw aan te melden..."
-#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr "%s - sessie fout"
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr "Opstarten van de sessie is mislukt"
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Het commando ,,%s'' is niet beschikbaar op de X2Go server."
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1076,7 +1076,7 @@ msgstr ""
"Het commando ,,%s'' is niet beschikbaar op de X2Go server\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1085,7 +1085,7 @@ msgstr ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1094,36 +1094,36 @@ msgstr ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
"X2go/SSH server. Session startup failed."
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr "%s - audio waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
"Het X2Go PulseAudio systeem is niet beschikbaar voor Remote Desktop sessies"
-#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr "%s - audio fout"
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr "Het X2Go PulseAudio systeem kon niet gestart worden"
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "Het X2Go PulseAudio systeem is gecrashed"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr "%s - audio probleem"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1132,36 +1132,36 @@ msgstr ""
"De audio verbinding kon niet worden gemaakt voor deze sessie.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - client-side print systeem niet beschikbaar"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
"%s"
msgstr "De server staat client-side printing niet toe"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr "%s- MIME box is niet beschikbaar"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
"%s"
msgstr "De server ondersteunt geen X2Go MIME box"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - client-side mappen worden niet gedeeld"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1170,12 +1170,12 @@ msgstr ""
"De server staat client-side mappen deling in deze sessie niet toe.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - client bronnen kunnen niet gedeeld worden"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1184,12 +1184,12 @@ msgstr ""
"Client-side mappen en printers kunnen niet gedeeld worden in deze sessie.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr "%s - Printfout"
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1200,7 +1200,7 @@ msgstr ""
"...veroorzaakt door printer %s in sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1211,12 +1211,12 @@ msgstr ""
"...veroorzaakt door sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr "%s - Start"
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1225,7 +1225,7 @@ msgstr ""
"Nieuwe X2Go sessie wordt gestart...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1234,12 +1234,12 @@ msgstr ""
"Een andere X2Go-client heeft deze sessie gestart\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr "%s - hervatten"
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1248,7 +1248,7 @@ msgstr ""
"X2Go Sessie wordt hervat...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1257,12 +1257,12 @@ msgstr ""
"Een andere X2Go-client heeft de Sessie hervat\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr "%s - actief"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
@@ -1271,12 +1271,12 @@ msgstr ""
"Reeds actieve sessie gevonden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1285,12 +1285,12 @@ msgstr ""
"X2Go Sessie is suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr "%s - beëindigen"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
diff --git a/po/sv.po b/po/sv.po
index 5a35667..57bf394 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-06-04 08:04+0200\n"
+"POT-Creation-Date: 2012-06-07 09:16+0200\n"
"PO-Revision-Date: 2012-06-01 17:59+0100\n"
"Last-Translator: Daniel Lindgren <dali.spam(a)gmail.com>\n"
"Language-Team: Swedish <x2go-i18n(a)lists.berlios.de>\n"
@@ -57,16 +57,16 @@ msgid "Cancel"
msgstr "Avbryt"
#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:319
-#: ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/frontend.py:485
#, python-format
msgid "%s - connect failure"
msgstr "%s - anslutning misslyckades"
-#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:482
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:485
msgid "User is not allowed to start X2Go sessions!"
msgstr "Användaren har inte rätt att starta X2Go-sessioner!"
-#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:492
#, python-format
msgid "%s - connect"
msgstr "%s - anslut"
@@ -92,28 +92,28 @@ msgstr "%s - SSH-proxy"
msgid "Authentication to the SSH proxy server failed!"
msgstr "Autentisering till SSH-proxy misslyckades!"
-#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/logon.py:350 ../pyhoca/wxgui/frontend.py:540
#, python-format
msgid "%s - socket error"
msgstr "%s - socketfel"
-#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:516
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/logon.py:357 ../pyhoca/wxgui/frontend.py:519
+#: ../pyhoca/wxgui/frontend.py:526
#, python-format
msgid "%s - host key error"
msgstr "%s - fel på serverns nyckel"
-#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:516
+#: ../pyhoca/wxgui/logon.py:358 ../pyhoca/wxgui/frontend.py:519
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr "Serverns nyckel är felaktig eller har inte accepterats av användaren"
-#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:365 ../pyhoca/wxgui/frontend.py:561
#, python-format
msgid "%s - missing home directory"
msgstr "%s - hemkatalog saknas"
-#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:558
+#: ../pyhoca/wxgui/logon.py:366 ../pyhoca/wxgui/frontend.py:561
msgid "The remote user's home directory does not exist."
msgstr "Fjärranvändarens hemkatalog saknas."
@@ -122,12 +122,12 @@ msgstr "Fjärranvändarens hemkatalog saknas."
msgid "%s - key error"
msgstr "%s - nyckelfel"
-#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:565
+#: ../pyhoca/wxgui/logon.py:381 ../pyhoca/wxgui/frontend.py:568
#, python-format
msgid "%s - auth error"
msgstr "%s - autentiseringsfel"
-#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:509
+#: ../pyhoca/wxgui/logon.py:389 ../pyhoca/wxgui/frontend.py:512
#, python-format
msgid "%s - SSH error"
msgstr "%s - SSH-fel"
@@ -935,94 +935,94 @@ msgstr "Kopplar från %s och avslutar applikation..."
msgid "Exiting application..."
msgstr "Avslutar applikation..."
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
#, python-format
msgid "%s - server warning"
msgstr "%s - servervarning"
-#: ../pyhoca/wxgui/frontend.py:456
+#: ../pyhoca/wxgui/frontend.py:459
msgid "The X2Go Server does not publish an application menu."
msgstr "X2Go-servern publicerar inte en applikationsmeny."
-#: ../pyhoca/wxgui/frontend.py:489
+#: ../pyhoca/wxgui/frontend.py:492
msgid "Public SSH key authentication has been successful."
msgstr "Autentisering med publik SSH-nyckel lyckades."
-#: ../pyhoca/wxgui/frontend.py:523
+#: ../pyhoca/wxgui/frontend.py:526
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
"SSH-proxyns nyckel är felaktig eller har inte accepterats av användaren"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
#, python-format
msgid "%s - EOF error"
msgstr "%s - EOF fel"
-#: ../pyhoca/wxgui/frontend.py:544
+#: ../pyhoca/wxgui/frontend.py:547
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Autentisering slutfördes ej! Prova igen..."
-#: ../pyhoca/wxgui/frontend.py:551
+#: ../pyhoca/wxgui/frontend.py:554
#, python-format
msgid "%s - auth key error"
msgstr "%s - autentiseringsnyckel fel"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:575
msgid "An unknown error occurred during authentication!"
msgstr "Ett okänt fel inträffade vid autentisering!"
-#: ../pyhoca/wxgui/frontend.py:600
+#: ../pyhoca/wxgui/frontend.py:603
msgid "Unknown session profile, configure before using it..."
msgstr "Okänd sessionsprofil, konfigurera före användning..."
-#: ../pyhoca/wxgui/frontend.py:655 ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:658 ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid "%s - session warning"
msgstr "%s - sessionsvarning"
-#: ../pyhoca/wxgui/frontend.py:655
+#: ../pyhoca/wxgui/frontend.py:658
#, python-format
msgid "Execution of command ,,%s'' failed."
msgstr "Exekvering av kommando \"%s\" misslyckades."
-#: ../pyhoca/wxgui/frontend.py:731
+#: ../pyhoca/wxgui/frontend.py:734
msgid "Cleaning X2Go sessions..."
msgstr "Rensar X2Go-sessioner..."
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
#, python-format
msgid "%s - disconnect"
msgstr "%s - koppla från"
-#: ../pyhoca/wxgui/frontend.py:763
+#: ../pyhoca/wxgui/frontend.py:766
msgid "X2Go Profile is now disconnected."
msgstr "X2Go-profil är nu frånkopplad"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:779
msgid "New Session Profile"
msgstr "Ny sessionsprofil"
-#: ../pyhoca/wxgui/frontend.py:816
+#: ../pyhoca/wxgui/frontend.py:819
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Är du säker på att du vill radera profil ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profil raderad"
-#: ../pyhoca/wxgui/frontend.py:822
+#: ../pyhoca/wxgui/frontend.py:825
msgid "The session profile has been deleted."
msgstr "Profilen har raderats."
-#: ../pyhoca/wxgui/frontend.py:837
+#: ../pyhoca/wxgui/frontend.py:840
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - dela lokal mapp med sessioner som använder denna profil"
-#: ../pyhoca/wxgui/frontend.py:926
+#: ../pyhoca/wxgui/frontend.py:929
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -1035,17 +1035,17 @@ msgstr ""
"\n"
"Litar du på denna nyckel?"
-#: ../pyhoca/wxgui/frontend.py:934
+#: ../pyhoca/wxgui/frontend.py:937
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Bekräfta tillägg av server"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid "%s - channel error"
msgstr "%s - kanalfel"
-#: ../pyhoca/wxgui/frontend.py:953
+#: ../pyhoca/wxgui/frontend.py:956
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -1053,22 +1053,22 @@ msgid ""
msgstr ""
"Anslutning till %s avslutades oväntat! Försök återansluta till server..."
-#: ../pyhoca/wxgui/frontend.py:964 ../pyhoca/wxgui/frontend.py:971
-#: ../pyhoca/wxgui/frontend.py:973 ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:967 ../pyhoca/wxgui/frontend.py:974
+#: ../pyhoca/wxgui/frontend.py:976 ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid "%s - session failure"
msgstr "%s - session misslyckades"
-#: ../pyhoca/wxgui/frontend.py:964
+#: ../pyhoca/wxgui/frontend.py:967
msgid "The session startup failed."
msgstr "Sessionsstart misslyckades."
-#: ../pyhoca/wxgui/frontend.py:971
+#: ../pyhoca/wxgui/frontend.py:974
#, python-format
msgid "The command ,,%s'' is not available on X2Go server."
msgstr "Kommandot ,,%s'' finns inte på X2Go-server."
-#: ../pyhoca/wxgui/frontend.py:973
+#: ../pyhoca/wxgui/frontend.py:976
#, python-format
msgid ""
"The command ,,%s'' is not available on X2Go server\n"
@@ -1077,7 +1077,7 @@ msgstr ""
"Kommandot ,,%s'' finns inte på X2Go-server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:979
+#: ../pyhoca/wxgui/frontend.py:982
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -1085,7 +1085,7 @@ msgid ""
msgstr ""
"Omvänd TCP port forwarding för session %s till serverport %s har nekats."
-#: ../pyhoca/wxgui/frontend.py:985
+#: ../pyhoca/wxgui/frontend.py:988
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -1094,35 +1094,35 @@ msgstr ""
"Begäran om tunnel till [%s]:%s för session %s nekades av X2Go/SSH-server. "
"Sessionsstart misslyckades."
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
#, python-format
msgid "%s - audio warning"
msgstr "%s - ljudvarning"
-#: ../pyhoca/wxgui/frontend.py:1000
+#: ../pyhoca/wxgui/frontend.py:1003
msgid ""
"The X2Go PulseAudio system is not available within Remote Desktop sessions."
msgstr "X2Go PulseAudio är inte tillgängligt i Remote Desktop-sessioner."
-#: ../pyhoca/wxgui/frontend.py:1003 ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1006 ../pyhoca/wxgui/frontend.py:1009
#, python-format
msgid "%s - audio error"
msgstr "%s - ljudfel"
-#: ../pyhoca/wxgui/frontend.py:1003
+#: ../pyhoca/wxgui/frontend.py:1006
msgid "The X2Go PulseAudio system could not be started."
msgstr "X2Go PulseAudio kunde ej startas."
-#: ../pyhoca/wxgui/frontend.py:1006
+#: ../pyhoca/wxgui/frontend.py:1009
msgid "The X2Go PulseAudio system has died unexpectedly."
msgstr "X2Go PulseAudio avslutades oväntat."
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid "%s - audio problem"
msgstr "%s - ljudproblem"
-#: ../pyhoca/wxgui/frontend.py:1009
+#: ../pyhoca/wxgui/frontend.py:1012
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -1131,12 +1131,12 @@ msgstr ""
"Anslutning för ljud kunde ej genomföras för denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid "%s - client-side printing not available"
msgstr "%s - klientdelade utskrifter ej tillgängliga"
-#: ../pyhoca/wxgui/frontend.py:1012
+#: ../pyhoca/wxgui/frontend.py:1015
#, python-format
msgid ""
"The server denies client-side printing from within this session.\n"
@@ -1145,12 +1145,12 @@ msgstr ""
"Servern tillåter ej utskrifter via klient från denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid "%s - MIME box not available"
msgstr "%s - MIME ej tillgängligt"
-#: ../pyhoca/wxgui/frontend.py:1015
+#: ../pyhoca/wxgui/frontend.py:1018
#, python-format
msgid ""
"The server does not support the X2Go MIME box.\n"
@@ -1159,12 +1159,12 @@ msgstr ""
"Servern stöder ej X2Go MIME.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid "%s - client-side folders not sharable"
msgstr "%s - klientmappar ej delningsbara"
-#: ../pyhoca/wxgui/frontend.py:1018
+#: ../pyhoca/wxgui/frontend.py:1021
#, python-format
msgid ""
"The server denies client-side folder sharing with this session.\n"
@@ -1173,12 +1173,12 @@ msgstr ""
"Servern tillåter ej klientdelade mappar i denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid "%s - client resources not sharable"
msgstr "%s - klientresurser ej delningsbara"
-#: ../pyhoca/wxgui/frontend.py:1021
+#: ../pyhoca/wxgui/frontend.py:1024
#, python-format
msgid ""
"Client-side folders and printers cannot be shared with this session.\n"
@@ -1187,12 +1187,12 @@ msgstr ""
"Klientdelade mappar och utskrifter kan ej delas med denna session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1035 ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1038 ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid "%s - print error"
msgstr "%s - utskriftsfel"
-#: ../pyhoca/wxgui/frontend.py:1035
+#: ../pyhoca/wxgui/frontend.py:1038
#, python-format
msgid ""
"%s\n"
@@ -1203,7 +1203,7 @@ msgstr ""
"... orsakat på skrivare %s av session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1037
+#: ../pyhoca/wxgui/frontend.py:1040
#, python-format
msgid ""
"%s\n"
@@ -1214,12 +1214,12 @@ msgstr ""
"...orsakat av session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1041 ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1044 ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid "%s - start"
msgstr "%s - startar"
-#: ../pyhoca/wxgui/frontend.py:1041
+#: ../pyhoca/wxgui/frontend.py:1044
#, python-format
msgid ""
"New X2Go session starting up...\n"
@@ -1228,7 +1228,7 @@ msgstr ""
"Ny X2Go-session startar ...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1045
+#: ../pyhoca/wxgui/frontend.py:1048
#, python-format
msgid ""
"Another client started X2Go session\n"
@@ -1237,12 +1237,12 @@ msgstr ""
"En annan klient startade X2Go-session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1049 ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1052 ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid "%s - resume"
msgstr "%s - återanslut"
-#: ../pyhoca/wxgui/frontend.py:1049
+#: ../pyhoca/wxgui/frontend.py:1052
#, python-format
msgid ""
"Resuming X2Go session...\n"
@@ -1251,7 +1251,7 @@ msgstr ""
"Ã…teransluter X2Go-session...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1053
+#: ../pyhoca/wxgui/frontend.py:1056
#, python-format
msgid ""
"Another client resumed X2Go session\n"
@@ -1260,12 +1260,12 @@ msgstr ""
"En annan klient återanslöt X2Go-session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:1057
+#: ../pyhoca/wxgui/frontend.py:1060
#, python-format
msgid ""
"Found already running session\n"
@@ -1274,12 +1274,12 @@ msgstr ""
"Hittade aktiv session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid "%s - suspend"
msgstr "%s - vila"
-#: ../pyhoca/wxgui/frontend.py:1066
+#: ../pyhoca/wxgui/frontend.py:1069
#, python-format
msgid ""
"X2Go Session has been suspended\n"
@@ -1288,12 +1288,12 @@ msgstr ""
"X2Go-session har försatts i vila\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid "%s - terminate"
msgstr "%s - avsluta"
-#: ../pyhoca/wxgui/frontend.py:1082
+#: ../pyhoca/wxgui/frontend.py:1085
#, python-format
msgid ""
"X2Go Session has terminated\n"
diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index 436d5b6..07ea039 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -43,11 +43,23 @@ import basepath
class PyHocaGUI_AboutFrame(wx.Frame):
"""\
- STILL UNDOCUMENTED
+ wxWidget displaying an ,,About'' window for this application.
"""
def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon.png'):
-
+ """\
+ About window (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param about_image: full image path for background image of About window
+ @type about_image: C{str}
+ @param icon_name: icon name for window icon
+ @type icon_name: C{str}
+
+ """
self._PyHocaGUI = _PyHocaGUI
self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
@@ -97,9 +109,17 @@ class PyHocaGUI_AboutFrame(wx.Frame):
self.CenterOnScreen()
def OnHide(self, evt):
+ """\
+ Hide the About window (never close it as it is the main window of the application.
+
+ """
self.Show(False)
def OnKeyDown(self, evt):
+ """\
+ Handle keyboard requests, so that pressing ESC can hide the About window.
+
+ """
keycode = evt.GetKeyCode()
if keycode == wx.WXK_ESCAPE:
self.Show(False)
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 2bae5d2..1c291fd 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -383,6 +383,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if profile_name is None and session_uuid:
profile_name = self._X2goClient__get_session_profile_name(session_uuid)
+ if not self._X2goClient__client_connected_sessions_of_profile_name(profile_name):
+ return None
+
if session_uuid is None and profile_name:
session_uuid = self._X2goClient__client_connected_sessions_of_profile_name(profile_name, return_objects=False)[0]
@@ -487,7 +490,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
pass
else:
self.notifier.send(_(u'%s - connect') % profile_name, _(u'Public SSH key authentication has been successful.'), icon='auth_success', timeout=4000)
- _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True)
+ _dummy = self._X2goClient__list_sessions(session_uuid, refresh_cache=True, update_sessionregistry=True)
self._post_authenticate(evt, session_uuid)
try:
self._temp_disabled_profile_names.remove(profile_name)
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 8a0861d..764f1b7 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -57,11 +57,23 @@ else:
class PyHocaGUI_DialogBoxPassword(wx.Dialog):
"""\
- STILL UNDOCUMENTED
+ Logon window for L{PyHocaGUI}.
"""
def __init__(self, _PyHocaGUI, profile_name, caller=None, sshproxy_auth=False):
+ """\
+ Logon window (constructor)
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param profile_name: name of session profile that defines the server we authenticate against
+ @type profile_name: C{str}
+ @param caller: unused
+ @type caller: C{None}
+ @param sshproxy_auth: use (dual) SSH proxy authentication
+ @type sshproxy_auth: C{bool}
+ """
self._PyHocaGUI = _PyHocaGUI
self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
self._pyhoca_logger('password dialog box started', loglevel=x2go.loglevel_INFO, )
@@ -225,7 +237,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
def OnLogin(self, evt):
"""\
- STILL UNDOCUMENTED
+ If the user clicks ,,Ok'' in the logon window.
+
+ @param evt: event
+ @type evt: C{obj}
"""
username = self.userTxt.GetValue()
@@ -420,10 +435,21 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
self.Destroy()
def OnCancel(self, evt):
+ """
+ If the user clicks ,,Cancel'' in the logon window.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ """
self.Close()
self.Destroy()
def Destroy(self):
+ """
+ Tidy up some stuff in the main application instance when the logon window gets destroyed.
+
+ """
try:
self._PyHocaGUI._sub_windows.remove(self)
except ValueError:
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index baf5fb7..304e807 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -43,12 +43,19 @@ _icons_location = basepath.icons_basepath
class PyHocaGUI_Menu_TaskbarManageProfile(wx.Menu):
"""\
- STILL UNDOCUMENTED
+ Individual profile management submenu: copy, use as template or delete session profile.
"""
def __init__(self, _PyHocaGUI, caller=None, profile_name=None):
"""\
- STILL UNDOCUMENTED
+ Individual profile management submenu (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param profile_name: session profile name this submenu is for
+ @type profile_name: C{str}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -78,12 +85,17 @@ class PyHocaGUI_Menu_TaskbarManageProfile(wx.Menu):
class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
"""\
- STILL UNDOCUMENTED
+ Right-click menu of the L{PyHocaGUI} systray icon.
"""
def __init__(self, _PyHocaGUI, caller=None):
"""\
- STILL UNDOCUMENTED
+ Client and profile management menu of L{PyHocaGUI} (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -147,12 +159,25 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
"""\
- STILL UNDOCUMENTED
+ Session action submenu for individual sessions: start, resume, suspend, terminate etc. sessions.
"""
def __init__(self, _PyHocaGUI, caller=None, profile_name=None, session_name=None, session_info=None, status=None):
"""\
- STILL UNDOCUMENTED
+ Session action submenu (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param profile_name: session profile name this submenu is for
+ @type profile_name: C{str}
+ @param session_name: X2Go session name this submenu is for
+ @type session_name: C{str}
+ @param session_info: session info object (C{X2goServerSessionInfo*} from Python X2Go)
+ @type session_info: C{obj}
+ @param status: status of this session (R for running, S for suspended)
+ @type status: C{str}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -266,12 +291,19 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
"""\
- STILL UNDOCUMENTED
+ Submenu that manages folder sharing per connected session profile.
"""
def __init__(self, _PyHocaGUI, caller=None, profile_name=None):
"""\
- STILL UNDOCUMENTED
+ Folder sharing submenu (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param profile_name: session profile name this submenu is for
+ @type profile_name: C{str}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -337,11 +369,22 @@ class PyHocaGUI_Menu_TaskbarProfileSharedFolders(wx.Menu):
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnShareCustomLocalFolder, id=ID_SHARECUSTOMLOCALFOLDER)
self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnUnshareAllLocalFolders, id=ID_UNSHAREALLLOCALFOLDERS)
+
class PyHocaGUI_Menu_LaunchSingleApplication(wx.Menu):
+ """\
+ Submenu that triggers single application launches.
+ """
def __init__(self, _PyHocaGUI, caller=None, profile_name=None):
"""\
- STILL UNDOCUMENTED
+ Single application launching submenu (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param profile_name: session profile name this submenu is for
+ @type profile_name: C{str}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -369,7 +412,19 @@ class PyHocaGUI_Menu_LaunchSingleApplication(wx.Menu):
def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=None, session_name=None):
"""\
- STILL UNDOCUMENTED
+ Generate wxPython based menu tree for X2Go published applications.
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param profile_name: session profile name this submenu is for
+ @type profile_name: C{str}
+ @param session_name: X2Go session name this submenu is for
+ @type session_name: C{str}
+
+ @return: dictionary based menu tree containing wx.Menu objects for menu rendering.
+ @rtype: C{dict}
"""
_lang = _PyHocaGUI.lang
@@ -436,12 +491,19 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N
class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
"""\
- STILL UNDOCUMENTED
+ Submenu for a connected session profile.
"""
def __init__(self, _PyHocaGUI, caller=None, profile_name=None):
"""\
- STILL UNDOCUMENTED
+ Session profile submenu (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param profile_name: session profile name this submenu is for
+ @type profile_name: C{str}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -697,7 +759,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
submenu=PyHocaGUI_Menu_TaskbarProfileSharedFolders(self._PyHocaGUI, caller=self,
profile_name=profile_name)
)
- if not self._PyHocaGUI._X2goClient__client_associated_sessions_of_profile_name(profile_name=profile_name, return_objects=False) or _foldersharing_disabled:
+ if not self._PyHocaGUI.get_master_session(profile_name=profile_name) or _foldersharing_disabled:
_shared_folders.Enable(False)
@@ -726,7 +788,10 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
"""\
- STILL UNDOCUMENTED
+ Render a (recursive) menu subtree that contains a cascaded menu tree of all session profile names.
+
+ If session profile names contain '/' as a separator character then those session profile names
+ will be rendered in a tree-like fashion.
"""
def __init__(self, _PyHocaGUI, caller=None,
@@ -735,7 +800,29 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
submenu=None,
group_menus=True, group_name='', parent_group=''):
"""\
- STILL UNDOCUMENTED
+ Session profile name (recursive) menu subtree
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
+ @param sub_profile_items: on recursion this argument contains those session profile names
+ that will be rendered for this session profile subtree
+ @type sub_profile_items: C{list}
+ @param filter_profiles: allow filtering of profile names (hiding certain session profiles)
+ @type filter_profiles: C{list}
+ @param disabled_profiles: session profile names that get greyed out in the menu tree
+ @type disabled_profiles: C{list}
+ @param bind_method: if session profile names are menu items this argument names the Python method that menu items will bind to
+ @type bind_method: C{method}
+ @param submenu: if session profile names are submenus this argument names the wx.Menu class that handles the submenu rendering
+ @type submenu: C{class}
+ @param group_menus: group session profile names in submenus (i.e. switch on recursion mode)
+ @type group_menus: C{bool}
+ @param group_name: on recursion, this argument names the parent menu folder of the current submenu
+ @type group_name: C{str}
+ @param parent_group: on recursion, the parent group of C{group_name}
+ @type parent_group: C{str}
"""
self._PyHocaGUI = _PyHocaGUI
@@ -836,12 +923,17 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
"""\
- STILL UNDOCUMENTED
+ Right-click menu of the L{PyHocaGUI} systray icon.
"""
def __init__(self, _PyHocaGUI, caller=None):
"""\
- STILL UNDOCUMENTED
+ Session management menu of L{PyHocaGUI} (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param caller: unused
+ @type caller: C{None}
"""
self._PyHocaGUI = _PyHocaGUI
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index 59dc0cf..cc3e4a1 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -35,13 +35,36 @@ from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
_icons_location = basepath.icons_basepath
class PyHoca_MessageWindow(wx.Dialog):
+ """\
+ A simple message window for L{PyHocaGUI}.
+ """
def __init__(self, _PyHocaGUI, parent=None, title=None, shortmsg=None, custom_message=None, icon=None, buttontype='ok',
profile_name=None,
- session_name=None,
- username=None,
- hostname=None, ):
-
+ session_name=None):
+ """\
+ L{PyHocaGUI} message window.
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+ @param parent: the parent (calling) object
+ @type parent: C{obj}
+ @param title: window title
+ @type title: C{str}
+ @param shortmsg: a short string that refers to a pre-defined message (hard-coded in this class)
+ @type shortmsg: C{str}
+ @param custom_message: the message to be shown in this message box (alternative to C{shortmsg})
+ @type custom_message: C{str}
+ @param icon: icon name for an icon to be shown left of the text in this message box
+ @type icon: C{str}
+ @param buttontype: button types can be: C{ok}, C{okcancel}, C{cancelok}, C{yesno}, and C{noyes}
+ @type buttontype: C{str}
+ @param profile_name: session profile name of the profile this message box refers to
+ @type profile_name: C{str}
+ @param session_name: X2Go session name of the session this message box refers to
+ @type session_name: C{str}
+
+ """
self._PyHocaGUI = _PyHocaGUI
try: wx.EndBusyCursor()
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index c7eb0c1..df7e7ac 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -35,13 +35,23 @@ class NotSupportedException(exceptions.StandardError): pass
class PyHocaNotificationException(exceptions.StandardError): pass
class libnotify_NotifierPopup(object):
+ """\
+ L{PyHocaGUI} notification utilizing C{libnotify}, used on Linux/Unix OS.
+ """
title = {}
text = {}
icon = {}
timeout = {}
def __init__(self, _PyHocaGUI):
+ """\
+ Notifier popup (constructor).
+
+ @param _PyHocaGUI: main application instance
+ @type _PyHocaGUI: C{obj}
+
+ """
self._PyHocaGUI = _PyHocaGUI
self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
@@ -49,6 +59,24 @@ class libnotify_NotifierPopup(object):
raise NotSupportedException
def prepare(self, context, title=None, text=None, icon=None, timeout=None):
+ """\
+ Prepare a notification that gets sent to C{libnotify} later (by the L{send()} method).
+
+ Use C{context} as a unique identifier. When sending the notification later, C{context}
+ will unequivocally map to the notification content that shall get sent.
+
+ @param context: a unique identifier for this notification preparation
+ @type context: C{str}
+ @param title: notification title
+ @type title: C{str}
+ @param text: notification text
+ @type text: C{str}
+ @param icon: icon name for an icon that appears with the notification
+ @type icon: C{str}
+ @param timeout: let notification disappear after C{<timeout>} milliseconds
+ @type timeout: C{int}
+
+ """
if title is not None:
self.title[context] = title
if text is not None:
@@ -59,6 +87,23 @@ class libnotify_NotifierPopup(object):
self.timeout[context] = timeout
def send(self, title=None, text=None, context=None, icon=None, timeout=8000):
+ """\
+ Send notifications directly (or use a prepared notification).
+
+ @param title: notification title
+ @type title: C{str}
+ @param text: notification text
+ @type text: C{str}
+ @param context: an identifier that refers to a prepared notification
+ @type context: C{str}
+ @param icon: icon name for an icon that appears with the notification
+ @type icon: C{str}
+ @param timeout: let notification disappear after C{<timeout>} milliseconds
+ @type timeout: C{int}
+
+ @raise PyHocaNotificationException: if notification failed
+
+ """
if context is not None:
try:
title = self.title[context]
@@ -93,24 +138,62 @@ class libnotify_NotifierPopup(object):
raise PyHocaNotificationException('could not notify user')
def Close(self):
+ """\
+ Provide a C{Close()} method which does nothing.
+
+ """
pass
def Destroy(self):
+ """\
+ Provide a C{Destroy()} method which does nothing.
+
+ """
pass
class notificationmessage_NotifierPopup(object):
+ """\
+ L{PyHocaGUI} notification utilizing C{wx.NotificationMessage()}, used on Windows OS.
+
+ Note: C{wx.NotificationMessage()} has only been added to wxPython in version 2.9.x.
+ """
title = {}
text = {}
icon = {}
timeout = {}
def __init__(self, _about):
+ """\
+ Notifier popup (constructor).
+
+ @param _about: main application window
+ @type _about: C{obj}
+
+ """
self._PyHocaGUI = _about._PyHocaGUI
self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
def prepare(self, context, title=None, text=None, icon=None, timeout=None):
+ """\
+ Prepare a notification that gets sent to C{libnotify} later (by the L{send()} method).
+
+ Use C{context} as a unique identifier. When sending the notification later, C{context}
+ will unequivocally map to the notification content that shall get sent.
+
+ @param context: a unique identifier for this notification preparation
+ @type context: C{str}
+ @param title: notification title
+ @type title: C{str}
+ @param text: notification text
+ @type text: C{str}
+ @param icon: icon name for an icon that appears with the notification
+ @type icon: C{str}
+ @param timeout: let notification disappear after C{<timeout>} milliseconds
+ @type timeout: C{int}
+
+ """
if title is not None:
self.title[context] = title
if text is not None:
@@ -121,6 +204,22 @@ class notificationmessage_NotifierPopup(object):
self.timeout[context] = timeout
def send(self, title=None, text=None, context=None, icon=None, timeout=8000):
+ """\
+ Send notifications directly (or use a prepared notification).
+
+ @param title: notification title
+ @type title: C{str}
+ @param text: notification text
+ @type text: C{str}
+ @param context: an identifier that refers to a prepared notification
+ @type context: C{str}
+ @param icon: icon name for an icon that appears with the notification
+ @type icon: C{str}
+ @param timeout: let notification disappear after C{<timeout>} milliseconds
+ @type timeout: C{int}
+
+ """
+ if context is not None:
if context is not None:
try:
title = self.title[context]
@@ -195,7 +294,15 @@ class notificationmessage_NotifierPopup(object):
except UnicodeDecodeError: self._pyhoca_logger('Unicode error occurred while rendering a log message...', loglevel=log.loglevel_WARN)
def Close(self):
+ """\
+ Provide a C{Close()} method which does nothing.
+
+ """
pass
def Destroy(self):
+ """\
+ Provide a C{Destroy()} method which does nothing.
+
+ """
pass
diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py
index 68e9c98..3bfc35a 100644
--- a/pyhoca/wxgui/printingprefs.py
+++ b/pyhoca/wxgui/printingprefs.py
@@ -39,12 +39,21 @@ _icons_location = basepath.icons_basepath
class PyHocaGUI_PrintingPreferences(wx.Dialog):
"""\
- STILL UNDOCUMENTED
+ The print preferences dialog box allowing the configuration and re-configuration
+ of the processing of incoming / client-side print jobs.
"""
def __init__(self, _PyHocaGUI, profile_name=None, session_name=None, mode='edit'):
"""\
- STILL UNDOCUMENTED
+ Printing preferences dialog box (constructor).
+
+ @param _PyHocaGUI: the master/parent object of the application
+ @type _PyHocaGUI: C{obj}
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+ @param session_name: the X2Go session name of the Window that we intend to modify the name of
+ @type session_name C{str}
+ @param sesion_name: is this instance launched on an incoming pring job? Or are wie in editor mode.
"""
self._PyHocaGUI = _PyHocaGUI
@@ -153,7 +162,10 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
def __set_properties(self):
+ """\
+ Set field properties (before layouting).
+ """
_textfield_height = self.PdfViewCmdBrowseButton.GetBestSize().GetHeight()-2
self.PrintActionLabel.SetMinSize((-1, 16))
self.PrintAction.SetMinSize((-1, _textfield_height+4))
@@ -165,7 +177,10 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
self.CancelButton.SetMinSize((-1, 30))
def __do_layout(self):
+ """\
+ Arrange the frame's widget layout.
+ """
sizer_1 = wx.BoxSizer(wx.VERTICAL)
sizer_1_1 = wx.GridBagSizer(hgap=2, vgap=5)
sizer_1_1.Add(self.PrintActionLabel, pos=(0,0), flag=wx.ALIGN_CENTER_VERTICAL|wx.RIGHT|wx.BOTTOM, border=7, )
@@ -213,7 +228,10 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
self.Show(True)
def __update_fields(self):
+ """\
+ Update field from running application.
+ """
print_action_name = self.client_printing.get_print_action(reload=True, reinit=True, return_name=True)
self.PdfViewCmd.SetValue(self.client_printing.get_property('pdfview_cmd'))
@@ -275,9 +293,17 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
}
def get_print_action(self):
+ """\
+ Retrieve the current print action.
+
+ """
return self.client_printing.get_print_action(reinit=True)
def get_print_action_properties(self):
+ """\
+ Retrieve action properties from all users.
+
+ """
return self._print_action_properties
def _onPrintActionChange(self):
@@ -371,7 +397,6 @@ class PyHocaGUI_PrintingPreferences(wx.Dialog):
self.PdfSaveToFolder.SetValue(_save_to_folder)
def __validate(self):
-
validateOk = True
return validateOk
diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py
index 9d45d2e..d0156f7 100644
--- a/pyhoca/wxgui/sessiontitle.py
+++ b/pyhoca/wxgui/sessiontitle.py
@@ -51,11 +51,21 @@ else:
class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
"""\
- STILL UNDOCUMENTED
+ Simple dialog box for selecting a session title string.
"""
def __init__(self, _PyHocaGUI, profile_name, session_name):
+ """\
+ Session title renaming dialog box (constructor).
+
+ @param _PyHocaGUI: the master/parent object of the application
+ @type _PyHocaGUI: C{obj}
+ @param profile_name: session profile name
+ @type profile_name: C{str}
+ @param session_name: the X2Go session name of the Window that we intend to modify the name of
+ @type session_name C{str}
+ """
self._PyHocaGUI = _PyHocaGUI
self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
self._pyhoca_logger('session title query box started', loglevel=x2go.loglevel_INFO, )
@@ -126,7 +136,10 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
def OnOk(self, evt):
"""\
- STILL UNDOCUMENTED
+ Continue here, if the user clicks the Ok button in the dialog box.
+
+ @param evt: event
+ @type evt: C{obj}
"""
title = self.titleTxt.GetValue()
@@ -138,11 +151,21 @@ class PyHocaGUI_DialogBoxSessionTitle(wx.Dialog):
self.Destroy()
def OnCancel(self, evt):
+ """\
+ Continue here, if the user clicks the Cancel button in the dialog box.
+ @param evt: event
+ @type evt: C{obj}
+
+ """
self.Close()
self.Destroy()
def Destroy(self):
+ """\
+ Do some PyHocaGUI specific cleanup if this window gets destroyed.
+
+ """
try:
self._PyHocaGUI._sub_windows.remove(self)
except ValueError:
diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py
index 86b659b..c7809d5 100644
--- a/pyhoca/wxgui/splash.py
+++ b/pyhoca/wxgui/splash.py
@@ -35,8 +35,18 @@ import os
import basepath
class PyHocaGUI_SplashScreen(wx.SplashScreen):
+ """\
+ L{PyHocaGUI} splash screen that gets shown an application startup.
+
+ """
def __init__(self, splash_image=None):
+ """
+ Splash screen (constructor).
+
+ @param splash_image: file name of a splash image file (currently, only PNGs are supported)
+ @type splash_image: C{str}
+ """
if splash_image and os.path.basename(splash_image) == splash_image:
splash_image = os.path.join(basepath.images_basepath, splash_image)
@@ -61,8 +71,11 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen):
self.Bind(wx.EVT_CLOSE, self.OnClose)
def OnClose(self, evt):
+ """\
+ Hide the splash screen.
+
+ """
# Make sure the default handler runs too so this window gets
# destroyed
evt.Skip()
self.Hide()
-
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index b1ca28c..7fbdd3b 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -56,16 +56,21 @@ _icons_location = basepath.icons_basepath
class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
"""\
- STILL UNDOCUMENTED
+ Class for the L{PyHocaGUI} taskbar icon.
"""
- def __init__(self, _about):
+ def __init__(self, about):
"""\
- STILL UNDOCUMENTED
+ Initialize the systray icon. The main application window is
+ the about window, so this one has to be passed in as mandatory
+ argument.
+
+ @param about: instance of the About wx.Frame
+ @type about: C{obj}
"""
wx.TaskBarIcon.__init__(self)
- self._PyHocaGUI = _about._PyHocaGUI
+ self._PyHocaGUI = about._PyHocaGUI
self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger
self._pyhoca_logger('start TaskBarIcon of type: %s' % (wx.PlatformInfo, ), loglevel=x2go.loglevel_INFO)
self.SetIconIdle()
@@ -73,6 +78,14 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
self.tooltip = ""
def SetIconConnecting(self, profile_name):
+ """\
+ When connecting show the default icon and some informational text on mouse hover events
+ that gives some information what remote X2Go server the client is connecting to.
+
+ @param profile_name: the name of the session profile the application currently is connecting to
+ @type profile_name: C{str}
+
+ """
if x2go.X2GOCLIENT_OS == 'Windows':
icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon
self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='x2go-logo-ubuntu')
@@ -83,6 +96,10 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name)
def SetIconIdle(self):
+ """\
+ When idle show the default icon and some default informational text on mouse hover events.
+
+ """
if x2go.X2GOCLIENT_OS == 'Windows':
icon_name = self._PyHocaGUI.tray_icon
self.icon = self.MakeIcon(icon_name=icon_name, fallback_name='x2go-logo-ubuntu')
@@ -94,7 +111,14 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
def CreateSessionManagerPopupMenu(self, evt):
"""\
- STILL UNDOCUMENTED
+ This method is called by the L{PyHocaGUI} base class when it needs to popup
+ the menu for the default EVT_LEFT_DOWN event.
+
+ @param evt: event
+ @type evt: C{obj}
+
+ @return: a wx-based popup menu object (containing the session and connection manager)
+ @rtype: C{obj}
"""
if self._PyHocaGUI.args.single_session_profile:
@@ -105,14 +129,25 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
def CreatePopupMenu(self):
"""\
- This method is called by the base class when it needs to popup
- the menu for the default EVT_RIGHT_DOWN event. Just create
- the menu how you want it and return it from this function,
- the base class takes care of the rest.
+ This method is called by the L{PyHocaGUI} base class when it needs to popup
+ the menu for the default EVT_RIGHT_DOWN event.
+
+ This method wraps around L{CreateProfileManagerPopupMenu()}.
+
+ @return: a wx-based popup menu object (containing the session profile manager, amongst others)
+ @rtype: C{obj}
+
"""
return self.CreateProfileManagerPopupMenu()
def CreateProfileManagerPopupMenu(self):
+ """\
+ Create the profile manager / client mangager popup menu (i.e. on right-click of the mouse).
+
+ @return: a wx-based popup menu object (containing the session profile manager, amongst others)
+ @rtype: C{obj}
+
+ """
self.menu_optionsmanager = self.PopupMenu(menus_taskbar.PyHocaGUI_Menu_TaskbarOptionsManager(self._PyHocaGUI, caller=self,))
return self.menu_optionsmanager
@@ -120,6 +155,12 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
"""\
The various platforms have different requirements for the
icon size...
+
+ @param icon_name: rel. file name of the icon image
+ @type icon_name: C{str}
+ @param fallback_name: a fallback icon file name in case C{icon_name} cannot be found
+ @type fallback_name: C{str}
+
"""
if "wxMSW" in wx.PlatformInfo:
icon_size = '16x16'
@@ -140,5 +181,9 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
return icon
def Close(self):
+ """\
+ Remove the applet icon from the system tray.
+
+ """
self.RemoveIcon()
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)).
1
0
The branch, master has been updated
via 1ff2562caacb61beab3fc47575b1a24b22f6283f (commit)
via 3603cde0e2f1255d4a3e3265017e2a3e7a11cb67 (commit)
via 7cd15688093c40d54e5d16f201b44213fdd57be6 (commit)
from b91f7d899a80c5c377e4ddfdfdf2c7b9904f2c54 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 7 +++++++
man/man1/pyhoca-cli.1 | 4 ++--
pyhoca/cli/__init__.py | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9e10400..1b4eb47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyhoca-cli (0.2.0.1-0~x2go1) unstable; urgency=low
+
+ * New upstream version (0.2.0.1):
+ - Fix minus sign / hyphen mismatch in man page.
+
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 08 Jun 2012 23:44:39 +0200
+
pyhoca-cli (0.2.0.0-0~x2go1) unstable; urgency=low
* New upstream version (0.2.0.0):
diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1
index 9590cbe..0407536 100644
--- a/man/man1/pyhoca-cli.1
+++ b/man/man1/pyhoca-cli.1
@@ -106,7 +106,7 @@ Username for the session (default: currently logged in user).
\*(T<\fB\-\-password\fR \fI<PASSWORD>\fR\*(T>
User password for this session. If a matching private SSH key is available this one will be preferred for
authentication. The cleartext password that has been specified at the command line will be masqueraded in
-the systems process list (Linux, MacOS). On Windows systems the usage of the --password option is forbidden.
+the systems process list (Linux, MacOS). On Windows systems the usage of the \-\-password option is forbidden.
.TP
\*(T<\fB\-p, \-\-remote-ssh-port\fR \fI<R_PORT>\fR\*(T>
Remote X2Go server's SSH port (default: 22).
@@ -135,7 +135,7 @@ Time to wait for session startup/resume (default: 8s). There should be no need t
\*(T<\fB\-\-auth-attempts\fR \fI{0,1,2,3,...}\fR\*(T>
Number of interactive authentication attempts in case authentication with the server fails (wrong password?). A value that equals 0
disables interactive authentication completely and requires that a private SSH key has been given on the command line or in the
-session profile or that the --password command line option is used.
+session profile or that the \-\-password command line option is used.
.SH LDAP OPTIONS
LDAP support is planned to be added into \fBpyhoca-cli\fR in the near future. So stay tuned...
.PP
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index ee5cac6..9f7fef9 100644
--- a/pyhoca/cli/__init__.py
+++ b/pyhoca/cli/__init__.py
@@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki:
http://wiki.x2go.org
"""
-__VERSION__ = "0.2.0.0"
+__VERSION__ = "0.2.0.1"
from frontend import *
hooks/post-receive
--
pyhoca-cli.git (Python X2Go Client (command line client))
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-cli.git" (Python X2Go Client (command line client)).
1
0
08 Jun '12
The branch, build-main has been updated
via 1ff2562caacb61beab3fc47575b1a24b22f6283f (commit)
from 3603cde0e2f1255d4a3e3265017e2a3e7a11cb67 (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 1ff2562caacb61beab3fc47575b1a24b22f6283f
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Fri Jun 8 23:45:12 2012 +0200
release 0.2.0.1
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 9fb6b05..1b4eb47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-pyhoca-cli (0.2.0.1-0~x2go1) UNRELEASED; urgency=low
+pyhoca-cli (0.2.0.1-0~x2go1) unstable; urgency=low
- * New upstream version (0.2.0.0):
+ * New upstream version (0.2.0.1):
- Fix minus sign / hyphen mismatch in man page.
- -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 08 Jun 2012 23:43:11 +0200
+ -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 08 Jun 2012 23:44:39 +0200
pyhoca-cli (0.2.0.0-0~x2go1) unstable; urgency=low
hooks/post-receive
--
pyhoca-cli.git (Python X2Go Client (command line client))
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-cli.git" (Python X2Go Client (command line client)).
1
0
08 Jun '12
The branch, build-main has been updated
via 3603cde0e2f1255d4a3e3265017e2a3e7a11cb67 (commit)
from 7cd15688093c40d54e5d16f201b44213fdd57be6 (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 3603cde0e2f1255d4a3e3265017e2a3e7a11cb67
Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>
Date: Fri Jun 8 23:44:27 2012 +0200
increment __init__.py version
-----------------------------------------------------------------------
Summary of changes:
pyhoca/cli/__init__.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py
index ee5cac6..9f7fef9 100644
--- a/pyhoca/cli/__init__.py
+++ b/pyhoca/cli/__init__.py
@@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki:
http://wiki.x2go.org
"""
-__VERSION__ = "0.2.0.0"
+__VERSION__ = "0.2.0.1"
from frontend import *
hooks/post-receive
--
pyhoca-cli.git (Python X2Go Client (command line client))
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-cli.git" (Python X2Go Client (command line client)).
1
0