[X2go-Commits] pyhoca-gui.git - build-main (branch) updated: 0.1.0.4-15-g117a0ea
X2go dev team
git-admin at x2go.org
Mon Jun 27 11:17:14 CEST 2011
The branch, build-main has been updated
via 117a0ea4289d97940943139d05cbec00ec028b4e (commit)
via c3da6f7f83b15faa8db294596f7457bc27baa63b (commit)
via 0fec0805d5b5454e1c6445f1c4d0f5b0e020dc93 (commit)
via 4d83c15b83a20c8ed9195ab43e28ddc096624694 (commit)
via 5f3ee229ba537bd12f6565cca17d5bf92e9e9af6 (commit)
via b5b50725156fd0e0a963365cd632715a09d911db (commit)
via d1c4d7df3ad670f1c96361018e49c822e9b3f883 (commit)
via 033a966df66de981678e0deda2f5c008c5d6f1d2 (commit)
via 8d7f832acbd802e81a3346c735172f5cb7870dc1 (commit)
via 84b16aa141df5594a6caf2f69d62a2f0adddaaff (commit)
via e04b5cc0461a318a3623dc1bc84381ee8ad3666f (commit)
via 4b911e852a469a1f717cf464da81f0209b439470 (commit)
via ed2e9bd9da856f86fc6d885a7d0c040c782941ee (commit)
from 147054631aed6cb3e72cc88e302cfba23a3d0f9c (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:
build/mo/de/LC_MESSAGES/pyhoca-gui.mo | Bin 16647 -> 17068 bytes
build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 15590 -> 15990 bytes
build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 15225 -> 15225 bytes
build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 15835 -> 16227 bytes
debian/changelog | 10 ++
debian/control | 2 +-
man/man1/pyhoca-gui.1 | 3 +
po/de.po | 173 +++++++++++++++++---------------
po/en.po | 177 ++++++++++++++++++---------------
po/es.po | 166 ++++++++++++++++---------------
po/nl.po | 173 +++++++++++++++++---------------
po/pyhoca-gui.pot | 166 ++++++++++++++++---------------
pyhoca-gui | 34 ++++---
pyhoca/wxgui/frontend.py | 9 ++
pyhoca/wxgui/logon.py | 49 +++++++--
pyhoca/wxgui/menus_taskbar.py | 4 +-
pyhoca/wxgui/messages.py | 22 +++-
17 files changed, 560 insertions(+), 428 deletions(-)
The diff of changes is:
diff --git a/build/mo/de/LC_MESSAGES/pyhoca-gui.mo b/build/mo/de/LC_MESSAGES/pyhoca-gui.mo
index 091f331..eb413ba 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 3e4d4b2..4224784 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 1fedec6..6320c8c 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/nl/LC_MESSAGES/pyhoca-gui.mo b/build/mo/nl/LC_MESSAGES/pyhoca-gui.mo
index 8f9162a..0e04bd7 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/debian/changelog b/debian/changelog
index ee8a033..40f671c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,16 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low
- bugfix release
- Fix for new color depth filter feature if the session is not registered
any more.
+ - Add --logon-window-position option that allows custom placing of the logon
+ window on your desktop.
+ - Add GUI notification message if a seconed instance of PyHoca-GUI is
+ started (PyHoca-GUI is already running...)
+ - Fix for permanently disabled session profile when Cancel button has been
+ hit in logon window.
+ - Make tab traversal work in logon window.
+ - Update i18n (en, de, nl).
+ * React to bug #627990, prefer man2html-base over man2html.
+
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 24 Jun 2011 16:39:24 +0200
diff --git a/debian/control b/debian/control
index e17abed..d2af9ba 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Build-Depends:
debhelper (>= 7),
- man2html,
+ man2html-base | man2html,
python,
python-setuptools,
python-support,
diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1
index 7027c80..edc783b 100644
--- a/man/man1/pyhoca-gui.1
+++ b/man/man1/pyhoca-gui.1
@@ -123,6 +123,9 @@ Grey-out the profile manager menu items and thus disable all profile management
.TP
\*(T<\fB\-\-display <hostname>:<screennumber>\fR\*(T>
Set the DISPLAY environment variable to <hostname>:<screennumber>.
+.TP
+\*(T<\fB\-\-logon\-window\-position <x-pos>x<y-pos>\fR\*(T>
+Give a custom position for the logon window, use negative values to position relative to right/bottom border.
.SH BACKEND OPTIONS
\fBpyhoca-gui\fR supports transparent use of different data backends. For configuration three backends are common:
FILE, GCONF (Linux only) and WINREG (Windows only). The default backend currently is the FILE backend
diff --git a/po/de.po b/po/de.po
index 9bc3999..5e602ff 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-24 01:35+0200\n"
-"PO-Revision-Date: 2011-06-24 01:30+0100\n"
+"POT-Creation-Date: 2011-06-27 11:14+0200\n"
+"PO-Revision-Date: 2011-06-27 11:14+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: de <m.gabriel at das-netzwerkteam.de>\n"
"Language: \n"
@@ -20,103 +20,103 @@ msgstr ""
"X-Poedit-Country: GERMANY\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../pyhoca/wxgui/logon.py:83
+#: ../pyhoca/wxgui/logon.py:80
#, python-format
msgid "%s (via %s)"
msgstr "%s (via %s)"
-#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97
+#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96
msgid "Username"
msgstr "Benutzername"
-#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99
+#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98
msgid "Password"
msgstr "Kennwort"
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:89
msgid "Authenticate"
msgstr "Anmelden"
-#: ../pyhoca/wxgui/logon.py:102
+#: ../pyhoca/wxgui/logon.py:101
msgid " Start SSH tunnel "
msgstr "SSH Tunnel aufbauen"
-#: ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:109
msgid "Session login"
msgstr "Sitzungslogin"
-#: ../pyhoca/wxgui/logon.py:109
+#: ../pyhoca/wxgui/logon.py:110
msgid "SSH proxy server login"
msgstr "Anmeldung an SSH Proxy"
-#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262
-#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131
msgid "Cancel"
msgstr "Abbrechen"
-#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284
-#: ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310
+#: ../pyhoca/wxgui/frontend.py:350
#, python-format
msgid "%s - connect failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350
msgid "User is not allowed to start X2go sessions!"
msgstr "Benutzer darf keine X2go Sitzungen starten!"
-#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
-#: ../pyhoca/wxgui/logon.py:258
+#: ../pyhoca/wxgui/logon.py:284
msgid "Authentication has been successful."
msgstr "Anmeldung war erfolgreich."
-#: ../pyhoca/wxgui/logon.py:280
+#: ../pyhoca/wxgui/logon.py:306
msgid "SSH tunnel started"
msgstr "SSH Tunnel gestartet"
-#: ../pyhoca/wxgui/logon.py:285
+#: ../pyhoca/wxgui/logon.py:311
msgid "Authentication failed!"
msgstr "Anmeldung fehlgeschlagen!"
-#: ../pyhoca/wxgui/logon.py:291
+#: ../pyhoca/wxgui/logon.py:317
#, python-format
msgid "%s - ssh proxy"
msgstr "%s - SSH Proxy"
-#: ../pyhoca/wxgui/logon.py:292
+#: ../pyhoca/wxgui/logon.py:318
msgid "Authentication to the SSH proxy server failed!"
msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen"
-#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314
-#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364
-#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392
-#: ../pyhoca/wxgui/frontend.py:399
+#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340
+#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373
+#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401
+#: ../pyhoca/wxgui/frontend.py:408
#, python-format
msgid "%s - connect error"
msgstr "%s - Verbindungsfehler"
-#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380
+#: ../pyhoca/wxgui/frontend.py:387
#, python-format
msgid "%s - host key error"
msgstr "%s - ungültiger Server-Schlüssel"
-#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371
+#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380
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:328
+#: ../pyhoca/wxgui/logon.py:354
#, python-format
msgid "%s - key error"
msgstr "%s - ungültiger Schlüssel"
-#: ../pyhoca/wxgui/logon.py:334
+#: ../pyhoca/wxgui/logon.py:360
msgid "An unknown error occured during authentication!"
msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!"
@@ -607,7 +607,7 @@ msgid "Resume Session"
msgstr "Sitzung fortsetzen"
#: ../pyhoca/wxgui/menus_taskbar.py:161
-msgid "Resume Session (disabled)"
+msgid "Resume Session (not possible)"
msgstr "Sitzung fortsetzen (nicht möglich)"
#: ../pyhoca/wxgui/menus_taskbar.py:169
@@ -615,7 +615,7 @@ msgid "Transfer Session"
msgstr "Sitzung übernehmen"
#: ../pyhoca/wxgui/menus_taskbar.py:171
-msgid "Transfer Session (disabled)"
+msgid "Transfer Session (not possible)"
msgstr "Sitzung übernehmen (nicht möglich)"
#: ../pyhoca/wxgui/menus_taskbar.py:174
@@ -675,69 +675,69 @@ msgstr "Serververbindung aufbauen"
msgid "About %s ..."
msgstr "Über %s ..."
-#: ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/frontend.py:357
msgid "Public SSH key authentication has been successful."
msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich."
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/frontend.py:387
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:399
+#: ../pyhoca/wxgui/frontend.py:408
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal "
"versuchen..."
-#: ../pyhoca/wxgui/frontend.py:406
+#: ../pyhoca/wxgui/frontend.py:415
#, python-format
msgid "%s - auth key error"
msgstr "%s - ungültiger Benutzerschlüssel"
-#: ../pyhoca/wxgui/frontend.py:413
+#: ../pyhoca/wxgui/frontend.py:422
msgid "An unknown error occurred during authentication!"
msgstr "Ein unbekannter Fehler ist während der Serveranmeldung aufgetreten!"
-#: ../pyhoca/wxgui/frontend.py:515
+#: ../pyhoca/wxgui/frontend.py:524
msgid "Cleaning X2go sessions..."
msgstr "Beende X2go Sitzungen..."
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
#, python-format
msgid "%s - disconnect"
msgstr "%s - trennen"
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
msgid "X2go Profile is now disconnected."
msgstr "X2go Profil ist nun nicht mehr verbunden."
-#: ../pyhoca/wxgui/frontend.py:550
+#: ../pyhoca/wxgui/frontend.py:559
msgid "New Session Profile"
msgstr "Neues Sitzungsprofil"
-#: ../pyhoca/wxgui/frontend.py:577
+#: ../pyhoca/wxgui/frontend.py:586
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Das Sitzungsprofil ,,%s'' wirklich löschen?"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profil gelöscht"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
msgid "The session profile has been deleted."
msgstr "Das Sitzungsprofil wurde gelöscht."
-#: ../pyhoca/wxgui/frontend.py:598
+#: ../pyhoca/wxgui/frontend.py:607
#, 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:650
+#: ../pyhoca/wxgui/frontend.py:659
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -750,17 +750,17 @@ msgstr ""
"\n"
"Sind Sie sicher, dass sie fortfahren möchten? "
-#: ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/frontend.py:667
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Echtheit des Servers bestätigen"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindungsfehler"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -769,12 +769,12 @@ msgstr ""
"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen "
"Sie, sich neu am Server anzumelden..."
-#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid "%s - session failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/frontend.py:687
+#: ../pyhoca/wxgui/frontend.py:696
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
@@ -783,12 +783,12 @@ msgstr ""
"Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid "%s - session warning"
msgstr "%s - Sitzungsfunktion eingeschränkt"
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -797,7 +797,7 @@ msgstr ""
"Eine Reverse TCP Port Weiterleitungsanfrage für Sitzung %s an Serverport %s "
"wurde vom X2go Server abgelehnt."
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -806,37 +806,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:711
+#: ../pyhoca/wxgui/frontend.py:720
#, python-format
msgid "%s - audio warning"
msgstr "%s - Warnung Audiosystem"
-#: ../pyhoca/wxgui/frontend.py:711
+#: ../pyhoca/wxgui/frontend.py:720
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:714 ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726
#, python-format
msgid "%s - audio error"
msgstr "%s - Audiofehler"
-#: ../pyhoca/wxgui/frontend.py:714
+#: ../pyhoca/wxgui/frontend.py:723
msgid "The X2go PulseAudio system could not be started."
msgstr "Das X2go PulseAudio System konnte nicht gestartet werden."
-#: ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:726
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr "Das X2go PulseAudio System ist soeben abgestürzt."
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid "%s - audio problem"
msgstr "%s - Audioproblem"
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -845,12 +845,12 @@ msgstr ""
"Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid "%s - print error"
msgstr "%s - Druckfehler"
-#: ../pyhoca/wxgui/frontend.py:734
+#: ../pyhoca/wxgui/frontend.py:743
#, python-format
msgid ""
"%s\n"
@@ -861,7 +861,7 @@ msgstr ""
"...verursacht an Drucker durch Sitzung\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid ""
"%s\n"
@@ -872,12 +872,12 @@ msgstr ""
"...verursacht von Sitzung\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid "%s - start"
msgstr "%s - starten"
-#: ../pyhoca/wxgui/frontend.py:740
+#: ../pyhoca/wxgui/frontend.py:749
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -886,7 +886,7 @@ msgstr ""
"Neue X2go Sitzung wird gestartet...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -895,12 +895,12 @@ msgstr ""
"Ein anderes X2go Programm hat diese Sitzung gestartet\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid "%s - resume"
msgstr "%s - fortsetzen"
-#: ../pyhoca/wxgui/frontend.py:748
+#: ../pyhoca/wxgui/frontend.py:757
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -909,7 +909,7 @@ msgstr ""
"X2go Sitzung wird fortgesetzt...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -918,12 +918,12 @@ msgstr ""
"Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid ""
"Found already running session\n"
@@ -932,12 +932,12 @@ msgstr ""
"Bereits aktive Sitzung gefunden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid "%s - suspend"
msgstr "%s - anhalten"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -946,12 +946,12 @@ msgstr ""
"X2go Sitzung wurde angehalten\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid "%s - terminate"
msgstr "%s - beenden"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -960,7 +960,7 @@ msgstr ""
"X2go Sitzung wurde beendet\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:51
+#: ../pyhoca/wxgui/messages.py:53
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -970,15 +970,30 @@ msgstr ""
"das Sitzungsprofil ,,%s''\n"
"wirklich löschen möchten?"
-#: ../pyhoca/wxgui/messages.py:81
+#: ../pyhoca/wxgui/messages.py:54
+#, python-format
+msgid ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+msgstr ""
+"PyHoca-GUI is bereits gestartet für Benutzer/in ,,%s''!\n"
+"\n"
+"Nur eine Instanz von PyHoca-GUI kann pro Benutzer/in\n"
+"gestartet werden. Das PyHoca-GUI Icon befindet sich auf\n"
+"Ihrem Desktop in der Benachrichtigungsleiste."
+
+#: ../pyhoca/wxgui/messages.py:87
msgid "Yes"
msgstr "Ja"
-#: ../pyhoca/wxgui/messages.py:82
+#: ../pyhoca/wxgui/messages.py:88
msgid "No"
msgstr "Nein"
-#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126
+#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126
msgid "Ok"
msgstr "OK"
diff --git a/po/en.po b/po/en.po
index 2c2642d..84931d9 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-24 01:35+0200\n"
-"PO-Revision-Date: 2011-06-24 01:29+0100\n"
+"POT-Creation-Date: 2011-06-27 11:14+0200\n"
+"PO-Revision-Date: 2011-06-27 11:13+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: en <m.gabriel at das-netzwerkteam.de>\n"
"Language: \n"
@@ -20,102 +20,102 @@ msgstr ""
"X-Poedit-Country: UNITED STATES\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../pyhoca/wxgui/logon.py:83
+#: ../pyhoca/wxgui/logon.py:80
#, python-format
msgid "%s (via %s)"
msgstr "%s (via %s)"
-#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97
+#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96
msgid "Username"
msgstr "Username"
-#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99
+#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98
msgid "Password"
msgstr "Password"
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:89
msgid "Authenticate"
msgstr "Authenticate"
-#: ../pyhoca/wxgui/logon.py:102
+#: ../pyhoca/wxgui/logon.py:101
msgid " Start SSH tunnel "
msgstr " Start SSH tunnel "
-#: ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:109
msgid "Session login"
msgstr "Session login"
-#: ../pyhoca/wxgui/logon.py:109
+#: ../pyhoca/wxgui/logon.py:110
msgid "SSH proxy server login"
msgstr "SSH proxy server login"
-#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262
-#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131
msgid "Cancel"
msgstr "Cancel"
-#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284
-#: ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310
+#: ../pyhoca/wxgui/frontend.py:350
#, python-format
msgid "%s - connect failure"
msgstr "%s - connect failure"
-#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350
msgid "User is not allowed to start X2go sessions!"
msgstr "User is not allowed to start X2go sessions!"
-#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357
#, python-format
msgid "%s - connect"
msgstr "%s - connect"
-#: ../pyhoca/wxgui/logon.py:258
+#: ../pyhoca/wxgui/logon.py:284
msgid "Authentication has been successful."
msgstr "Authentication has been successful."
-#: ../pyhoca/wxgui/logon.py:280
+#: ../pyhoca/wxgui/logon.py:306
msgid "SSH tunnel started"
msgstr "SSH tunnel started"
-#: ../pyhoca/wxgui/logon.py:285
+#: ../pyhoca/wxgui/logon.py:311
msgid "Authentication failed!"
msgstr "Authentication failed!"
-#: ../pyhoca/wxgui/logon.py:291
+#: ../pyhoca/wxgui/logon.py:317
#, python-format
msgid "%s - ssh proxy"
msgstr "%s - ssh proxy"
-#: ../pyhoca/wxgui/logon.py:292
+#: ../pyhoca/wxgui/logon.py:318
msgid "Authentication to the SSH proxy server failed!"
msgstr "Authentication to the SSH proxy server failed!"
-#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314
-#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364
-#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392
-#: ../pyhoca/wxgui/frontend.py:399
+#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340
+#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373
+#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401
+#: ../pyhoca/wxgui/frontend.py:408
#, python-format
msgid "%s - connect error"
msgstr "%s - connect error"
-#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380
+#: ../pyhoca/wxgui/frontend.py:387
#, python-format
msgid "%s - host key error"
msgstr "%s - host key error"
-#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371
+#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380
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:328
+#: ../pyhoca/wxgui/logon.py:354
#, python-format
msgid "%s - key error"
msgstr "%s - key error"
-#: ../pyhoca/wxgui/logon.py:334
+#: ../pyhoca/wxgui/logon.py:360
msgid "An unknown error occured during authentication!"
msgstr "An unknown error occured during authentication!"
@@ -607,16 +607,16 @@ msgid "Resume Session"
msgstr "Resume Session"
#: ../pyhoca/wxgui/menus_taskbar.py:161
-msgid "Resume Session (disabled)"
-msgstr "Resume Session (disabled)"
+msgid "Resume Session (not possible)"
+msgstr "Resume Session (not possible)"
#: ../pyhoca/wxgui/menus_taskbar.py:169
msgid "Transfer Session"
msgstr "Transfer Session"
#: ../pyhoca/wxgui/menus_taskbar.py:171
-msgid "Transfer Session (disabled)"
-msgstr "Transfer Session (disabled)"
+msgid "Transfer Session (not possible)"
+msgstr "Transfer Session (not possible)"
#: ../pyhoca/wxgui/menus_taskbar.py:174
msgid "Suspend Session"
@@ -675,66 +675,66 @@ msgstr "Connect Server"
msgid "About %s ..."
msgstr "About %s ..."
-#: ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/frontend.py:357
msgid "Public SSH key authentication has been successful."
msgstr "Public SSH key authentication has been successful."
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/frontend.py:387
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:399
+#: ../pyhoca/wxgui/frontend.py:408
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authentication protocol communication incomplete! Try again..."
-#: ../pyhoca/wxgui/frontend.py:406
+#: ../pyhoca/wxgui/frontend.py:415
#, python-format
msgid "%s - auth key error"
msgstr "%s - auth key error"
-#: ../pyhoca/wxgui/frontend.py:413
+#: ../pyhoca/wxgui/frontend.py:422
msgid "An unknown error occurred during authentication!"
msgstr "An unknown error occurred during authentication!"
-#: ../pyhoca/wxgui/frontend.py:515
+#: ../pyhoca/wxgui/frontend.py:524
msgid "Cleaning X2go sessions..."
msgstr "Cleaning X2go sessions..."
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
#, python-format
msgid "%s - disconnect"
msgstr "%s - disconnect"
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
msgid "X2go Profile is now disconnected."
msgstr "X2go Profile is now disconnected."
-#: ../pyhoca/wxgui/frontend.py:550
+#: ../pyhoca/wxgui/frontend.py:559
msgid "New Session Profile"
msgstr "New Session Profile"
-#: ../pyhoca/wxgui/frontend.py:577
+#: ../pyhoca/wxgui/frontend.py:586
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Really Delete Session Profile ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profile deleted"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
msgid "The session profile has been deleted."
msgstr "The session profile has been deleted."
-#: ../pyhoca/wxgui/frontend.py:598
+#: ../pyhoca/wxgui/frontend.py:607
#, 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:650
+#: ../pyhoca/wxgui/frontend.py:659
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -747,17 +747,17 @@ msgstr ""
"\n"
"Are you sure you want to continue connecting?"
-#: ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/frontend.py:667
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Confirm Host Authorization"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid "%s - channel error"
msgstr "%s - channel error"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -766,12 +766,12 @@ msgstr ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
-#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid "%s - session failure"
msgstr "%s - session failure"
-#: ../pyhoca/wxgui/frontend.py:687
+#: ../pyhoca/wxgui/frontend.py:696
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
@@ -780,12 +780,12 @@ msgstr ""
"The command ,,%s'' is not available on X2go server\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid "%s - session warning"
msgstr "%s - session warning"
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -794,7 +794,7 @@ msgstr ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -803,36 +803,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:711
+#: ../pyhoca/wxgui/frontend.py:720
#, python-format
msgid "%s - audio warning"
msgstr "%s - audio warning"
-#: ../pyhoca/wxgui/frontend.py:711
+#: ../pyhoca/wxgui/frontend.py:720
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:714 ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726
#, python-format
msgid "%s - audio error"
msgstr "%s - audio error"
-#: ../pyhoca/wxgui/frontend.py:714
+#: ../pyhoca/wxgui/frontend.py:723
msgid "The X2go PulseAudio system could not be started."
msgstr "The X2go PulseAudio system could not be started."
-#: ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:726
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr "The X2go PulseAudio system has died unexpectedly."
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid "%s - audio problem"
msgstr "%s - audio problem"
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -841,12 +841,12 @@ msgstr ""
"The audio connection could not be set up for this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid "%s - print error"
msgstr "%s - print error"
-#: ../pyhoca/wxgui/frontend.py:734
+#: ../pyhoca/wxgui/frontend.py:743
#, python-format
msgid ""
"%s\n"
@@ -857,7 +857,7 @@ msgstr ""
"...caused on printer %s by session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid ""
"%s\n"
@@ -868,12 +868,12 @@ msgstr ""
"...caused by session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid "%s - start"
msgstr "%s - start"
-#: ../pyhoca/wxgui/frontend.py:740
+#: ../pyhoca/wxgui/frontend.py:749
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -882,7 +882,7 @@ msgstr ""
"New X2go session starting up...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -891,12 +891,12 @@ msgstr ""
"Another client started X2go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid "%s - resume"
msgstr "%s - resume"
-#: ../pyhoca/wxgui/frontend.py:748
+#: ../pyhoca/wxgui/frontend.py:757
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -905,7 +905,7 @@ msgstr ""
"Resuming X2go session...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -914,12 +914,12 @@ msgstr ""
"Another client resumed X2go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid "%s - running"
msgstr "%s - running"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid ""
"Found already running session\n"
@@ -928,12 +928,12 @@ msgstr ""
"Found already running session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -942,12 +942,12 @@ msgstr ""
"X2go Session has been suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid "%s - terminate"
msgstr "%s - terminate"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -956,7 +956,7 @@ msgstr ""
"X2go Session has terminated\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:51
+#: ../pyhoca/wxgui/messages.py:53
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -965,15 +965,30 @@ msgstr ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
-#: ../pyhoca/wxgui/messages.py:81
+#: ../pyhoca/wxgui/messages.py:54
+#, python-format
+msgid ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+msgstr ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+
+#: ../pyhoca/wxgui/messages.py:87
msgid "Yes"
msgstr "Yes"
-#: ../pyhoca/wxgui/messages.py:82
+#: ../pyhoca/wxgui/messages.py:88
msgid "No"
msgstr "No"
-#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126
+#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126
msgid "Ok"
msgstr "Ok"
diff --git a/po/es.po b/po/es.po
index 4918041..e21d1b4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-24 01:35+0200\n"
+"POT-Creation-Date: 2011-06-27 11:14+0200\n"
"PO-Revision-Date: 2011-06-23 15:48+0100\n"
"Last-Translator: Mike Gabriel <m.gabriel at das-netzwerkteam.de>\n"
"Language-Team: es <oceanosoftlapalma at gmail.com>\n"
@@ -20,103 +20,103 @@ msgstr ""
"X-Poedit-Country: SPAIN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../pyhoca/wxgui/logon.py:83
+#: ../pyhoca/wxgui/logon.py:80
#, python-format
msgid "%s (via %s)"
msgstr "%s (vía %s)"
-#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97
+#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96
msgid "Username"
msgstr "Nombre de usuario"
-#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99
+#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98
msgid "Password"
msgstr "Contraseña"
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:89
msgid "Authenticate"
msgstr "Autenticar"
-#: ../pyhoca/wxgui/logon.py:102
+#: ../pyhoca/wxgui/logon.py:101
msgid " Start SSH tunnel "
msgstr " Iniciar tunel SSH "
-#: ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:109
msgid "Session login"
msgstr "Inicio de sesión"
-#: ../pyhoca/wxgui/logon.py:109
+#: ../pyhoca/wxgui/logon.py:110
msgid "SSH proxy server login"
msgstr "Inicio de sesión en el servidor proxy SSH"
-#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262
-#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131
msgid "Cancel"
msgstr "Cancelar"
-#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284
-#: ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310
+#: ../pyhoca/wxgui/frontend.py:350
#, python-format
msgid "%s - connect failure"
msgstr "%s - fallo en la conexión"
-#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350
msgid "User is not allowed to start X2go sessions!"
msgstr "¡El usuario no tiene permisos para iniciar sesiones X2go!"
-#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357
#, python-format
msgid "%s - connect"
msgstr "%s - conectado"
-#: ../pyhoca/wxgui/logon.py:258
+#: ../pyhoca/wxgui/logon.py:284
msgid "Authentication has been successful."
msgstr "Inicio de sesión correcto."
-#: ../pyhoca/wxgui/logon.py:280
+#: ../pyhoca/wxgui/logon.py:306
msgid "SSH tunnel started"
msgstr "Iniciado tunel SSH"
-#: ../pyhoca/wxgui/logon.py:285
+#: ../pyhoca/wxgui/logon.py:311
msgid "Authentication failed!"
msgstr "Error en el nombre de usuario o contraseña!"
-#: ../pyhoca/wxgui/logon.py:291
+#: ../pyhoca/wxgui/logon.py:317
#, python-format
msgid "%s - ssh proxy"
msgstr "%s - proxy ssh"
-#: ../pyhoca/wxgui/logon.py:292
+#: ../pyhoca/wxgui/logon.py:318
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:307 ../pyhoca/wxgui/logon.py:314
-#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364
-#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392
-#: ../pyhoca/wxgui/frontend.py:399
+#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340
+#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373
+#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401
+#: ../pyhoca/wxgui/frontend.py:408
#, python-format
msgid "%s - connect error"
msgstr "%s - error en la conexión"
-#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380
+#: ../pyhoca/wxgui/frontend.py:387
#, python-format
msgid "%s - host key error"
msgstr "%s - error en la clave del equipo"
-#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371
+#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380
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:328
+#: ../pyhoca/wxgui/logon.py:354
#, python-format
msgid "%s - key error"
msgstr "%s - error en la clave"
-#: ../pyhoca/wxgui/logon.py:334
+#: ../pyhoca/wxgui/logon.py:360
msgid "An unknown error occured during authentication!"
msgstr ""
"¡Error desconocido al tratar de validar el nombre de usuario y la contraseña!"
@@ -612,7 +612,7 @@ msgstr "Retomar Sesión"
#: ../pyhoca/wxgui/menus_taskbar.py:161
#, fuzzy
-msgid "Resume Session (disabled)"
+msgid "Resume Session (not possible)"
msgstr "Retomar Sesión"
#: ../pyhoca/wxgui/menus_taskbar.py:169
@@ -621,7 +621,7 @@ msgstr "Transferir Sesión"
#: ../pyhoca/wxgui/menus_taskbar.py:171
#, fuzzy
-msgid "Transfer Session (disabled)"
+msgid "Transfer Session (not possible)"
msgstr "Transferir Sesión"
#: ../pyhoca/wxgui/menus_taskbar.py:174
@@ -681,70 +681,70 @@ msgstr "Conectar con el Servidor"
msgid "About %s ..."
msgstr "Acerca de %s ..."
-#: ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/frontend.py:357
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:378
+#: ../pyhoca/wxgui/frontend.py:387
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:399
+#: ../pyhoca/wxgui/frontend.py:408
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:406
+#: ../pyhoca/wxgui/frontend.py:415
#, python-format
msgid "%s - auth key error"
msgstr "%s - error en la clave de identificación"
-#: ../pyhoca/wxgui/frontend.py:413
+#: ../pyhoca/wxgui/frontend.py:422
#, fuzzy
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:515
+#: ../pyhoca/wxgui/frontend.py:524
msgid "Cleaning X2go sessions..."
msgstr "Limpiando sesiones X2go..."
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
#, python-format
msgid "%s - disconnect"
msgstr "%s - desconectado"
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
msgid "X2go Profile is now disconnected."
msgstr "Se ha desconectado el Perfil X2go."
-#: ../pyhoca/wxgui/frontend.py:550
+#: ../pyhoca/wxgui/frontend.py:559
msgid "New Session Profile"
msgstr "Nuevo Perfil de Sesión"
-#: ../pyhoca/wxgui/frontend.py:577
+#: ../pyhoca/wxgui/frontend.py:586
#, fuzzy, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Nuevo Perfil de Sesión"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
#, python-format
msgid "%s - profile deleted"
msgstr "%s - perfil eliminado"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
msgid "The session profile has been deleted."
msgstr "Se ha eliminado el perfil de sesión."
-#: ../pyhoca/wxgui/frontend.py:598
+#: ../pyhoca/wxgui/frontend.py:607
#, 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:650
+#: ../pyhoca/wxgui/frontend.py:659
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -757,17 +757,17 @@ msgstr ""
"\n"
"¿Continuar con la conexión?"
-#: ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/frontend.py:667
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Se confirma la autorización del equipo"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid "%s - channel error"
msgstr "%s - error en el canal"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -776,12 +776,12 @@ msgstr ""
"¡La conexión con el servidor %s ha finalizado inesperadamente! Intenta "
"iniciar sesión nuevamente..."
-#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid "%s - session failure"
msgstr "%s - fallo en la sesión"
-#: ../pyhoca/wxgui/frontend.py:687
+#: ../pyhoca/wxgui/frontend.py:696
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
@@ -790,12 +790,12 @@ msgstr ""
"El comando ,,%s'' no está presente en el servidor X2go\n"
"%s."
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid "%s - session warning"
msgstr "%s - advertencia durante la sesión"
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -804,7 +804,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:699
+#: ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -813,37 +813,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:711
+#: ../pyhoca/wxgui/frontend.py:720
#, python-format
msgid "%s - audio warning"
msgstr "%s - advertencia en el sistema de audio"
-#: ../pyhoca/wxgui/frontend.py:711
+#: ../pyhoca/wxgui/frontend.py:720
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:714 ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726
#, python-format
msgid "%s - audio error"
msgstr "%s - error en el audio"
-#: ../pyhoca/wxgui/frontend.py:714
+#: ../pyhoca/wxgui/frontend.py:723
msgid "The X2go PulseAudio system could not be started."
msgstr "El sistema X2go PulseAudio no puede iniciarse"
-#: ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:726
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr "El sistema X2go PulseAudio ha finalizado inesperadamente"
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid "%s - audio problem"
msgstr "%s - problema en el audio"
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -852,12 +852,12 @@ msgstr ""
"La conexión de audio puede que no esté configurada para esta sesión.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid "%s - print error"
msgstr "%s - error de impresión"
-#: ../pyhoca/wxgui/frontend.py:734
+#: ../pyhoca/wxgui/frontend.py:743
#, python-format
msgid ""
"%s\n"
@@ -868,7 +868,7 @@ msgstr ""
"...provocado en la impresora %s por la sesión\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid ""
"%s\n"
@@ -879,12 +879,12 @@ msgstr ""
"...provocado por la sesión\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid "%s - start"
msgstr "%s - inicio"
-#: ../pyhoca/wxgui/frontend.py:740
+#: ../pyhoca/wxgui/frontend.py:749
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -893,7 +893,7 @@ msgstr ""
"Iniciando nueva sesión X2go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -902,12 +902,12 @@ msgstr ""
"Otro cliente ha iniciado sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid "%s - resume"
msgstr "%s - retornar a la sesión"
-#: ../pyhoca/wxgui/frontend.py:748
+#: ../pyhoca/wxgui/frontend.py:757
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -916,7 +916,7 @@ msgstr ""
"Retornando sesión X2go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -925,12 +925,12 @@ msgstr ""
"Otro cliente retornó a la sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid "%s - running"
msgstr "%s - en ejecución"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid ""
"Found already running session\n"
@@ -939,12 +939,12 @@ msgstr ""
"La sesión ya está en ejecución\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid "%s - suspend"
msgstr "%s - suspender"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -953,12 +953,12 @@ msgstr ""
"Se ha suspendido la Sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid "%s - terminate"
msgstr "%s - finalizar"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -967,22 +967,32 @@ msgstr ""
"Se ha finalizado la sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:51
+#: ../pyhoca/wxgui/messages.py:53
#, python-format
msgid ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:81
+#: ../pyhoca/wxgui/messages.py:54
+#, python-format
+msgid ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+msgstr ""
+
+#: ../pyhoca/wxgui/messages.py:87
msgid "Yes"
msgstr "Sí"
-#: ../pyhoca/wxgui/messages.py:82
+#: ../pyhoca/wxgui/messages.py:88
msgid "No"
msgstr "No"
-#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126
+#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126
msgid "Ok"
msgstr "Ok"
diff --git a/po/nl.po b/po/nl.po
index c1eb21c..602a03f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-24 01:35+0200\n"
-"PO-Revision-Date: 2011-06-24 01:34+0100\n"
+"POT-Creation-Date: 2011-06-27 11:14+0200\n"
+"PO-Revision-Date: 2011-06-27 11:14+0100\n"
"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: nl <dick.kniep at lindix.nl>\n"
"Language: \n"
@@ -20,103 +20,103 @@ msgstr ""
"X-Poedit-Country: NETHERLANDS\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../pyhoca/wxgui/logon.py:83
+#: ../pyhoca/wxgui/logon.py:80
#, python-format
msgid "%s (via %s)"
msgstr "%s (via %s)"
-#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97
+#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96
msgid "Username"
msgstr "Gebruiker"
-#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99
+#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98
msgid "Password"
msgstr "Wachtwoord"
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:89
msgid "Authenticate"
msgstr "Aanmelden"
-#: ../pyhoca/wxgui/logon.py:102
+#: ../pyhoca/wxgui/logon.py:101
msgid " Start SSH tunnel "
msgstr " Start SSH Tunnel "
-#: ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:109
msgid "Session login"
msgstr "Sessie login"
-#: ../pyhoca/wxgui/logon.py:109
+#: ../pyhoca/wxgui/logon.py:110
msgid "SSH proxy server login"
msgstr "Login via SSH Proxy"
-#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262
-#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131
msgid "Cancel"
msgstr "Afbreken"
-#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284
-#: ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310
+#: ../pyhoca/wxgui/frontend.py:350
#, python-format
msgid "%s - connect failure"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350
msgid "User is not allowed to start X2go sessions!"
msgstr "Gebruiker mag geen X2go sessie starten!"
-#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
-#: ../pyhoca/wxgui/logon.py:258
+#: ../pyhoca/wxgui/logon.py:284
msgid "Authentication has been successful."
msgstr "Authenticatie is gelukt."
-#: ../pyhoca/wxgui/logon.py:280
+#: ../pyhoca/wxgui/logon.py:306
msgid "SSH tunnel started"
msgstr "SSH Tunnel gestart"
-#: ../pyhoca/wxgui/logon.py:285
+#: ../pyhoca/wxgui/logon.py:311
msgid "Authentication failed!"
msgstr "Authenticatie mislukt!"
-#: ../pyhoca/wxgui/logon.py:291
+#: ../pyhoca/wxgui/logon.py:317
#, python-format
msgid "%s - ssh proxy"
msgstr "%s - SSH Proxy"
-#: ../pyhoca/wxgui/logon.py:292
+#: ../pyhoca/wxgui/logon.py:318
msgid "Authentication to the SSH proxy server failed!"
msgstr "Authenticatie via SSH Proxy Server mislukt!"
-#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314
-#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364
-#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392
-#: ../pyhoca/wxgui/frontend.py:399
+#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340
+#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373
+#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401
+#: ../pyhoca/wxgui/frontend.py:408
#, python-format
msgid "%s - connect error"
msgstr "%s - Verbindingsfout"
-#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380
+#: ../pyhoca/wxgui/frontend.py:387
#, python-format
msgid "%s - host key error"
msgstr "%s - server sleutel fout"
-#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371
+#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380
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:328
+#: ../pyhoca/wxgui/logon.py:354
#, python-format
msgid "%s - key error"
msgstr "%s - sleutel fout"
-#: ../pyhoca/wxgui/logon.py:334
+#: ../pyhoca/wxgui/logon.py:360
msgid "An unknown error occured during authentication!"
msgstr "Een onbekende fout is bij de authenticatie opgetreden"
@@ -606,7 +606,7 @@ msgid "Resume Session"
msgstr "Sessie hervatten"
#: ../pyhoca/wxgui/menus_taskbar.py:161
-msgid "Resume Session (disabled)"
+msgid "Resume Session (not possible)"
msgstr "Sessie hervatten (niet mogelijk)"
#: ../pyhoca/wxgui/menus_taskbar.py:169
@@ -614,7 +614,7 @@ msgid "Transfer Session"
msgstr "Sessie overnemen"
#: ../pyhoca/wxgui/menus_taskbar.py:171
-msgid "Transfer Session (disabled)"
+msgid "Transfer Session (not possible)"
msgstr "Sessie overnemen (niet mogelijk)"
#: ../pyhoca/wxgui/menus_taskbar.py:174
@@ -674,67 +674,67 @@ msgstr "Verbinden met Server"
msgid "About %s ..."
msgstr "About %s ..."
-#: ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/frontend.py:357
msgid "Public SSH key authentication has been successful."
msgstr "Public SSH-key authenticatie is gelukt."
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/frontend.py:387
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:399
+#: ../pyhoca/wxgui/frontend.py:408
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authenticatie was niet volledig! Opnieuw proberen..."
-#: ../pyhoca/wxgui/frontend.py:406
+#: ../pyhoca/wxgui/frontend.py:415
#, python-format
msgid "%s - auth key error"
msgstr "%s - Verbindingsfout met auth. key"
-#: ../pyhoca/wxgui/frontend.py:413
+#: ../pyhoca/wxgui/frontend.py:422
msgid "An unknown error occurred during authentication!"
msgstr "Een onbekende fout is bij de authenticatie opgetreden"
-#: ../pyhoca/wxgui/frontend.py:515
+#: ../pyhoca/wxgui/frontend.py:524
msgid "Cleaning X2go sessions..."
msgstr "Opschonen X2go sessies..."
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
#, python-format
msgid "%s - disconnect"
msgstr "%s - verbinding verbreken"
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
msgid "X2go Profile is now disconnected."
msgstr "X2go Profiel is nu niet meer verbonden."
-#: ../pyhoca/wxgui/frontend.py:550
+#: ../pyhoca/wxgui/frontend.py:559
msgid "New Session Profile"
msgstr "Nieuw Profiel"
-#: ../pyhoca/wxgui/frontend.py:577
+#: ../pyhoca/wxgui/frontend.py:586
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr "Verwijder sessie profiel ,,%s''?"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profiel is verwijderd!"
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
msgid "The session profile has been deleted."
msgstr "Het sessie profiel is verwijderd."
-#: ../pyhoca/wxgui/frontend.py:598
+#: ../pyhoca/wxgui/frontend.py:607
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - deel lokale map met dit Profiel"
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:659
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -747,17 +747,17 @@ msgstr ""
"\n"
"Weet u zeker dat u de verbinding wilt maken?"
-#: ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/frontend.py:667
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr "%s: Bevestig dat de Host geautoriseerd is"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindingsfout (channel error)"
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -766,12 +766,12 @@ msgstr ""
"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u "
"opnieuw aan te melden..."
-#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid "%s - session failure"
msgstr "%s - sessie fout"
-#: ../pyhoca/wxgui/frontend.py:687
+#: ../pyhoca/wxgui/frontend.py:696
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
@@ -780,12 +780,12 @@ msgstr ""
"Het commando ,,%s'' is niet beschikbaar op de X2go server\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid "%s - session warning"
msgstr "%s - sessie waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -794,7 +794,7 @@ msgstr ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -803,36 +803,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:711
+#: ../pyhoca/wxgui/frontend.py:720
#, python-format
msgid "%s - audio warning"
msgstr "%s - audio waarschuwing"
-#: ../pyhoca/wxgui/frontend.py:711
+#: ../pyhoca/wxgui/frontend.py:720
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:714 ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726
#, python-format
msgid "%s - audio error"
msgstr "%s - audio fout"
-#: ../pyhoca/wxgui/frontend.py:714
+#: ../pyhoca/wxgui/frontend.py:723
msgid "The X2go PulseAudio system could not be started."
msgstr "Het X2go PulseAudio systeem kon niet gestart worden"
-#: ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:726
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr "Het X2go PulseAudio systeem is gecrashed"
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid "%s - audio problem"
msgstr "%s - audio probleem"
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -841,12 +841,12 @@ msgstr ""
"De audio verbinding kon niet worden gemaakt voor deze sessie.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid "%s - print error"
msgstr "%s - Printfout"
-#: ../pyhoca/wxgui/frontend.py:734
+#: ../pyhoca/wxgui/frontend.py:743
#, python-format
msgid ""
"%s\n"
@@ -857,7 +857,7 @@ msgstr ""
"...veroorzaakt door printer %s in sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid ""
"%s\n"
@@ -868,12 +868,12 @@ msgstr ""
"...veroorzaakt door sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid "%s - start"
msgstr "%s - Start"
-#: ../pyhoca/wxgui/frontend.py:740
+#: ../pyhoca/wxgui/frontend.py:749
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -882,7 +882,7 @@ msgstr ""
"Nieuwe X2go sessie wordt gestart...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -891,12 +891,12 @@ msgstr ""
"Een andere X2go-client heeft deze sessie gestart\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid "%s - resume"
msgstr "%s - hervatten"
-#: ../pyhoca/wxgui/frontend.py:748
+#: ../pyhoca/wxgui/frontend.py:757
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -905,7 +905,7 @@ msgstr ""
"X2go Sessie wordt hervat...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -914,12 +914,12 @@ msgstr ""
"Een andere X2go-client heeft de Sessie hervat\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid "%s - running"
msgstr "%s - actief"
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid ""
"Found already running session\n"
@@ -928,12 +928,12 @@ msgstr ""
"Reeds actieve sessie gevonden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -942,12 +942,12 @@ msgstr ""
"X2go Sessie is suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid "%s - terminate"
msgstr "%s - beëindigen"
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -956,7 +956,7 @@ msgstr ""
"X2go Sessie wordt beëindigd\n"
"%s"
-#: ../pyhoca/wxgui/messages.py:51
+#: ../pyhoca/wxgui/messages.py:53
#, python-format
msgid ""
"Are you really sure you want to\n"
@@ -965,15 +965,30 @@ msgstr ""
"Weet u zeker dat u het sessie\n"
"profiel ,,%s'' wilt verwijderen??"
-#: ../pyhoca/wxgui/messages.py:81
+#: ../pyhoca/wxgui/messages.py:54
+#, python-format
+msgid ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+msgstr ""
+"Pyhoca-GUI is al actief voor gebruiker ,,%s''!\n"
+"\n"
+"Er kan slechts één instantie per gebruiker gestart worden.\n"
+"Het Pyhoca-GUI icoontje kan gevonden worden in de\n"
+"taakbalk van uw desktop."
+
+#: ../pyhoca/wxgui/messages.py:87
msgid "Yes"
msgstr "Ja"
-#: ../pyhoca/wxgui/messages.py:82
+#: ../pyhoca/wxgui/messages.py:88
msgid "No"
msgstr "Nee"
-#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126
+#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126
msgid "Ok"
msgstr "Ok"
diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot
index ece3b33..f385334 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: 2011-06-24 01:35+0200\n"
+"POT-Creation-Date: 2011-06-27 11:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,101 +17,101 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../pyhoca/wxgui/logon.py:83
+#: ../pyhoca/wxgui/logon.py:80
#, python-format
msgid "%s (via %s)"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:87 ../pyhoca/wxgui/logon.py:97
+#: ../pyhoca/wxgui/logon.py:84 ../pyhoca/wxgui/logon.py:96
msgid "Username"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:89 ../pyhoca/wxgui/logon.py:99
+#: ../pyhoca/wxgui/logon.py:86 ../pyhoca/wxgui/logon.py:98
msgid "Password"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:92
+#: ../pyhoca/wxgui/logon.py:89
msgid "Authenticate"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:102
+#: ../pyhoca/wxgui/logon.py:101
msgid " Start SSH tunnel "
msgstr ""
-#: ../pyhoca/wxgui/logon.py:108
+#: ../pyhoca/wxgui/logon.py:109
msgid "Session login"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:109
+#: ../pyhoca/wxgui/logon.py:110
msgid "SSH proxy server login"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:120 ../pyhoca/wxgui/profilemanager.py:262
-#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:131
+#: ../pyhoca/wxgui/logon.py:121 ../pyhoca/wxgui/profilemanager.py:262
+#: ../pyhoca/wxgui/messages.py:111 ../pyhoca/wxgui/printingprefs.py:131
msgid "Cancel"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:251 ../pyhoca/wxgui/logon.py:284
-#: ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:277 ../pyhoca/wxgui/logon.py:310
+#: ../pyhoca/wxgui/frontend.py:350
#, python-format
msgid "%s - connect failure"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:252 ../pyhoca/wxgui/frontend.py:341
+#: ../pyhoca/wxgui/logon.py:278 ../pyhoca/wxgui/frontend.py:350
msgid "User is not allowed to start X2go sessions!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:257 ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/logon.py:283 ../pyhoca/wxgui/frontend.py:357
#, python-format
msgid "%s - connect"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:258
+#: ../pyhoca/wxgui/logon.py:284
msgid "Authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/logon.py:280
+#: ../pyhoca/wxgui/logon.py:306
msgid "SSH tunnel started"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:285
+#: ../pyhoca/wxgui/logon.py:311
msgid "Authentication failed!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:291
+#: ../pyhoca/wxgui/logon.py:317
#, python-format
msgid "%s - ssh proxy"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:292
+#: ../pyhoca/wxgui/logon.py:318
msgid "Authentication to the SSH proxy server failed!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:307 ../pyhoca/wxgui/logon.py:314
-#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/frontend.py:364
-#: ../pyhoca/wxgui/frontend.py:385 ../pyhoca/wxgui/frontend.py:392
-#: ../pyhoca/wxgui/frontend.py:399
+#: ../pyhoca/wxgui/logon.py:333 ../pyhoca/wxgui/logon.py:340
+#: ../pyhoca/wxgui/logon.py:359 ../pyhoca/wxgui/frontend.py:373
+#: ../pyhoca/wxgui/frontend.py:394 ../pyhoca/wxgui/frontend.py:401
+#: ../pyhoca/wxgui/frontend.py:408
#, python-format
msgid "%s - connect error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:321 ../pyhoca/wxgui/frontend.py:371
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/logon.py:347 ../pyhoca/wxgui/frontend.py:380
+#: ../pyhoca/wxgui/frontend.py:387
#, python-format
msgid "%s - host key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:322 ../pyhoca/wxgui/frontend.py:371
+#: ../pyhoca/wxgui/logon.py:348 ../pyhoca/wxgui/frontend.py:380
msgid ""
"The remote server's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:328
+#: ../pyhoca/wxgui/logon.py:354
#, python-format
msgid "%s - key error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:334
+#: ../pyhoca/wxgui/logon.py:360
msgid "An unknown error occured during authentication!"
msgstr ""
@@ -592,7 +592,7 @@ msgid "Resume Session"
msgstr ""
#: ../pyhoca/wxgui/menus_taskbar.py:161
-msgid "Resume Session (disabled)"
+msgid "Resume Session (not possible)"
msgstr ""
#: ../pyhoca/wxgui/menus_taskbar.py:169
@@ -600,7 +600,7 @@ msgid "Transfer Session"
msgstr ""
#: ../pyhoca/wxgui/menus_taskbar.py:171
-msgid "Transfer Session (disabled)"
+msgid "Transfer Session (not possible)"
msgstr ""
#: ../pyhoca/wxgui/menus_taskbar.py:174
@@ -660,65 +660,65 @@ msgstr ""
msgid "About %s ..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:348
+#: ../pyhoca/wxgui/frontend.py:357
msgid "Public SSH key authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:378
+#: ../pyhoca/wxgui/frontend.py:387
msgid ""
"The SSH proxy's host key is invalid or has not been accepted by the user"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:399
+#: ../pyhoca/wxgui/frontend.py:408
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:406
+#: ../pyhoca/wxgui/frontend.py:415
#, python-format
msgid "%s - auth key error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:413
+#: ../pyhoca/wxgui/frontend.py:422
msgid "An unknown error occurred during authentication!"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:515
+#: ../pyhoca/wxgui/frontend.py:524
msgid "Cleaning X2go sessions..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
#, python-format
msgid "%s - disconnect"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:534
+#: ../pyhoca/wxgui/frontend.py:543
msgid "X2go Profile is now disconnected."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:550
+#: ../pyhoca/wxgui/frontend.py:559
msgid "New Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:577
+#: ../pyhoca/wxgui/frontend.py:586
#, python-format
msgid "Really Delete Session Profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
#, python-format
msgid "%s - profile deleted"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:583
+#: ../pyhoca/wxgui/frontend.py:592
msgid "The session profile has been deleted."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:598
+#: ../pyhoca/wxgui/frontend.py:607
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:650
+#: ../pyhoca/wxgui/frontend.py:659
#, python-format
msgid ""
"The authenticity of host [%s]:%s can't be established.\n"
@@ -727,95 +727,95 @@ msgid ""
"Are you sure you want to continue connecting?"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:658
+#: ../pyhoca/wxgui/frontend.py:667
#, python-format
msgid "%s: Confirm Host Authorization"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid "%s - channel error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:677
+#: ../pyhoca/wxgui/frontend.py:686
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:687 ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:696 ../pyhoca/wxgui/frontend.py:708
#, python-format
msgid "%s - session failure"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:687
+#: ../pyhoca/wxgui/frontend.py:696
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
"%s."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid "%s - session warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:693
+#: ../pyhoca/wxgui/frontend.py:702
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
"been denied."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:699
+#: ../pyhoca/wxgui/frontend.py:708
#, 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:711
+#: ../pyhoca/wxgui/frontend.py:720
#, python-format
msgid "%s - audio warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:711
+#: ../pyhoca/wxgui/frontend.py:720
msgid ""
"The X2go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:714 ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:723 ../pyhoca/wxgui/frontend.py:726
#, python-format
msgid "%s - audio error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:714
+#: ../pyhoca/wxgui/frontend.py:723
msgid "The X2go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:717
+#: ../pyhoca/wxgui/frontend.py:726
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:720
+#: ../pyhoca/wxgui/frontend.py:729
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:734 ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:743 ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid "%s - print error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:734
+#: ../pyhoca/wxgui/frontend.py:743
#, python-format
msgid ""
"%s\n"
@@ -823,7 +823,7 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:736
+#: ../pyhoca/wxgui/frontend.py:745
#, python-format
msgid ""
"%s\n"
@@ -831,96 +831,106 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:740 ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:749 ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid "%s - start"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:740
+#: ../pyhoca/wxgui/frontend.py:749
#, python-format
msgid ""
"New X2go session starting up...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:744
+#: ../pyhoca/wxgui/frontend.py:753
#, python-format
msgid ""
"Another client started X2go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:748 ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:757 ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid "%s - resume"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:748
+#: ../pyhoca/wxgui/frontend.py:757
#, python-format
msgid ""
"Resuming X2go session...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:752
+#: ../pyhoca/wxgui/frontend.py:761
#, python-format
msgid ""
"Another client resumed X2go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid "%s - running"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:756
+#: ../pyhoca/wxgui/frontend.py:765
#, python-format
msgid ""
"Found already running session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid "%s - suspend"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:760
+#: ../pyhoca/wxgui/frontend.py:769
#, python-format
msgid ""
"X2go Session has been suspended\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid "%s - terminate"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:776
+#: ../pyhoca/wxgui/frontend.py:785
#, python-format
msgid ""
"X2go Session has terminated\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:51
+#: ../pyhoca/wxgui/messages.py:53
#, python-format
msgid ""
"Are you really sure you want to\n"
"delete the session profile ,,%s''?"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:81
+#: ../pyhoca/wxgui/messages.py:54
+#, python-format
+msgid ""
+"PyHoca-GUI is already running for user ,,%s''!\n"
+"\n"
+"Only one instance of PyHoca-GUI can be started per\n"
+"user. The PyHoca-GUI icon can be found in your desktops's\n"
+"notification area/systray."
+msgstr ""
+
+#: ../pyhoca/wxgui/messages.py:87
msgid "Yes"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:82
+#: ../pyhoca/wxgui/messages.py:88
msgid "No"
msgstr ""
-#: ../pyhoca/wxgui/messages.py:99 ../pyhoca/wxgui/printingprefs.py:126
+#: ../pyhoca/wxgui/messages.py:105 ../pyhoca/wxgui/printingprefs.py:126
msgid "Ok"
msgstr ""
diff --git a/pyhoca-gui b/pyhoca-gui
index e41d346..3723004 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -42,6 +42,7 @@ import sys
import exceptions
import locale
import gettext
+import wx
PROG_NAME = os.path.basename(sys.argv[0])
PROG_PID = os.getpid()
@@ -82,6 +83,7 @@ from x2go.defaults import BACKENDS_CLIENTSETTINGS, BACKEND_CLIENTSETTINGS_DEFAUL
from x2go.defaults import BACKENDS_CLIENTPRINTING, BACKEND_CLIENTPRINTING_DEFAULT
from pyhoca.wxgui import __VERSION__ as _version
+from pyhoca.wxgui import messages
from pyhoca.wxgui import PyHocaGUI
if _X2GOCLIENT_OS == 'Windows':
@@ -166,8 +168,8 @@ debug_options = [
{'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', },
]
x2go_gui_options = [
- {'args':['-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', },
- {'args':['-P','--session-profile'], 'default': None, 'help': 'directly connect to a session profile', },
+ {'args':['-u','--username'], 'default': None, 'metavar': '<username>', 'help': 'username for the session (default: current user)', },
+ {'args':['-P','--session-profile'], 'default': None, 'metavar': '<profile-name>', 'help': 'directly connect to a session profile', },
{'args':['--non-interactive'], 'default': False, 'action': 'store_true', 'help': 'run the session manager in non-interactive mode, this option sets the following options to true: --restricted-trayicon, --start-on-connect, --resume-all-on-connect, --exit-on-disconnect, --disconnect-on-suspend and --disconnect-on-terminate', },
{'args':['--auto-connect'], 'default': False, 'action': 'store_true', 'help': 'connect sessions via SSH pubkey authentication if possible', },
{'args':['--show-profile-metatypes'], 'default': False, 'action': 'store_true', 'help': 'show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging)', },
@@ -184,6 +186,7 @@ x2go_gui_options = [
{'args':['--disable-printingprefs'], 'default': False, 'action': 'store_true', 'help': 'disable the client\'s printing preferences window', },
{'args':['--disable-profilemanager'], 'default': False, 'action': 'store_true', 'help': 'disable the session profile manager window', },
{'args':['--display'], 'default': None, 'metavar': '<hostname>:<screennumber>', 'help': 'set the DISPLAY environment variable to <hostname>:<screennumber>', },
+ {'args':['--logon-window-position'], 'default': None, 'metavar': '<x-pos>x<y-pos>', 'help': 'give a custom position for the logon window, use negative values to position relative to right/bottom border', },
]
if _X2GOCLIENT_OS == 'Windows':
x2go_gui_options.append(
@@ -191,27 +194,27 @@ if _X2GOCLIENT_OS == 'Windows':
)
backend_options = [
- {'args':['--backend-controlsession'], 'default': None, 'metavar': 'CONTROLSESSION_BACKEND', 'choices': BACKENDS_CONTROLSESSION.keys(), 'help': 'force usage of a certain CONTROLSESSION_BACKEND (do not use this unless you know exactly what you are doing)', },
- {'args':['--backend-terminalsession'], 'default': None, 'metavar': 'TERMINALSESSION_BACKEND', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain TERMINALSESSION_BACKEND (do not use this unless you know exactly what you are doing)', },
- {'args':['--backend-serversessioninfo'], 'default': None, 'metavar': 'SERVERSESSIONINFO_BACKEND', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain SERVERSESSIONINFO_BACKEND (do not use this unless you know exactly what you are doing)', },
- {'args':['--backend-serversessionlist'], 'default': None, 'metavar': 'SERVERSESSIONLIST_BACKEND', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain SERVERSESSIONLIST_BACKEND (do not use this unless you know exactly what you are doing)', },
- {'args':['--backend-proxy'], 'default': None, 'metavar': 'PROXY_BACKEND', 'choices': BACKENDS_PROXY.keys(), 'help': 'force usage of a certain PROXY_BACKEND (do not use this unless you know exactly what you are doing)', },
- {'args':['--backend-sessionprofiles'], 'default': None, 'metavar': 'SESSIONPROFILES_BACKEND', 'choices': _config_backends, 'help': 'use given backend for accessing session profiles, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _profiles_backend_default), },
- {'args':['--backend-clientsettings'], 'default': None, 'metavar': 'CLIENTSETTINGS_BACKEND', 'choices': _config_backends, 'help': 'use given backend for accessing the client settings configuration, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _settings_backend_default), },
- {'args':['--backend-clientprinting'], 'default': None, 'metavar': 'CLIENTPRINTING_BACKEND', 'choices': _config_backends, 'help': 'use given backend for accessing the client printing configuration, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _printing_backend_default), },
+ {'args':['--backend-controlsession'], 'default': None, 'metavar': '<CONTROLSESSION_BACKEND>', 'choices': BACKENDS_CONTROLSESSION.keys(), 'help': 'force usage of a certain CONTROLSESSION_BACKEND (do not use this unless you know exactly what you are doing)', },
+ {'args':['--backend-terminalsession'], 'default': None, 'metavar': '<TERMINALSESSION_BACKEND>', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain TERMINALSESSION_BACKEND (do not use this unless you know exactly what you are doing)', },
+ {'args':['--backend-serversessioninfo'], 'default': None, 'metavar': '<SERVERSESSIONINFO_BACKEND>', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain SERVERSESSIONINFO_BACKEND (do not use this unless you know exactly what you are doing)', },
+ {'args':['--backend-serversessionlist'], 'default': None, 'metavar': '<SERVERSESSIONLIST_BACKEND>', 'choices': BACKENDS_TERMINALSESSION.keys(), 'help': 'force usage of a certain SERVERSESSIONLIST_BACKEND (do not use this unless you know exactly what you are doing)', },
+ {'args':['--backend-proxy'], 'default': None, 'metavar': '<PROXY_BACKEND>', 'choices': BACKENDS_PROXY.keys(), 'help': 'force usage of a certain PROXY_BACKEND (do not use this unless you know exactly what you are doing)', },
+ {'args':['--backend-sessionprofiles'], 'default': None, 'metavar': '<SESSIONPROFILES_BACKEND>', 'choices': _config_backends, 'help': 'use given backend for accessing session profiles, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _profiles_backend_default), },
+ {'args':['--backend-clientsettings'], 'default': None, 'metavar': '<CLIENTSETTINGS_BACKEND>', 'choices': _config_backends, 'help': 'use given backend for accessing the client settings configuration, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _settings_backend_default), },
+ {'args':['--backend-clientprinting'], 'default': None, 'metavar': '<CLIENTPRINTING_BACKEND>', 'choices': _config_backends, 'help': 'use given backend for accessing the client printing configuration, available backends on your system: %s (default: %s)' % (', '.join(_config_backends), _printing_backend_default), },
]
if _X2GOCLIENT_OS == 'Windows':
contrib_options = [
{'args':['--start-xserver'], 'default': False, 'action': 'store_true', 'help': 'start the XServer before starting the session manager application, detect best XServer automatically, if more than one XServer is installed on your system', },
- {'args':['-X', '--preferred-xserver'], 'default': None, 'metavar': 'XSERVER', 'choices': _known_xservers, 'help': 'start either of the currently supported XServers: %s -- make sure your preferred XServer is installed on your system' % _known_xservers, },
+ {'args':['-X', '--preferred-xserver'], 'default': None, 'metavar': '<XSERVER>', 'choices': _known_xservers, 'help': 'start either of the currently supported XServers: %s -- make sure your preferred XServer is installed on your system' % _known_xservers, },
{'args':['--start-pulseaudio'], 'default': False, 'action': 'store_true', 'help': 'start the PulseAudio server before starting the session manager application', },
]
portable_options = [
- {'args':['--client-rootdir'], 'default': None, 'help': 'define an alternative location where to find plain text config files (default: <HOME>/.x2goclient). This option will set ,,--backend-profiles FILE\'\', ,,--backend-clientsettings FILE\'\' and ,,--backend-clientprinting FILE\'\'', },
- {'args':['--sessions-rootdir'], 'default': None, 'help': 'define an alternative location for session runtime files'},
- {'args':['--ssh-rootdir'], 'default': None, 'help': 'define an alternative location for SSH files', },
+ {'args':['--client-rootdir'], 'default': None, 'metavar': '</path/to/.x2goclient/dir>', 'help': 'define an alternative location where to find plain text config files (default: <HOME>/.x2goclient). This option will set ,,--backend-profiles FILE\'\', ,,--backend-clientsettings FILE\'\' and ,,--backend-clientprinting FILE\'\'', },
+ {'args':['--sessions-rootdir'], 'default': None, 'metavar': '</path/to/.x2go/dir>', 'help': 'define an alternative location for session runtime files'},
+ {'args':['--ssh-rootdir'], 'default': None, 'metavar': '</path/to/.ssh/dir>', 'help': 'define an alternative location for SSH files', },
]
@@ -314,7 +317,10 @@ def main():
if check_running():
sys.stderr.write("\n###############################\n### %s: already running for user %s\n###############################\n" % (PROG_NAME, _CURRENT_LOCAL_USER))
+ m = messages.PyHoca_MessageWindow_Ok(wx.App(), shortmsg='ALREADY_RUNNING', title=u'PyHoca-GUI (%s)...' % VERSION, icon='pyhoca-trayicon')
+ m.ShowModal()
version()
+
try:
thisPyHocaGUI = PyHocaGUI(args, logger, liblogger, version=VERSION)
thisPyHocaGUI.MainLoop()
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index ce8244a..9b17d05 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -130,6 +130,15 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
if x2go.X2GOCLIENT_OS == 'Windows' and self.args.start_pulseaudio and os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
_x2goclient_kwargs['pulseaudio_installdir'] = os.path.dirname(basepath.pulseaudio_binary)
+ try:
+ if self.args.logon_window_position:
+ self.logon_window_position_x = int(self.args.logon_window_position.split('x')[0])
+ self.logon_window_position_y = int(self.args.logon_window_position.split('x')[1])
+ else:
+ raise
+ except:
+ self.logon_window_position_x = self.logon_window_position_y = None
+
x2go.X2goClient.__init__(self, **_x2goclient_kwargs)
# We register one session per available session profile.
# These registered sessions will be used to access the profile's
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 7010d6f..b009805 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -39,9 +39,6 @@ import gevent.monkey
gevent.monkey.patch_all()
import wx
-import wx.lib.scrolledpanel as scrolled
-import wx.lib.mixins.listctrl as listmix
-
import time
import os
import sys
@@ -58,7 +55,7 @@ if os.environ.has_key('DESKTOP_SESSION'):
else:
WINDOW_MANAGER = 'generic'
-class PyHocaGUI_DialogBoxPassword(wx.Frame):
+class PyHocaGUI_DialogBoxPassword(wx.Dialog):
"""\
STILL UNDOCUMENTED
@@ -74,7 +71,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
self.current_profile_name = profile_name
self.current_profile_config = self._PyHocaGUI.session_profiles.get_profile_config(profile_name)
- wx.Frame.__init__(self, None, -1, profile_name)
+ wx.Dialog.__init__(self, None, id=-1, title=profile_name, style=wx.DEFAULT_FRAME_STYLE, )
self._PyHocaGUI._sub_windows.append(self)
if self.sshproxy_auth:
@@ -89,9 +86,11 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
self.passwordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1))
self.passwordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1))
self.passwordTxt.SetFocus()
- self.loginBtn = wx.Button(self, wx.ID_OK, _(u'Authenticate'))
+ self.loginBtn = wx.Button(self, wx.ID_OK, _(u'Authenticate'), )
self.loginBtn.SetDefault()
+ _tab_order = []
+
# widgets
if self.sshproxy_auth:
self.sshProxyUserLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1))
@@ -102,6 +101,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
self.sshProxyLoginBtn = wx.Button(self, wx.ID_OK, _(u' Start SSH tunnel '))
self.sshProxyLoginBtn.SetDefault()
+ _tab_order.extend([self.sshProxyUserTxt, self.sshProxyPasswordTxt, self.sshProxyLoginBtn, ])
+
headerWidth = max(self.userLbl.GetSize().GetWidth(), self.passwordLbl.GetSize().GetWidth()) + 150
sshProxyHeaderWidth = max(self.sshProxyUserLbl.GetSize().GetWidth(), self.sshProxyPasswordLbl.GetSize().GetWidth()) + 150
@@ -117,7 +118,9 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
self.passwordTxt.Enable(False)
self.loginBtn.Enable(False)
- self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Cancel'))
+ self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Cancel'), )
+
+ _tab_order.extend([self.userTxt, self.passwordTxt, self.loginBtn, self.cancelBtn, ])
if self.sshproxy_auth:
self.Bind(wx.EVT_BUTTON, self.OnLogin, self.sshProxyLoginBtn)
@@ -188,13 +191,36 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
self.SetSizerAndFit(mainSizer)
self.Layout()
+ for i in xrange(len(_tab_order) - 1):
+ _tab_order[i+1].MoveAfterInTabOrder(_tab_order[i])
+
maxX, maxY = wx.GetDisplaySize()
- if (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'awesome',)):
- self.Move((maxX - (self.GetSize().GetWidth() + 20), 35))
+ if self._PyHocaGUI.logon_window_position_x and self._PyHocaGUI.logon_window_position_y:
+
+ # allow positioning of logon window via command line option
+ if self._PyHocaGUI.logon_window_position_x < 0:
+ move_x = maxX - (self.GetSize().GetWidth() + self._PyHocaGUI.logon_window_position_x)
+ else:
+ move_x = self._PyHocaGUI.logon_window_position_x
+ if self._PyHocaGUI.logon_window_position_y < 0:
+ move_y = maxX - (self.GetSize().GetHeight() + self._PyHocaGUI.logon_window_position_y)
+ else:
+ move_y = self._PyHocaGUI.logon_window_position_y
+
+ elif (x2go.X2GOCLIENT_OS == 'Linux') and (WINDOW_MANAGER in ('gnome', 'awesome',)):
+
+ # automatically place logon Window for GNOME, awesome
+ move_x = maxX - (self.GetSize().GetWidth() + 20)
+ move_y = 35
+
else:
- self.Move((maxX - (self.GetSize().GetWidth() + 20), maxY - (self.GetSize().GetHeight() + 70), ))
+ # automatically place logon Window for KDE4, LXDE, etc.
+ move_x = maxX - (self.GetSize().GetWidth() + 20)
+ move_y = maxY - (self.GetSize().GetHeight() + 70)
+
+ self.Move((move_x, move_y))
self.Show()
def OnLogin(self, evt):
@@ -357,6 +383,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
def OnCancel(self, evt):
self.Close()
+ self.Destroy()
def Destroy(self):
try:
@@ -367,4 +394,4 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
self._PyHocaGUI._temp_disabled_profile_names.remove(self.current_profile_name)
except ValueError:
pass
- wx.Frame.Destroy(self)
+ wx.Dialog.Destroy(self)
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 31fc744..f7df009 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -158,7 +158,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
if _s is not None and _s.is_color_depth_ok():
self.Append(text=_("Resume Session"), id=ID_RESUMESESSION)
else:
- _rs = self.Append(text=_(u"Resume Session (disabled)"), id=ID_RESUMESESSION_DISABLED)
+ _rs = self.Append(text=_(u"Resume Session (not possible)"), id=ID_RESUMESESSION_DISABLED)
_rs.Enable(False)
elif status == 'R':
@@ -168,7 +168,7 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
if _s is not None and _s.is_color_depth_ok():
self.Append(text=_(u"Transfer Session"), id=ID_TRANSFERSESSION)
else:
- _ts = self.Append(text=_(u"Transfer Session (disabled)"), id=ID_TRANSFERSESSION_DISABLED)
+ _ts = self.Append(text=_(u"Transfer Session (not possible)"), id=ID_TRANSFERSESSION_DISABLED)
_ts.Enable(False)
self.Append(text=_(u"Suspend Session"), id=ID_SUSPENDSESSION)
diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py
index 1df4e35..9ae8031 100644
--- a/pyhoca/wxgui/messages.py
+++ b/pyhoca/wxgui/messages.py
@@ -29,6 +29,8 @@ import gevent
# PyHoca-GUI modules
import basepath
+# X2go modules
+from x2go.defaults import CURRENT_LOCAL_USER as _CURRENT_LOCAL_USER
_icons_location = basepath.icons_basepath
@@ -49,12 +51,13 @@ class PyHoca_MessageWindow(wx.Dialog):
self._pyhoca_messages = {
'REALLY_DELETE_PROFILE': _(u'Are you really sure you want to\ndelete the session profile ,,%s\'\'?') % profile_name,
+ 'ALREADY_RUNNING': _(u'PyHoca-GUI is already running for user ,,%s\'\'!\n\nOnly one instance of PyHoca-GUI can be started per\nuser. The PyHoca-GUI icon can be found in your desktops\'s\nnotification area/systray.') % _CURRENT_LOCAL_USER
}
if shortmsg is None:
show_message = custom_message
- elif shortmsg in self._pyhoca_messages:
+ elif shortmsg in self._pyhoca_messages.keys():
show_message = self._pyhoca_messages[shortmsg]
else:
show_message = 'No message has been given...'
@@ -62,8 +65,11 @@ class PyHoca_MessageWindow(wx.Dialog):
self.show_message = show_message
self.result = None
- if parent is None:
- parent = self._PyHocaGUI.about
+ try:
+ if parent is None:
+ parent = self._PyHocaGUI.about
+ except AttributeError:
+ pass
wx.Dialog.__init__(self, parent, wx.ID_ANY, )
self.SetTitle('%s' % title)
@@ -126,7 +132,10 @@ class PyHoca_MessageWindow(wx.Dialog):
maxX, maxY = wx.GetDisplaySize()
self.Move((maxX/2 - self.GetSize().GetWidth()/2, maxY/2 - self.GetSize().GetHeight()/2))
- self._PyHocaGUI._sub_windows.append(self)
+ try:
+ self._PyHocaGUI._sub_windows.append(self)
+ except AttributeError:
+ pass
def OnTrue(self, evt):
self.result = True
@@ -149,7 +158,10 @@ class PyHoca_MessageWindow(wx.Dialog):
return not self.Yes()
def Hide(self):
- self._PyHocaGUI._sub_windows.remove(self)
+ try:
+ self._PyHocaGUI._sub_windows.remove(self)
+ except AttributeError:
+ pass
self.Show(False)
def Close(self):
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)).
More information about the x2go-commits
mailing list