[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.27.0-6-g6bb6f02
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:54:43 CEST 2013
The branch, twofactorauth has been updated
via 6bb6f02feb2065840f85e1f34d4027b1d7a51752 (commit)
from fc72d49ce666c78890c54d1134775a6c9ac5b10d (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 13122 -> 13142 bytes
build/mo/en/LC_MESSAGES/pyhoca-gui.mo | Bin 12332 -> 12349 bytes
build/mo/es/LC_MESSAGES/pyhoca-gui.mo | Bin 11154 -> 11137 bytes
build/mo/nl/LC_MESSAGES/pyhoca-gui.mo | Bin 10669 -> 10546 bytes
locale | 1 +
po/de.po | 152 +++++++------
po/en.po | 152 +++++++------
po/es.po | 154 +++++++------
po/nl.po | 155 +++++++------
po/pyhoca-gui.pot | 141 ++++++------
pyhoca-gui | 1 +
pyhoca-gui_0.0.27.0.orig.tar.gz.delta | Bin 4465 -> 0 bytes
pyhoca-gui_0.0.27.0.orig.tar.gz.id | 1 -
pyhoca/wxgui/profilemanager.py | 393 ++++++++++++++++++---------------
14 files changed, 617 insertions(+), 533 deletions(-)
create mode 120000 locale
delete mode 100644 pyhoca-gui_0.0.27.0.orig.tar.gz.delta
delete mode 100644 pyhoca-gui_0.0.27.0.orig.tar.gz.id
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 5b6266e..712b4fc 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 2780608..3807955 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 06e2edf..cd3f2a2 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 346f90e..afcfd43 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/locale b/locale
new file mode 120000
index 0000000..24ff420
--- /dev/null
+++ b/locale
@@ -0,0 +1 @@
+build/mo/
\ No newline at end of file
diff --git a/po/de.po b/po/de.po
index 31188fd..cb24386 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-02-22 13:01+0100\n"
-"PO-Revision-Date: 2011-02-22 13:01+0100\n"
+"POT-Creation-Date: 2011-02-24 15:35+0100\n"
+"PO-Revision-Date: 2011-02-24 15:32+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"
@@ -54,16 +54,16 @@ msgid "Cancel"
msgstr "Abbrechen"
#: ../pyhoca/wxgui/logon.py:235 ../pyhoca/wxgui/logon.py:267
-#: ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/frontend.py:310
#, python-format
msgid "%s - connect failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:310
msgid "User is not allowed to start X2go sessions!"
msgstr "Benutzer darf keine X2go Sitzungen starten!"
-#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:314
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
@@ -90,14 +90,14 @@ msgid "Authentication to the SSH proxy server failed!"
msgstr "Anmeldung am SSH Proxy Server ist fehlgeschlagen"
#: ../pyhoca/wxgui/logon.py:280 ../pyhoca/wxgui/logon.py:286
-#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:326
-#: ../pyhoca/wxgui/frontend.py:329 ../pyhoca/wxgui/frontend.py:332
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:327
+#: ../pyhoca/wxgui/frontend.py:330 ../pyhoca/wxgui/frontend.py:333
+#: ../pyhoca/wxgui/frontend.py:336
#, python-format
msgid "%s - connect error"
msgstr "%s - Verbindungsfehler"
-#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:338
+#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:339
#, python-format
msgid "%s - key error"
msgstr "%s - ungültiger Schlüssel"
@@ -196,6 +196,15 @@ msgstr "Auswahldialog öffnen, um Anwendung auszuwählen"
msgid "Save incoming file as ..."
msgstr "Eingehende Datei speichern unter ..."
+#. boxes for all tabs
+#: ../pyhoca/wxgui/profilemanager.py:121
+msgid "Profile "
+msgstr "Profil"
+
+#: ../pyhoca/wxgui/profilemanager.py:122
+msgid "Session"
+msgstr "Sitzung"
+
#: ../pyhoca/wxgui/profilemanager.py:123
msgid "Server"
msgstr "Server"
@@ -236,16 +245,16 @@ msgstr "Dateiimport"
#. ## widgets for the SESSION tab
#. ##
#: ../pyhoca/wxgui/profilemanager.py:136
-msgid "Profile name"
-msgstr "Profilname"
+msgid "Name"
+msgstr "Name"
#: ../pyhoca/wxgui/profilemanager.py:146
-msgid "Profile icon"
-msgstr "Profilsymbol"
+msgid "Icon"
+msgstr "Symbol"
#: ../pyhoca/wxgui/profilemanager.py:148
-msgid "Session type"
-msgstr "Sitzungstyp"
+msgid "Type"
+msgstr "Typ"
#: ../pyhoca/wxgui/profilemanager.py:150
msgid "Application"
@@ -453,66 +462,66 @@ msgstr "PyHoca-GUI Profilmanager - %s (verbunden)"
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profilmanager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:613
+#: ../pyhoca/wxgui/profilemanager.py:638
msgid "Session Profile"
msgstr "Sitzungsprofil"
-#: ../pyhoca/wxgui/profilemanager.py:614
+#: ../pyhoca/wxgui/profilemanager.py:639
msgid "Connection"
msgstr "Verbindung"
-#: ../pyhoca/wxgui/profilemanager.py:615
+#: ../pyhoca/wxgui/profilemanager.py:640
msgid "Settings"
msgstr "Einstellungen"
-#: ../pyhoca/wxgui/profilemanager.py:616
+#: ../pyhoca/wxgui/profilemanager.py:641
msgid "Sharing"
msgstr "Ordnerfreigabe"
-#: ../pyhoca/wxgui/profilemanager.py:980
+#: ../pyhoca/wxgui/profilemanager.py:1005
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Icon Dateien (*.png)|*.png|Alle Dateien (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:983
+#: ../pyhoca/wxgui/profilemanager.py:1008
msgid "Choose an icon for this session profile"
msgstr "Sitzungs-Icon für dieses Sitzungsprofil auswählen"
-#: ../pyhoca/wxgui/profilemanager.py:1091
+#: ../pyhoca/wxgui/profilemanager.py:1116
msgid "All files (*.*)|*"
msgstr "Alle Dateien (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1093
-#: ../pyhoca/wxgui/profilemanager.py:1108
+#: ../pyhoca/wxgui/profilemanager.py:1118
+#: ../pyhoca/wxgui/profilemanager.py:1133
msgid "Choose a public SSH key"
msgstr "Öffentlichen SSH-Schlüssel auswählen"
-#: ../pyhoca/wxgui/profilemanager.py:1242
+#: ../pyhoca/wxgui/profilemanager.py:1267
msgid "Choose a folder to share within a session"
msgstr "Ordner zur Freigabe für Sitzungen auswählen"
-#: ../pyhoca/wxgui/profilemanager.py:1307 ../pyhoca/wxgui/menus_taskbar.py:86
+#: ../pyhoca/wxgui/profilemanager.py:1332 ../pyhoca/wxgui/menus_taskbar.py:86
msgid "Profile Manager"
msgstr "Profilmanager"
-#: ../pyhoca/wxgui/profilemanager.py:1307
+#: ../pyhoca/wxgui/profilemanager.py:1332
msgid "Profile name is missing, profile unusable!!!"
msgstr "Der Profilname fehlt, Profil so nicht verwendbar!!!"
-#: ../pyhoca/wxgui/profilemanager.py:1329
+#: ../pyhoca/wxgui/profilemanager.py:1354
#, python-format
msgid "%s - profile added"
msgstr "%s - Profil hinzugefügt"
-#: ../pyhoca/wxgui/profilemanager.py:1330
+#: ../pyhoca/wxgui/profilemanager.py:1355
msgid "A new session profile has been added."
msgstr "Ein neues Sitzungsprofil wurde hinzugefügt."
-#: ../pyhoca/wxgui/profilemanager.py:1334
+#: ../pyhoca/wxgui/profilemanager.py:1359
#, python-format
msgid "%s - modified"
msgstr "%s - modifiziert"
-#: ../pyhoca/wxgui/profilemanager.py:1335
+#: ../pyhoca/wxgui/profilemanager.py:1360
msgid "Changes to profile have been saved."
msgstr "Änderungen am Profil wurden übernommen."
@@ -598,53 +607,53 @@ msgstr "Sitzung starten/fortsetzen"
msgid "Connect Server"
msgstr "Serververbindung aufbauen"
-#: ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/frontend.py:314
msgid "Public SSH key authentication has been successful."
msgstr "Authentifizierung mit öffentlichem SSH Schlüssel war erfolgreich."
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/frontend.py:336
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
"Kommunikation während Authentifizierungsprotokoll unvollständig! Nochmal "
"versuchen..."
-#: ../pyhoca/wxgui/frontend.py:414
+#: ../pyhoca/wxgui/frontend.py:415
msgid "Cleaning X2go sessions..."
msgstr "Beende X2go Sitzungen..."
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
#, python-format
msgid "%s - disconnect"
msgstr "%s - trennen"
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
msgid "X2go Profile is now disconnected."
msgstr "X2go Profil ist nun nicht mehr verbunden."
-#: ../pyhoca/wxgui/frontend.py:442
+#: ../pyhoca/wxgui/frontend.py:443
msgid "New Session Profile"
msgstr "Neues Sitzungsprofil"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profil gelöscht"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
msgid "The session profile has been deleted."
msgstr "Das Sitzungsprofil wurde gelöscht."
-#: ../pyhoca/wxgui/frontend.py:486
+#: ../pyhoca/wxgui/frontend.py:487
#, 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:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindungsfehler"
-#: ../pyhoca/wxgui/frontend.py:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -653,12 +662,12 @@ msgstr ""
"Die Verbindung zum Server %s wurde unerwartet unterbrochen! Bitte versuchen "
"Sie, sich neu am Server anzumelden..."
-#: ../pyhoca/wxgui/frontend.py:531 ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:532 ../pyhoca/wxgui/frontend.py:536
#, python-format
msgid "%s - session failure"
msgstr "%s - Verbindung fehlgeschlagen"
-#: ../pyhoca/wxgui/frontend.py:531
+#: ../pyhoca/wxgui/frontend.py:532
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
@@ -667,12 +676,12 @@ msgstr ""
"Der Befehl ,,%s'' ist auf dem X2go Server nicht verfügbar\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid "%s - session warning"
msgstr "%s - Sitzungsfunktion eingeschränkt"
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -685,7 +694,7 @@ msgstr ""
"besteht, wird es helfen, den SSH-Server Prozess auf dem X2go Server neu zu "
"starten."
-#: ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:536
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -694,37 +703,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:537
+#: ../pyhoca/wxgui/frontend.py:538
#, python-format
msgid "%s - audio warning"
msgstr "%s - Warnung Audiosystem"
-#: ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/frontend.py:538
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:539 ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:540 ../pyhoca/wxgui/frontend.py:542
#, python-format
msgid "%s - audio error"
msgstr "%s - Audiofehler"
-#: ../pyhoca/wxgui/frontend.py:539
+#: ../pyhoca/wxgui/frontend.py:540
msgid "The X2go PulseAudio system could not be started."
msgstr "Das X2go PulseAudio System konnte nicht gestartet werden."
-#: ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:542
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr "Das X2go PulseAudio System ist soeben abgestürzt."
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid "%s - audio problem"
msgstr "%s - Audioproblem"
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -733,12 +742,12 @@ msgstr ""
"Die Audio-Verbindung für diese Sitzung konnte nicht aufgebaut werden.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid "%s - print job"
msgstr "%s - Druckauftrag"
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid ""
"Opening print job dialog not implemented yet!!!\n"
@@ -747,12 +756,12 @@ msgstr ""
"Druckdialog für eingehende Druckaufträge ist bislang nicht implementiert!!!\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid "%s - print error"
msgstr "%s - Druckfehler"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid ""
"%s\n"
@@ -763,12 +772,12 @@ msgstr ""
"...verursacht von Sitzung\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:570 ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:571 ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid "%s - start"
msgstr "%s - starten"
-#: ../pyhoca/wxgui/frontend.py:570
+#: ../pyhoca/wxgui/frontend.py:571
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -777,7 +786,7 @@ msgstr ""
"Neue X2go Sitzung wird gestartet...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -786,12 +795,12 @@ msgstr ""
"Ein anderes X2go Programm hat diese Sitzung gestartet\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:574 ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:575 ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid "%s - resume"
msgstr "%s - fortsetzen"
-#: ../pyhoca/wxgui/frontend.py:574
+#: ../pyhoca/wxgui/frontend.py:575
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -800,7 +809,7 @@ msgstr ""
"X2go Sitzung wird fortgesetzt...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -809,12 +818,12 @@ msgstr ""
"Eine andere X2go Anwendung hat die Sitzung fortgesetzt\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid "%s - running"
msgstr "%s - aktiv"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid ""
"Found already running session\n"
@@ -823,12 +832,12 @@ msgstr ""
"Bereits aktive Sitzung gefunden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid "%s - suspend"
msgstr "%s - anhalten"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -837,12 +846,12 @@ msgstr ""
"X2go Sitzung wurde angehalten\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid "%s - terminate"
msgstr "%s - beenden"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -851,5 +860,8 @@ msgstr ""
"X2go Sitzung wurde beendet\n"
"%s"
+#~ msgid "Profile icon"
+#~ msgstr "Profilsymbol"
+
#~ msgid "Arts"
#~ msgstr "Arts"
diff --git a/po/en.po b/po/en.po
index e998472..6e6e952 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-02-22 13:01+0100\n"
-"PO-Revision-Date: 2011-02-22 13:00+0100\n"
+"POT-Creation-Date: 2011-02-24 15:35+0100\n"
+"PO-Revision-Date: 2011-02-24 15:32+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"
@@ -54,16 +54,16 @@ msgid "Cancel"
msgstr "Cancel"
#: ../pyhoca/wxgui/logon.py:235 ../pyhoca/wxgui/logon.py:267
-#: ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/frontend.py:310
#, python-format
msgid "%s - connect failure"
msgstr "%s - connect failure"
-#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:310
msgid "User is not allowed to start X2go sessions!"
msgstr "User is not allowed to start X2go sessions!"
-#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:314
#, python-format
msgid "%s - connect"
msgstr "%s - connect"
@@ -90,14 +90,14 @@ msgid "Authentication to the SSH proxy server failed!"
msgstr "Authentication to the SSH proxy server failed!"
#: ../pyhoca/wxgui/logon.py:280 ../pyhoca/wxgui/logon.py:286
-#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:326
-#: ../pyhoca/wxgui/frontend.py:329 ../pyhoca/wxgui/frontend.py:332
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:327
+#: ../pyhoca/wxgui/frontend.py:330 ../pyhoca/wxgui/frontend.py:333
+#: ../pyhoca/wxgui/frontend.py:336
#, python-format
msgid "%s - connect error"
msgstr "%s - connect error"
-#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:338
+#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:339
#, python-format
msgid "%s - key error"
msgstr "%s - key error"
@@ -198,6 +198,15 @@ msgstr "Open application chooser dialog"
msgid "Save incoming file as ..."
msgstr "Save incoming file as ..."
+#. boxes for all tabs
+#: ../pyhoca/wxgui/profilemanager.py:121
+msgid "Profile "
+msgstr "Profile"
+
+#: ../pyhoca/wxgui/profilemanager.py:122
+msgid "Session"
+msgstr "Session"
+
#: ../pyhoca/wxgui/profilemanager.py:123
msgid "Server"
msgstr "Server"
@@ -238,16 +247,16 @@ msgstr "File Import"
#. ## widgets for the SESSION tab
#. ##
#: ../pyhoca/wxgui/profilemanager.py:136
-msgid "Profile name"
-msgstr "Profile name"
+msgid "Name"
+msgstr "Name"
#: ../pyhoca/wxgui/profilemanager.py:146
-msgid "Profile icon"
-msgstr "Profile icon"
+msgid "Icon"
+msgstr "Icon"
#: ../pyhoca/wxgui/profilemanager.py:148
-msgid "Session type"
-msgstr "Session type"
+msgid "Type"
+msgstr "Type"
#: ../pyhoca/wxgui/profilemanager.py:150
msgid "Application"
@@ -455,66 +464,66 @@ msgstr "PyHoca-GUI Profile Manager - %s (connected)"
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profile Manager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:613
+#: ../pyhoca/wxgui/profilemanager.py:638
msgid "Session Profile"
msgstr "Session Profile"
-#: ../pyhoca/wxgui/profilemanager.py:614
+#: ../pyhoca/wxgui/profilemanager.py:639
msgid "Connection"
msgstr "Connection"
-#: ../pyhoca/wxgui/profilemanager.py:615
+#: ../pyhoca/wxgui/profilemanager.py:640
msgid "Settings"
msgstr "Settings"
-#: ../pyhoca/wxgui/profilemanager.py:616
+#: ../pyhoca/wxgui/profilemanager.py:641
msgid "Sharing"
msgstr "Sharing"
-#: ../pyhoca/wxgui/profilemanager.py:980
+#: ../pyhoca/wxgui/profilemanager.py:1005
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Icon Files (*.png)|*.png|All files (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:983
+#: ../pyhoca/wxgui/profilemanager.py:1008
msgid "Choose an icon for this session profile"
msgstr "Choose an icon for this session profile"
-#: ../pyhoca/wxgui/profilemanager.py:1091
+#: ../pyhoca/wxgui/profilemanager.py:1116
msgid "All files (*.*)|*"
msgstr "All files (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1093
-#: ../pyhoca/wxgui/profilemanager.py:1108
+#: ../pyhoca/wxgui/profilemanager.py:1118
+#: ../pyhoca/wxgui/profilemanager.py:1133
msgid "Choose a public SSH key"
msgstr "Choose a public SSH key"
-#: ../pyhoca/wxgui/profilemanager.py:1242
+#: ../pyhoca/wxgui/profilemanager.py:1267
msgid "Choose a folder to share within a session"
msgstr "Choose a folder to share within a session"
-#: ../pyhoca/wxgui/profilemanager.py:1307 ../pyhoca/wxgui/menus_taskbar.py:86
+#: ../pyhoca/wxgui/profilemanager.py:1332 ../pyhoca/wxgui/menus_taskbar.py:86
msgid "Profile Manager"
msgstr "Profile Manager"
-#: ../pyhoca/wxgui/profilemanager.py:1307
+#: ../pyhoca/wxgui/profilemanager.py:1332
msgid "Profile name is missing, profile unusable!!!"
msgstr "Profile name is missing, profile unusable!!!"
-#: ../pyhoca/wxgui/profilemanager.py:1329
+#: ../pyhoca/wxgui/profilemanager.py:1354
#, python-format
msgid "%s - profile added"
msgstr "%s - profile added"
-#: ../pyhoca/wxgui/profilemanager.py:1330
+#: ../pyhoca/wxgui/profilemanager.py:1355
msgid "A new session profile has been added."
msgstr "A new session profile has been added."
-#: ../pyhoca/wxgui/profilemanager.py:1334
+#: ../pyhoca/wxgui/profilemanager.py:1359
#, python-format
msgid "%s - modified"
msgstr "%s - modified"
-#: ../pyhoca/wxgui/profilemanager.py:1335
+#: ../pyhoca/wxgui/profilemanager.py:1360
msgid "Changes to profile have been saved."
msgstr "Changes to profile have been saved."
@@ -600,51 +609,51 @@ msgstr "Start/Resume Session"
msgid "Connect Server"
msgstr "Connect Server"
-#: ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/frontend.py:314
msgid "Public SSH key authentication has been successful."
msgstr "Public SSH key authentication has been successful."
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/frontend.py:336
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authentication protocol communication incomplete! Try again..."
-#: ../pyhoca/wxgui/frontend.py:414
+#: ../pyhoca/wxgui/frontend.py:415
msgid "Cleaning X2go sessions..."
msgstr "Cleaning X2go sessions..."
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
#, python-format
msgid "%s - disconnect"
msgstr "%s - disconnect"
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
msgid "X2go Profile is now disconnected."
msgstr "X2go Profile is now disconnected."
-#: ../pyhoca/wxgui/frontend.py:442
+#: ../pyhoca/wxgui/frontend.py:443
msgid "New Session Profile"
msgstr "New Session Profile"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
#, python-format
msgid "%s - profile deleted"
msgstr "%s - profile deleted"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
msgid "The session profile has been deleted."
msgstr "The session profile has been deleted."
-#: ../pyhoca/wxgui/frontend.py:486
+#: ../pyhoca/wxgui/frontend.py:487
#, 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:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid "%s - channel error"
msgstr "%s - channel error"
-#: ../pyhoca/wxgui/frontend.py:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -653,12 +662,12 @@ msgstr ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
-#: ../pyhoca/wxgui/frontend.py:531 ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:532 ../pyhoca/wxgui/frontend.py:536
#, python-format
msgid "%s - session failure"
msgstr "%s - session failure"
-#: ../pyhoca/wxgui/frontend.py:531
+#: ../pyhoca/wxgui/frontend.py:532
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
@@ -667,12 +676,12 @@ msgstr ""
"The command ,,%s'' is not available on X2go server\n"
"%s)."
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid "%s - session warning"
msgstr "%s - session warning"
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -683,7 +692,7 @@ msgstr ""
"been denied by the X2go server. This is a common issue with SSH, it might "
"help to restart the X2go server's SSH daemon."
-#: ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:536
#, python-format
msgid ""
"Forwarding tunnel request to [%s]:%s for session %s was denied by remote "
@@ -692,36 +701,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:537
+#: ../pyhoca/wxgui/frontend.py:538
#, python-format
msgid "%s - audio warning"
msgstr "%s - audio warning"
-#: ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/frontend.py:538
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:539 ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:540 ../pyhoca/wxgui/frontend.py:542
#, python-format
msgid "%s - audio error"
msgstr "%s - audio error"
-#: ../pyhoca/wxgui/frontend.py:539
+#: ../pyhoca/wxgui/frontend.py:540
msgid "The X2go PulseAudio system could not be started."
msgstr "The X2go PulseAudio system could not be started."
-#: ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:542
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr "The X2go PulseAudio system has died unexpectedly."
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid "%s - audio problem"
msgstr "%s - audio problem"
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
@@ -730,12 +739,12 @@ msgstr ""
"The audio connection could not be set up for this session.\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid "%s - print job"
msgstr "%s - print job"
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid ""
"Opening print job dialog not implemented yet!!!\n"
@@ -744,12 +753,12 @@ msgstr ""
"Opening print job dialog not implemented yet!!!\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid "%s - print error"
msgstr "%s - print error"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid ""
"%s\n"
@@ -760,12 +769,12 @@ msgstr ""
"...caused by session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:570 ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:571 ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid "%s - start"
msgstr "%s - start"
-#: ../pyhoca/wxgui/frontend.py:570
+#: ../pyhoca/wxgui/frontend.py:571
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -774,7 +783,7 @@ msgstr ""
"New X2go session starting up...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -783,12 +792,12 @@ msgstr ""
"Another client started X2go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:574 ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:575 ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid "%s - resume"
msgstr "%s - resume"
-#: ../pyhoca/wxgui/frontend.py:574
+#: ../pyhoca/wxgui/frontend.py:575
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -797,7 +806,7 @@ msgstr ""
"Resuming X2go session...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -806,12 +815,12 @@ msgstr ""
"Another client resumed X2go session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid "%s - running"
msgstr "%s - running"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid ""
"Found already running session\n"
@@ -820,12 +829,12 @@ msgstr ""
"Found already running session\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -834,12 +843,12 @@ msgstr ""
"X2go Session has been suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid "%s - terminate"
msgstr "%s - terminate"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -848,5 +857,8 @@ msgstr ""
"X2go Session has terminated\n"
"%s"
+#~ msgid "Profile icon"
+#~ msgstr "Profile icon"
+
#~ msgid "Arts"
#~ msgstr "Arts"
diff --git a/po/es.po b/po/es.po
index 05af93d..7d7a8fc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-22 13:01+0100\n"
-"PO-Revision-Date: 2011-01-11 14:24+0100\n"
-"Last-Translator: Mike Gabriel <m.gabriel at das-netzwerkteam.de>\n"
+"POT-Creation-Date: 2011-02-24 15:35+0100\n"
+"PO-Revision-Date: 2011-02-24 15:33+0100\n"
+"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: es <oceanosoftlapalma at gmail.com>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -54,16 +54,16 @@ msgid "Cancel"
msgstr "Cancelar"
#: ../pyhoca/wxgui/logon.py:235 ../pyhoca/wxgui/logon.py:267
-#: ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/frontend.py:310
#, python-format
msgid "%s - connect failure"
msgstr "%s - fallo en la conexión"
-#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:310
msgid "User is not allowed to start X2go sessions!"
msgstr "El usuario no tiene permisos para iniciar X2go sesiones!"
-#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:314
#, python-format
msgid "%s - connect"
msgstr "%s - conectado"
@@ -90,14 +90,14 @@ msgid "Authentication to the SSH proxy server failed!"
msgstr "Nombre de usuario o cantraseña erróneo en el servidor proxy SSH!"
#: ../pyhoca/wxgui/logon.py:280 ../pyhoca/wxgui/logon.py:286
-#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:326
-#: ../pyhoca/wxgui/frontend.py:329 ../pyhoca/wxgui/frontend.py:332
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:327
+#: ../pyhoca/wxgui/frontend.py:330 ../pyhoca/wxgui/frontend.py:333
+#: ../pyhoca/wxgui/frontend.py:336
#, python-format
msgid "%s - connect error"
msgstr "%s - error en la conexión"
-#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:338
+#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:339
#, fuzzy, python-format
msgid "%s - key error"
msgstr "%s - error en la conexión"
@@ -199,6 +199,15 @@ msgstr "Abrir selector de aplicaciones"
msgid "Save incoming file as ..."
msgstr "Guardar archivo recibido como ..."
+#. boxes for all tabs
+#: ../pyhoca/wxgui/profilemanager.py:121
+msgid "Profile "
+msgstr "Perfil"
+
+#: ../pyhoca/wxgui/profilemanager.py:122
+msgid "Session"
+msgstr "Sesión"
+
#: ../pyhoca/wxgui/profilemanager.py:123
msgid "Server"
msgstr "Servidor"
@@ -239,16 +248,16 @@ msgstr "Importar Archivo"
#. ## widgets for the SESSION tab
#. ##
#: ../pyhoca/wxgui/profilemanager.py:136
-msgid "Profile name"
-msgstr "Nombre del perfil"
+msgid "Name"
+msgstr "Nombre"
#: ../pyhoca/wxgui/profilemanager.py:146
-msgid "Profile icon"
-msgstr "Icono del perfil"
+msgid "Icon"
+msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:148
-msgid "Session type"
-msgstr "Tipo de sesión"
+msgid "Type"
+msgstr "Tipo"
#: ../pyhoca/wxgui/profilemanager.py:150
msgid "Application"
@@ -456,66 +465,66 @@ msgstr "PyHoca-GUI Gestor de Perfiles - %s (conectado)"
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Gestor de Perfiles - %s"
-#: ../pyhoca/wxgui/profilemanager.py:613
+#: ../pyhoca/wxgui/profilemanager.py:638
msgid "Session Profile"
msgstr "Perfil de Sesión"
-#: ../pyhoca/wxgui/profilemanager.py:614
+#: ../pyhoca/wxgui/profilemanager.py:639
msgid "Connection"
msgstr "Conexión"
-#: ../pyhoca/wxgui/profilemanager.py:615
+#: ../pyhoca/wxgui/profilemanager.py:640
msgid "Settings"
msgstr "Opciones"
-#: ../pyhoca/wxgui/profilemanager.py:616
+#: ../pyhoca/wxgui/profilemanager.py:641
msgid "Sharing"
msgstr "Compartir"
-#: ../pyhoca/wxgui/profilemanager.py:980
+#: ../pyhoca/wxgui/profilemanager.py:1005
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Iconos (*.png)|*.png|Todos (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:983
+#: ../pyhoca/wxgui/profilemanager.py:1008
msgid "Choose an icon for this session profile"
msgstr "Elige un icono para este perfil de sesión"
-#: ../pyhoca/wxgui/profilemanager.py:1091
+#: ../pyhoca/wxgui/profilemanager.py:1116
msgid "All files (*.*)|*"
msgstr "Todos (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1093
-#: ../pyhoca/wxgui/profilemanager.py:1108
+#: ../pyhoca/wxgui/profilemanager.py:1118
+#: ../pyhoca/wxgui/profilemanager.py:1133
msgid "Choose a public SSH key"
msgstr "Elige una clave pública SSH"
-#: ../pyhoca/wxgui/profilemanager.py:1242
+#: ../pyhoca/wxgui/profilemanager.py:1267
msgid "Choose a folder to share within a session"
msgstr "Elige la carpeta que quieres compartir en la conexión"
-#: ../pyhoca/wxgui/profilemanager.py:1307 ../pyhoca/wxgui/menus_taskbar.py:86
+#: ../pyhoca/wxgui/profilemanager.py:1332 ../pyhoca/wxgui/menus_taskbar.py:86
msgid "Profile Manager"
msgstr "Gestor de Sesiones"
-#: ../pyhoca/wxgui/profilemanager.py:1307
+#: ../pyhoca/wxgui/profilemanager.py:1332
msgid "Profile name is missing, profile unusable!!!"
msgstr "Nombre de pefil no encontrado o no válido!!!"
-#: ../pyhoca/wxgui/profilemanager.py:1329
+#: ../pyhoca/wxgui/profilemanager.py:1354
#, python-format
msgid "%s - profile added"
msgstr "%s - añadido el perfil"
-#: ../pyhoca/wxgui/profilemanager.py:1330
+#: ../pyhoca/wxgui/profilemanager.py:1355
msgid "A new session profile has been added."
msgstr "Se ha añadido un nuevo perfil de sesión."
-#: ../pyhoca/wxgui/profilemanager.py:1334
+#: ../pyhoca/wxgui/profilemanager.py:1359
#, python-format
msgid "%s - modified"
msgstr "%s - modificado"
-#: ../pyhoca/wxgui/profilemanager.py:1335
+#: ../pyhoca/wxgui/profilemanager.py:1360
msgid "Changes to profile have been saved."
msgstr "Se han guardado los cambios en el perfil."
@@ -601,51 +610,51 @@ msgstr "Iniciar/Retomar Sesión"
msgid "Connect Server"
msgstr "Conectar con el Servidor"
-#: ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/frontend.py:314
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:335
+#: ../pyhoca/wxgui/frontend.py:336
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "¡El protocolo de comunicaciones está incompleto! Inténtalo otra vez..."
-#: ../pyhoca/wxgui/frontend.py:414
+#: ../pyhoca/wxgui/frontend.py:415
msgid "Cleaning X2go sessions..."
msgstr "Limpieado sesiones X2go..."
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
#, python-format
msgid "%s - disconnect"
msgstr "%s - desconectado"
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
msgid "X2go Profile is now disconnected."
msgstr "Se ha desconectado el Perfil X2go."
-#: ../pyhoca/wxgui/frontend.py:442
+#: ../pyhoca/wxgui/frontend.py:443
msgid "New Session Profile"
msgstr "Nuevo Perfil de Sesión"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
#, python-format
msgid "%s - profile deleted"
msgstr "%s - perfil eliminado"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
msgid "The session profile has been deleted."
msgstr "Se ha eliminado el perfil de sesión."
-#: ../pyhoca/wxgui/frontend.py:486
+#: ../pyhoca/wxgui/frontend.py:487
#, 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:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid "%s - channel error"
msgstr "%s - error en el canal"
-#: ../pyhoca/wxgui/frontend.py:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -654,24 +663,24 @@ msgstr ""
"La conexión con el servidor %s ha finalizado inesperadamente! Intenta "
"iniciar sesión nuevamente..."
-#: ../pyhoca/wxgui/frontend.py:531 ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:532 ../pyhoca/wxgui/frontend.py:536
#, fuzzy, python-format
msgid "%s - session failure"
msgstr "%s - fallo en la conexión"
-#: ../pyhoca/wxgui/frontend.py:531
+#: ../pyhoca/wxgui/frontend.py:532
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
"%s)."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, fuzzy, python-format
msgid "%s - session warning"
msgstr "%s - fallo en la conexión"
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -679,54 +688,54 @@ msgid ""
"help to restart the X2go server's SSH daemon."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:536
#, 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:537
+#: ../pyhoca/wxgui/frontend.py:538
#, fuzzy, python-format
msgid "%s - audio warning"
msgstr "%s - fallo en la conexión"
-#: ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/frontend.py:538
msgid ""
"The X2go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:539 ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:540 ../pyhoca/wxgui/frontend.py:542
#, fuzzy, python-format
msgid "%s - audio error"
msgstr "%s - error de impresión"
-#: ../pyhoca/wxgui/frontend.py:539
+#: ../pyhoca/wxgui/frontend.py:540
msgid "The X2go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:542
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid "%s - print job"
msgstr "%s - imprimir"
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid ""
"Opening print job dialog not implemented yet!!!\n"
@@ -735,12 +744,12 @@ msgstr ""
"¡¡¡El cuadro de diálogo de imprimir no ha sido desarrollado todavía!!!\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid "%s - print error"
msgstr "%s - error de impresión"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid ""
"%s\n"
@@ -751,12 +760,12 @@ msgstr ""
"...provocado por la sesión\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:570 ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:571 ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid "%s - start"
msgstr "%s - inicio"
-#: ../pyhoca/wxgui/frontend.py:570
+#: ../pyhoca/wxgui/frontend.py:571
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -765,7 +774,7 @@ msgstr ""
"Iniciaciando nueva sesión X2go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -774,12 +783,12 @@ msgstr ""
"Otro cliente ha iniciado sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:574 ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:575 ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid "%s - resume"
msgstr "%s - retornar a la sesión"
-#: ../pyhoca/wxgui/frontend.py:574
+#: ../pyhoca/wxgui/frontend.py:575
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -788,7 +797,7 @@ msgstr ""
"Retornando sesión X2go...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -797,12 +806,12 @@ msgstr ""
"Otro cliente retornó a la sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid "%s - running"
msgstr "%s - en ejecución"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid ""
"Found already running session\n"
@@ -811,12 +820,12 @@ msgstr ""
"La sesión ya está en ejecución\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid "%s - suspend"
msgstr "%s - suspender"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -825,12 +834,12 @@ msgstr ""
"Se ha suspendido la Sesión X2go\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid "%s - terminate"
msgstr "%s - finalizar"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -839,5 +848,8 @@ msgstr ""
"Se ha finalizado la sesión X2go\n"
"%s"
+#~ msgid "Profile icon"
+#~ msgstr "Icono del perfil"
+
#~ msgid "Arts"
#~ msgstr "Arts"
diff --git a/po/nl.po b/po/nl.po
index eaeb20b..5193db0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PyHoca-GUI VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-22 13:01+0100\n"
-"PO-Revision-Date: 2011-01-10 17:32+0100\n"
-"Last-Translator: Dick Kniep <dick.kniep at lindix.nl>\n"
+"POT-Creation-Date: 2011-02-24 15:35+0100\n"
+"PO-Revision-Date: 2011-02-24 15:34+0100\n"
+"Last-Translator: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>\n"
"Language-Team: nl <dick.kniep at lindix.nl>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -54,16 +54,16 @@ msgid "Cancel"
msgstr "Afbreken"
#: ../pyhoca/wxgui/logon.py:235 ../pyhoca/wxgui/logon.py:267
-#: ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/frontend.py:310
#, python-format
msgid "%s - connect failure"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:310
msgid "User is not allowed to start X2go sessions!"
msgstr "Gebruiker mag geen X2go sessie starten!"
-#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:314
#, python-format
msgid "%s - connect"
msgstr "%s - verbinden"
@@ -90,14 +90,14 @@ msgid "Authentication to the SSH proxy server failed!"
msgstr "Authenticatie via SSH Proxy Server mislukt!"
#: ../pyhoca/wxgui/logon.py:280 ../pyhoca/wxgui/logon.py:286
-#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:326
-#: ../pyhoca/wxgui/frontend.py:329 ../pyhoca/wxgui/frontend.py:332
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:327
+#: ../pyhoca/wxgui/frontend.py:330 ../pyhoca/wxgui/frontend.py:333
+#: ../pyhoca/wxgui/frontend.py:336
#, python-format
msgid "%s - connect error"
msgstr "%s - Verbindingsfout"
-#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:338
+#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:339
#, fuzzy, python-format
msgid "%s - key error"
msgstr "%s - Verbindingsfout"
@@ -196,6 +196,16 @@ msgstr "Open dialoog, om Applicatie te kiezen"
msgid "Save incoming file as ..."
msgstr "Opslaan bestand als ..."
+#. boxes for all tabs
+#: ../pyhoca/wxgui/profilemanager.py:121
+#, fuzzy
+msgid "Profile "
+msgstr "Profile"
+
+#: ../pyhoca/wxgui/profilemanager.py:122
+msgid "Session"
+msgstr "Sessie"
+
#: ../pyhoca/wxgui/profilemanager.py:123
msgid "Server"
msgstr "Server"
@@ -236,16 +246,16 @@ msgstr "Bestands import"
#. ## widgets for the SESSION tab
#. ##
#: ../pyhoca/wxgui/profilemanager.py:136
-msgid "Profile name"
-msgstr "Profile"
+msgid "Name"
+msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:146
-msgid "Profile icon"
-msgstr "Profile icon"
+msgid "Icon"
+msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:148
-msgid "Session type"
-msgstr "Sessie type"
+msgid "Type"
+msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:150
msgid "Application"
@@ -453,66 +463,66 @@ msgstr "PyHoca-GUI Profile manager - %s (verbonden)"
msgid "PyHoca-GUI Profile Manager - %s"
msgstr "PyHoca-GUI Profile manager - %s"
-#: ../pyhoca/wxgui/profilemanager.py:613
+#: ../pyhoca/wxgui/profilemanager.py:638
msgid "Session Profile"
msgstr "Sessie Profile"
-#: ../pyhoca/wxgui/profilemanager.py:614
+#: ../pyhoca/wxgui/profilemanager.py:639
msgid "Connection"
msgstr "Verbinding"
-#: ../pyhoca/wxgui/profilemanager.py:615
+#: ../pyhoca/wxgui/profilemanager.py:640
msgid "Settings"
msgstr "Instellingen"
-#: ../pyhoca/wxgui/profilemanager.py:616
+#: ../pyhoca/wxgui/profilemanager.py:641
msgid "Sharing"
msgstr "Delen"
-#: ../pyhoca/wxgui/profilemanager.py:980
+#: ../pyhoca/wxgui/profilemanager.py:1005
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr "Icon Bestanden (*.png)|*.png|Alle Bestanden (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:983
+#: ../pyhoca/wxgui/profilemanager.py:1008
msgid "Choose an icon for this session profile"
msgstr "Icon voor dit Profile kiezen"
-#: ../pyhoca/wxgui/profilemanager.py:1091
+#: ../pyhoca/wxgui/profilemanager.py:1116
msgid "All files (*.*)|*"
msgstr "Alle Bestanden (*.*)|*"
-#: ../pyhoca/wxgui/profilemanager.py:1093
-#: ../pyhoca/wxgui/profilemanager.py:1108
+#: ../pyhoca/wxgui/profilemanager.py:1118
+#: ../pyhoca/wxgui/profilemanager.py:1133
msgid "Choose a public SSH key"
msgstr "Kies een public SSH-key"
-#: ../pyhoca/wxgui/profilemanager.py:1242
+#: ../pyhoca/wxgui/profilemanager.py:1267
msgid "Choose a folder to share within a session"
msgstr "Kies een map om te delen"
-#: ../pyhoca/wxgui/profilemanager.py:1307 ../pyhoca/wxgui/menus_taskbar.py:86
+#: ../pyhoca/wxgui/profilemanager.py:1332 ../pyhoca/wxgui/menus_taskbar.py:86
msgid "Profile Manager"
msgstr "Profile manager"
-#: ../pyhoca/wxgui/profilemanager.py:1307
+#: ../pyhoca/wxgui/profilemanager.py:1332
msgid "Profile name is missing, profile unusable!!!"
msgstr "Profile naam ontbreekt, kan niet gebruikt worden!!!"
-#: ../pyhoca/wxgui/profilemanager.py:1329
+#: ../pyhoca/wxgui/profilemanager.py:1354
#, python-format
msgid "%s - profile added"
msgstr "%s - Profile toegevoegd"
-#: ../pyhoca/wxgui/profilemanager.py:1330
+#: ../pyhoca/wxgui/profilemanager.py:1355
msgid "A new session profile has been added."
msgstr "Een nieuw Profile is toegevoegd"
-#: ../pyhoca/wxgui/profilemanager.py:1334
+#: ../pyhoca/wxgui/profilemanager.py:1359
#, python-format
msgid "%s - modified"
msgstr "%s - gewijzigd"
-#: ../pyhoca/wxgui/profilemanager.py:1335
+#: ../pyhoca/wxgui/profilemanager.py:1360
msgid "Changes to profile have been saved."
msgstr "Wijzigingen in het profile zijn opgeslagen."
@@ -598,51 +608,51 @@ msgstr "Sessie starten/hervatten"
msgid "Connect Server"
msgstr "Verbinden met Server"
-#: ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/frontend.py:314
msgid "Public SSH key authentication has been successful."
msgstr "Public SSH-key authenticatie is gelukt."
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/frontend.py:336
msgid "Authentication protocol communication incomplete! Try again..."
msgstr "Authenticatie was niet volledig! Opnieuw proberen..."
-#: ../pyhoca/wxgui/frontend.py:414
+#: ../pyhoca/wxgui/frontend.py:415
msgid "Cleaning X2go sessions..."
msgstr "Eindig X2go Sessies..."
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
#, python-format
msgid "%s - disconnect"
msgstr "%s - verbinding verbreken"
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
msgid "X2go Profile is now disconnected."
msgstr "X2go Profil is nu niet meer verbonden."
-#: ../pyhoca/wxgui/frontend.py:442
+#: ../pyhoca/wxgui/frontend.py:443
msgid "New Session Profile"
msgstr "Nieuw Profile"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
#, python-format
msgid "%s - profile deleted"
msgstr "%s - Profile verwijderd"
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
msgid "The session profile has been deleted."
msgstr "Het Profile wordt verwijderd."
-#: ../pyhoca/wxgui/frontend.py:486
+#: ../pyhoca/wxgui/frontend.py:487
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr "%s - deel lokale map met dit Profile"
-#: ../pyhoca/wxgui/frontend.py:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid "%s - channel error"
msgstr "%s - Verbindingsfout"
-#: ../pyhoca/wxgui/frontend.py:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
@@ -651,24 +661,24 @@ msgstr ""
"De Verbinding met de server %s werd onverwacht verbroken! Probeer om u "
"opnieuw aan te melden..."
-#: ../pyhoca/wxgui/frontend.py:531 ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:532 ../pyhoca/wxgui/frontend.py:536
#, fuzzy, python-format
msgid "%s - session failure"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/frontend.py:531
+#: ../pyhoca/wxgui/frontend.py:532
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
"%s)."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, fuzzy, python-format
msgid "%s - session warning"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -676,54 +686,54 @@ msgid ""
"help to restart the X2go server's SSH daemon."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:536
#, 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:537
+#: ../pyhoca/wxgui/frontend.py:538
#, fuzzy, python-format
msgid "%s - audio warning"
msgstr "%s - verbinden mislukt"
-#: ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/frontend.py:538
msgid ""
"The X2go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:539 ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:540 ../pyhoca/wxgui/frontend.py:542
#, fuzzy, python-format
msgid "%s - audio error"
msgstr "%s - Printfout"
-#: ../pyhoca/wxgui/frontend.py:539
+#: ../pyhoca/wxgui/frontend.py:540
msgid "The X2go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:542
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid "%s - print job"
msgstr "%s - print job"
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid ""
"Opening print job dialog not implemented yet!!!\n"
@@ -732,12 +742,12 @@ msgstr ""
"De Print job dialog is nog niet geimplementeerd!!!\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid "%s - print error"
msgstr "%s - Printfout"
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid ""
"%s\n"
@@ -748,12 +758,12 @@ msgstr ""
"...veroorzaakt door sessie\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:570 ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:571 ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid "%s - start"
msgstr "%s - Start"
-#: ../pyhoca/wxgui/frontend.py:570
+#: ../pyhoca/wxgui/frontend.py:571
#, python-format
msgid ""
"New X2go session starting up...\n"
@@ -762,7 +772,7 @@ msgstr ""
"Neue X2go sessie wordt gestart...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid ""
"Another client started X2go session\n"
@@ -771,12 +781,12 @@ msgstr ""
"Een andere X2go-client heeft deze sessie gestart\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:574 ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:575 ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid "%s - resume"
msgstr "%s - hervatten"
-#: ../pyhoca/wxgui/frontend.py:574
+#: ../pyhoca/wxgui/frontend.py:575
#, python-format
msgid ""
"Resuming X2go session...\n"
@@ -785,7 +795,7 @@ msgstr ""
"X2go Sessie wordt hervat...\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid ""
"Another client resumed X2go session\n"
@@ -794,12 +804,12 @@ msgstr ""
"Een andere X2go-client heeft de Sessie hervat\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid "%s - running"
msgstr "%s - actief"
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid ""
"Found already running session\n"
@@ -808,12 +818,12 @@ msgstr ""
"Reeds actieve sessie gevonden\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid "%s - suspend"
msgstr "%s - suspend"
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid ""
"X2go Session has been suspended\n"
@@ -822,12 +832,12 @@ msgstr ""
"X2go Sessie is suspended\n"
"%s"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid "%s - terminate"
msgstr "%s - beeindigen"
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid ""
"X2go Session has terminated\n"
@@ -836,5 +846,8 @@ msgstr ""
"X2go Sessie wordt beeindigd\n"
"%s"
+#~ msgid "Profile icon"
+#~ msgstr "Profile icon"
+
#~ msgid "Arts"
#~ msgstr "Arts"
diff --git a/po/pyhoca-gui.pot b/po/pyhoca-gui.pot
index 4861bd7..48a0433 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-02-22 13:03+0100\n"
+"POT-Creation-Date: 2011-02-24 15:35+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,16 +51,16 @@ msgid "Cancel"
msgstr ""
#: ../pyhoca/wxgui/logon.py:235 ../pyhoca/wxgui/logon.py:267
-#: ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/frontend.py:310
#, python-format
msgid "%s - connect failure"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:309
+#: ../pyhoca/wxgui/logon.py:236 ../pyhoca/wxgui/frontend.py:310
msgid "User is not allowed to start X2go sessions!"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/logon.py:241 ../pyhoca/wxgui/frontend.py:314
#, python-format
msgid "%s - connect"
msgstr ""
@@ -87,14 +87,14 @@ msgid "Authentication to the SSH proxy server failed!"
msgstr ""
#: ../pyhoca/wxgui/logon.py:280 ../pyhoca/wxgui/logon.py:286
-#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:326
-#: ../pyhoca/wxgui/frontend.py:329 ../pyhoca/wxgui/frontend.py:332
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/logon.py:295 ../pyhoca/wxgui/frontend.py:327
+#: ../pyhoca/wxgui/frontend.py:330 ../pyhoca/wxgui/frontend.py:333
+#: ../pyhoca/wxgui/frontend.py:336
#, python-format
msgid "%s - connect error"
msgstr ""
-#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:338
+#: ../pyhoca/wxgui/logon.py:291 ../pyhoca/wxgui/frontend.py:339
#, python-format
msgid "%s - key error"
msgstr ""
@@ -187,6 +187,15 @@ msgstr ""
msgid "Save incoming file as ..."
msgstr ""
+#. boxes for all tabs
+#: ../pyhoca/wxgui/profilemanager.py:121
+msgid "Profile "
+msgstr ""
+
+#: ../pyhoca/wxgui/profilemanager.py:122
+msgid "Session"
+msgstr ""
+
#: ../pyhoca/wxgui/profilemanager.py:123
msgid "Server"
msgstr ""
@@ -227,15 +236,15 @@ msgstr ""
#. ## widgets for the SESSION tab
#. ##
#: ../pyhoca/wxgui/profilemanager.py:136
-msgid "Profile name"
+msgid "Name"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:146
-msgid "Profile icon"
+msgid "Icon"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:148
-msgid "Session type"
+msgid "Type"
msgstr ""
#: ../pyhoca/wxgui/profilemanager.py:150
@@ -444,66 +453,66 @@ msgstr ""
msgid "PyHoca-GUI Profile Manager - %s"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:613
+#: ../pyhoca/wxgui/profilemanager.py:638
msgid "Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:614
+#: ../pyhoca/wxgui/profilemanager.py:639
msgid "Connection"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:615
+#: ../pyhoca/wxgui/profilemanager.py:640
msgid "Settings"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:616
+#: ../pyhoca/wxgui/profilemanager.py:641
msgid "Sharing"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:980
+#: ../pyhoca/wxgui/profilemanager.py:1005
msgid "Icon Files (*.png)|*.png|All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:983
+#: ../pyhoca/wxgui/profilemanager.py:1008
msgid "Choose an icon for this session profile"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1091
+#: ../pyhoca/wxgui/profilemanager.py:1116
msgid "All files (*.*)|*"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1093
-#: ../pyhoca/wxgui/profilemanager.py:1108
+#: ../pyhoca/wxgui/profilemanager.py:1118
+#: ../pyhoca/wxgui/profilemanager.py:1133
msgid "Choose a public SSH key"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1242
+#: ../pyhoca/wxgui/profilemanager.py:1267
msgid "Choose a folder to share within a session"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1307 ../pyhoca/wxgui/menus_taskbar.py:86
+#: ../pyhoca/wxgui/profilemanager.py:1332 ../pyhoca/wxgui/menus_taskbar.py:86
msgid "Profile Manager"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1307
+#: ../pyhoca/wxgui/profilemanager.py:1332
msgid "Profile name is missing, profile unusable!!!"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1329
+#: ../pyhoca/wxgui/profilemanager.py:1354
#, python-format
msgid "%s - profile added"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1330
+#: ../pyhoca/wxgui/profilemanager.py:1355
msgid "A new session profile has been added."
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1334
+#: ../pyhoca/wxgui/profilemanager.py:1359
#, python-format
msgid "%s - modified"
msgstr ""
-#: ../pyhoca/wxgui/profilemanager.py:1335
+#: ../pyhoca/wxgui/profilemanager.py:1360
msgid "Changes to profile have been saved."
msgstr ""
@@ -589,75 +598,75 @@ msgstr ""
msgid "Connect Server"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:313
+#: ../pyhoca/wxgui/frontend.py:314
msgid "Public SSH key authentication has been successful."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:335
+#: ../pyhoca/wxgui/frontend.py:336
msgid "Authentication protocol communication incomplete! Try again..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:414
+#: ../pyhoca/wxgui/frontend.py:415
msgid "Cleaning X2go sessions..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
#, python-format
msgid "%s - disconnect"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:434
+#: ../pyhoca/wxgui/frontend.py:435
msgid "X2go Profile is now disconnected."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:442
+#: ../pyhoca/wxgui/frontend.py:443
msgid "New Session Profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
#, python-format
msgid "%s - profile deleted"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:471
+#: ../pyhoca/wxgui/frontend.py:472
msgid "The session profile has been deleted."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:486
+#: ../pyhoca/wxgui/frontend.py:487
#, python-format
msgid "%s - share local folder with sessions of this profile"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid "%s - channel error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:528
+#: ../pyhoca/wxgui/frontend.py:529
#, python-format
msgid ""
"Lost connection to server %s unexpectedly! Try to re-authenticate to the "
"server..."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:531 ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:532 ../pyhoca/wxgui/frontend.py:536
#, python-format
msgid "%s - session failure"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:531
+#: ../pyhoca/wxgui/frontend.py:532
#, python-format
msgid ""
"The command ,,%s'' is not available on X2go server\n"
"%s)."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid "%s - session warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:533
+#: ../pyhoca/wxgui/frontend.py:534
#, python-format
msgid ""
"Reverse TCP port forwarding request for session %s to server port %s has "
@@ -665,66 +674,66 @@ msgid ""
"help to restart the X2go server's SSH daemon."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:535
+#: ../pyhoca/wxgui/frontend.py:536
#, 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:537
+#: ../pyhoca/wxgui/frontend.py:538
#, python-format
msgid "%s - audio warning"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:537
+#: ../pyhoca/wxgui/frontend.py:538
msgid ""
"The X2go PulseAudio system is not available within Remote Desktop sessions."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:539 ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:540 ../pyhoca/wxgui/frontend.py:542
#, python-format
msgid "%s - audio error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:539
+#: ../pyhoca/wxgui/frontend.py:540
msgid "The X2go PulseAudio system could not be started."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:541
+#: ../pyhoca/wxgui/frontend.py:542
msgid "The X2go PulseAudio system has died unexpectedly."
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid "%s - audio problem"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:543
+#: ../pyhoca/wxgui/frontend.py:544
#, python-format
msgid ""
"The audio connection could not be set up for this session.\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid "%s - print job"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:547
+#: ../pyhoca/wxgui/frontend.py:548
#, python-format
msgid ""
"Opening print job dialog not implemented yet!!!\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid "%s - print error"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:568
+#: ../pyhoca/wxgui/frontend.py:569
#, python-format
msgid ""
"%s\n"
@@ -732,74 +741,74 @@ msgid ""
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:570 ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:571 ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid "%s - start"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:570
+#: ../pyhoca/wxgui/frontend.py:571
#, python-format
msgid ""
"New X2go session starting up...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:572
+#: ../pyhoca/wxgui/frontend.py:573
#, python-format
msgid ""
"Another client started X2go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:574 ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:575 ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid "%s - resume"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:574
+#: ../pyhoca/wxgui/frontend.py:575
#, python-format
msgid ""
"Resuming X2go session...\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:576
+#: ../pyhoca/wxgui/frontend.py:577
#, python-format
msgid ""
"Another client resumed X2go session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid "%s - running"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:578
+#: ../pyhoca/wxgui/frontend.py:579
#, python-format
msgid ""
"Found already running session\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid "%s - suspend"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:580
+#: ../pyhoca/wxgui/frontend.py:581
#, python-format
msgid ""
"X2go Session has been suspended\n"
"%s"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid "%s - terminate"
msgstr ""
-#: ../pyhoca/wxgui/frontend.py:588
+#: ../pyhoca/wxgui/frontend.py:589
#, python-format
msgid ""
"X2go Session has terminated\n"
diff --git a/pyhoca-gui b/pyhoca-gui
index 1438b88..e947a84 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -289,6 +289,7 @@ def main():
lang = gettext.translation('pyhoca-gui', localedir=locale_basepath, languages=['en'], )
lang.install(unicode=True)
else:
+ print locale_basepath
gettext.install('pyhoca-gui', localedir=locale_basepath, unicode=True)
if check_running():
diff --git a/pyhoca-gui_0.0.27.0.orig.tar.gz.delta b/pyhoca-gui_0.0.27.0.orig.tar.gz.delta
deleted file mode 100644
index 0c15069..0000000
Binary files a/pyhoca-gui_0.0.27.0.orig.tar.gz.delta and /dev/null differ
diff --git a/pyhoca-gui_0.0.27.0.orig.tar.gz.id b/pyhoca-gui_0.0.27.0.orig.tar.gz.id
deleted file mode 100644
index 224d3da..0000000
--- a/pyhoca-gui_0.0.27.0.orig.tar.gz.id
+++ /dev/null
@@ -1 +0,0 @@
-98b591c127312c76f50968d9f5604d3fe08733cc
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index aed9bf2..5b99d03 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -118,22 +118,22 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.tab_SharedFilesAndFolders = wx.Panel(self.X2goTabs, -1)
# boxes for all tabs
- self.staticbox_Profile = wx.StaticBox(self.tab_Session, -1, '')
- self.staticbox_SessionType = wx.StaticBox(self.tab_Session, -1, '')
- self.staticbox_Server = wx.StaticBox(self.tab_Connection, -1, _(u"Server"))
- self.staticbox_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, _(u"Connection Link Speed"))
- self.staticbox_Compression = wx.StaticBox(self.tab_Connection, -1, _(u"Compression"))
- self.staticbox_Display = wx.StaticBox(self.tab_Settings, -1, _(u"Display"))
- self.staticbox_Keyboard = wx.StaticBox(self.tab_Settings, -1, _(u"Keyboard"))
- self.staticbox_Sound = wx.StaticBox(self.tab_Settings, -1, _(u"Sound"))
- self.staticbox_Printing = wx.StaticBox(self.tab_Settings, -1, _(u"Printing"))
- self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, _(u"Folder Exports"))
- self.staticbox_FileDropbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, _(u"File Import"))
+ self.staticbox_Profile = wx.StaticBox(self.tab_Session, -1, ' %s ' % _(u'Profile '))
+ self.staticbox_SessionType = wx.StaticBox(self.tab_Session, -1, ' %s ' % _(u'Session'))
+ self.staticbox_Server = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Server"))
+ self.staticbox_LinkSpeed = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Connection Link Speed"))
+ self.staticbox_Compression = wx.StaticBox(self.tab_Connection, -1, ' %s ' % _(u"Compression"))
+ self.staticbox_Display = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Display"))
+ self.staticbox_Keyboard = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Keyboard"))
+ self.staticbox_Sound = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Sound"))
+ self.staticbox_Printing = wx.StaticBox(self.tab_Settings, -1, ' %s ' % _(u"Printing"))
+ self.staticbox_FolderSharing = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"Folder Exports"))
+ self.staticbox_FileDropbox = wx.StaticBox(self.tab_SharedFilesAndFolders, -1, ' %s ' % _(u"File Import"))
###
### widgets for the SESSION tab
###
- self.ProfileNameLabel = wx.StaticText(self.tab_Session, -1, _(u"Profile name")+":")
+ self.ProfileNameLabel = wx.StaticText(self.tab_Session, -1, _(u"Name")+":")
self.ProfileName = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(200,20))
_share_location = os.path.split(_icons_location)[0]
if 'icon' in self.profile_config:
@@ -143,9 +143,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
if not os.path.exists(path_to_icon) or not 'icon' in self.profile_config:
path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location)
self.IconPath = path_to_icon
- self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Profile icon")+':')
+ self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, _(u"Icon")+':')
self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY))
- self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Session type")+':')
+ self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+':')
self.SessionType = wx.ComboBox(self.tab_Session, -1, choices=self.sessionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+':')
self.Application = wx.ComboBox(self.tab_Session, -1, choices=self.applicationChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY)
@@ -385,11 +385,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_1 = wx.BoxSizer(wx.VERTICAL)
sizer_1_1 = wx.StaticBoxSizer(self.staticbox_Profile, wx.VERTICAL)
sizer_1_1_1 = wx.FlexGridSizer(2, 2, 7, 9)
- sizer_1_1_1.Add(self.ProfileNameLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_1_1_1.Add(self.ProfileName, 0, 0, 0)
- sizer_1_1_1.Add(self.IconButtonLabel, 0, wx.TOP, 0)
- sizer_1_1_1.Add(self.IconButton, 0, 0, 0)
- sizer_1_1.Add(sizer_1_1_1, 0, wx.EXPAND, 0)
+ sizer_1_1_1.Add(self.ProfileNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_1_1_1.Add(self.ProfileName)
+ sizer_1_1_1.Add(self.IconButtonLabel, flag=wx.TOP)
+ sizer_1_1_1.Add(self.IconButton)
+ sizer_1_1.Add(sizer_1_1_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_1_2 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL)
sizer_1_2_1 = wx.GridBagSizer(hgap=3,vgap=6)
@@ -406,137 +406,150 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_1_2_1.Add(self.RDPSettingsLabel, pos=(5,0), flag=wx.ALIGN_CENTRE_VERTICAL, )
sizer_1_2_1.Add(self.RDPServer, pos=(5, 1), )
sizer_1_2_1.Add(self.RDPOptions, pos=(5,2), )
- sizer_1_2.Add(sizer_1_2_1, 0, wx.EXPAND, 0)
+ sizer_1_2.Add(sizer_1_2_1, flag=wx.EXPAND|wx.ALL, border=7)
- sizer_1.Add(sizer_1_1, 1, wx.EXPAND, 0)
- sizer_1.Add(sizer_1_2, 1, wx.EXPAND, 0)
+ sizer_1.Add(sizer_1_1, 1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_1.Add(sizer_1_2, 1, flag=wx.EXPAND|wx.ALL, border=5)
self.tab_Session.SetSizerAndFit(sizer_1)
self.tab_Session.Layout()
## CONNECTION TAB
sizer_2 = wx.BoxSizer(wx.VERTICAL)
sizer_2_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL)
- sizer_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_1_1.Add(self.UserNameLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_1.Add(self.UserName, 0, 0, 0)
- sizer_2_1_1.Add((0,32))
- sizer_2_1_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_1_2.Add(self.HostLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_2.Add(self.Host, 0, 0, 0)
- sizer_2_1_2.Add((0,32))
- sizer_2_1_3 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_1_3.Add(self.SSHPortLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_3.Add(self.SSHPort, 0, 0, 0)
- sizer_2_1_3.Add((16,0))
- sizer_2_1_3.Add(self.SSHKeyFileLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_3.Add((8,0))
- sizer_2_1_3.Add(self.SSHKeyFile, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_3.Add(self.SSHKeyFileBrowseButton, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_3.Add((0,32))
- sizer_2_1_4 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_1_4.Add(self.UseSSHProxy, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_5 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_1_5.Add(self.SSHProxyUserLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_5.Add(self.SSHProxyUser, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_5.Add((16,0))
- sizer_2_1_5.Add(self.SSHProxyKeyFileLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_5.Add((8,0))
- sizer_2_1_5.Add(self.SSHProxyKeyFile, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_5.Add(self.SSHProxyKeyFileBrowseButton, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_5.Add((0,32))
- sizer_2_1_6 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_1_6.Add(self.SSHProxyHostLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_6.Add(self.SSHProxyHost, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_6.Add((0,32))
- sizer_2_1_7 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_1_7.Add(self.SSHProxyTunnelLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_7.Add(self.SSHProxyTunnelFromHost, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_7.Add((4, 0))
- sizer_2_1_7.Add(self.SSHProxyTunnelFromPort, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_7.Add((8, 0))
- sizer_2_1_7.Add(self.SSHProxyTunnelBetweenLabel, 0, wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_1_7.Add((8, 0))
- sizer_2_1_7.Add(self.SSHProxyTunnelToHost, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_7.Add((4, 0))
- sizer_2_1_7.Add(self.SSHProxyTunnelToPort, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_1_7.Add((0,32))
- sizer_2_1.Add(sizer_2_1_1, 0, wx.EXPAND, 0)
- sizer_2_1.Add(sizer_2_1_2, 0, wx.EXPAND, 0)
- sizer_2_1.Add(sizer_2_1_3, 0, wx.EXPAND, 0)
- sizer_2_1.Add(sizer_2_1_4, 0, wx.EXPAND, 0)
- sizer_2_1.Add(sizer_2_1_5, 0, wx.EXPAND, 0)
- sizer_2_1.Add(sizer_2_1_6, 0, wx.EXPAND, 0)
- sizer_2_1.Add(sizer_2_1_7, 0, wx.EXPAND, 0)
+ sizer_2_1_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_2_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_1_1_1.Add(self.UserNameLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_1_1.Add(self.UserName)
+ sizer_2_1_1_1.Add((0,32))
+ sizer_2_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_1_1_2.Add(self.HostLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_1_2.Add(self.Host)
+ sizer_2_1_1_2.Add((0,32))
+ sizer_2_1_1_3 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_1_1_3.Add(self.SSHPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_1_3.Add(self.SSHPort)
+ sizer_2_1_1_3.Add((16,0))
+ sizer_2_1_1_3.Add(self.SSHKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_1_3.Add((8,0))
+ sizer_2_1_1_3.Add(self.SSHKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_1_3.Add(self.SSHKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_1_3.Add((0,32))
+ sizer_2_1_1.Add(sizer_2_1_1_1, flag=wx.EXPAND)
+ sizer_2_1_1.Add(sizer_2_1_1_2, flag=wx.EXPAND)
+ sizer_2_1_1.Add(sizer_2_1_1_3, flag=wx.EXPAND)
+
+ sizer_2_1_2 = wx.BoxSizer(wx.VERTICAL)
+ sizer_2_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_1_2_1.Add(self.UseSSHProxy, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_1_2_2.Add(self.SSHProxyUserLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_2.Add(self.SSHProxyUser, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_2.Add((16,0))
+ sizer_2_1_2_2.Add(self.SSHProxyKeyFileLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_2.Add((8,0))
+ sizer_2_1_2_2.Add(self.SSHProxyKeyFile, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_2.Add(self.SSHProxyKeyFileBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_2.Add((0,32))
+ sizer_2_1_2_3 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_1_2_3.Add(self.SSHProxyHostLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_3.Add(self.SSHProxyHost, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_3.Add((0,32))
+ sizer_2_1_2_4 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_1_2_4.Add(self.SSHProxyTunnelLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_4.Add(self.SSHProxyTunnelFromHost, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_4.Add((4, 0))
+ sizer_2_1_2_4.Add(self.SSHProxyTunnelFromPort, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_4.Add((8, 0))
+ sizer_2_1_2_4.Add(self.SSHProxyTunnelBetweenLabel, flag=wx.ALIGN_CENTRE_VERTICAL|wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_1_2_4.Add((8, 0))
+ sizer_2_1_2_4.Add(self.SSHProxyTunnelToHost, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_4.Add((4, 0))
+ sizer_2_1_2_4.Add(self.SSHProxyTunnelToPort, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_1_2_4.Add((0,32))
+ sizer_2_1_2.Add(sizer_2_1_2_1, flag=wx.EXPAND)
+ sizer_2_1_2.Add(sizer_2_1_2_2, flag=wx.EXPAND)
+ sizer_2_1_2.Add(sizer_2_1_2_3, flag=wx.EXPAND)
+ sizer_2_1_2.Add(sizer_2_1_2_4, flag=wx.EXPAND)
+ sizer_2_1.Add(sizer_2_1_1, flag=wx.EXPAND|wx.ALL, border=7)
+ sizer_2_1.Add(sizer_2_1_2, flag=wx.EXPAND|wx.ALL, border=7)
sizer_2_2 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL)
sizer_2_2_1 = wx.BoxSizer(wx.VERTICAL)
- sizer_2_2_1.Add(self.LinkSpeed, 0, 0, 0)
- sizer_2_2_2 = wx.GridSizer(1,5,0,0)
- sizer_2_2_2.SetMinSize((454/5*6 - 30, -1))
- sizer_2_2_2.Add(self.ModemLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_2_2.Add(self.ISDNLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_2_2.Add(self.ADSLLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_2_2.Add(self.WANLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_2_2.Add(self.LANLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_2.Add(sizer_2_2_1, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_2.Add(sizer_2_2_2, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
+ sizer_2_2_1_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_2_2_1_1.Add(self.LinkSpeed)
+ sizer_2_2_1_2 = wx.GridSizer(1,5,0,0)
+ sizer_2_2_1_2.SetMinSize((454/5*6 - 30, -1))
+ sizer_2_2_1_2.Add(self.ModemLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_2_1_2.Add(self.ISDNLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_2_1_2.Add(self.ADSLLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_2_1_2.Add(self.WANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_2_1_2.Add(self.LANLabel, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_2_1.Add(sizer_2_2_1_1, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_2_1.Add(sizer_2_2_1_2, flag=wx.ALIGN_CENTRE_HORIZONTAL)
+ sizer_2_2.Add(sizer_2_2_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_2_3 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL)
- sizer_2_3_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_3_1.Add(self.CompressionLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_3_1.Add(self.Compression, 0, 0, 0)
- sizer_2_3_1.Add((0,32))
- sizer_2_3_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_2_3_2.Add(self.ImageQualityLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_2_3_2.Add(self.ImageQuality, 0, 0, 0)
- sizer_2_3.Add(sizer_2_3_1, 1, wx.EXPAND, 0)
- sizer_2_3.Add(sizer_2_3_2, 1, wx.EXPAND, 0)
-
- sizer_2.Add(sizer_2_1, 0, wx.EXPAND, 0)
- sizer_2.Add(sizer_2_2, 1, wx.EXPAND, 0)
- sizer_2.Add(sizer_2_3, 0, wx.EXPAND, 0)
+ sizer_2_3_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_2_3_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_3_1_1.Add(self.CompressionLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_3_1_1.Add(self.Compression)
+ sizer_2_3_1_1.Add((0,32))
+ sizer_2_3_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_2_3_1_2.Add(self.ImageQualityLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_2_3_1_2.Add(self.ImageQuality)
+ sizer_2_3_1.Add(sizer_2_3_1_1, flag=wx.EXPAND)
+ sizer_2_3_1.Add(sizer_2_3_1_2, flag=wx.EXPAND)
+ sizer_2_3.Add(sizer_2_3_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=7)
+
+ sizer_2.Add(sizer_2_1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_2.Add(sizer_2_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_2.Add(sizer_2_3, flag=wx.EXPAND|wx.ALL, border=5)
self.tab_Connection.SetSizerAndFit(sizer_2)
self.tab_Connection.Layout()
## SETTINGS TAB
sizer_3 = wx.BoxSizer(wx.VERTICAL)
sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL)
- sizer_3_1_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_3_1_1.Add(self.DisplayTypeFullscreen, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1_1.Add((16, 0))
- sizer_3_1_1.Add(self.DisplayTypeCustom, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1_1.Add(self.ScreenWidthLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1_1.Add((8,0))
- sizer_3_1_1.Add(self.ScreenWidth, 0, 0, 0)
- sizer_3_1_1.Add((8,0))
- sizer_3_1_1.Add(self.ScreenHeightLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1_1.Add((8,0))
- sizer_3_1_1.Add(self.ScreenHeight, 0, 0, 0)
- sizer_3_1_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_3_1_2.Add((-1,48))
- sizer_3_1_2.Add(self.SetDisplayDPI, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1_2.Add((8,0))
- sizer_3_1_2.Add(self.DisplayDPI, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1.Add(sizer_3_1_1, 0, 0, 0)
- sizer_3_1.Add(sizer_3_1_2, 0, 0, 0)
+ sizer_3_1_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_3_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_3_1_1_1.Add(self.DisplayTypeFullscreen, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_1_1_1.Add((16, 0))
+ sizer_3_1_1_1.Add(self.DisplayTypeCustom, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_1_1_1.Add(self.ScreenWidthLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_1_1_1.Add((8,0))
+ sizer_3_1_1_1.Add(self.ScreenWidth)
+ sizer_3_1_1_1.Add((8,0))
+ sizer_3_1_1_1.Add(self.ScreenHeightLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_1_1_1.Add((8,0))
+ sizer_3_1_1_1.Add(self.ScreenHeight)
+ sizer_3_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_3_1_1_2.Add((-1,48))
+ sizer_3_1_1_2.Add(self.SetDisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_1_1_2.Add((8,0))
+ sizer_3_1_1_2.Add(self.DisplayDPI, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_1_1.Add(sizer_3_1_1_1)
+ sizer_3_1_1.Add(sizer_3_1_1_2)
+ sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Keyboard, wx.VERTICAL)
- sizer_3_2_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_3_2_1.Add(self.CurrentKeyBoard, 0, wx.ALIGN_TOP, 0)
- sizer_3_2_1.Add((0, 32))
- sizer_3_2_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_3_2_2.Add((32,0))
- sizer_3_2_2_1 = wx.BoxSizer(wx.VERTICAL)
- sizer_3_2_2_1.Add(self.KeyboardLayoutLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_2_2_1.Add(self.KeyboardLayout, 0, wx.EXPAND, 0)
- sizer_3_2_2_2 = wx.BoxSizer(wx.VERTICAL)
- sizer_3_2_2_2.Add(self.KeyboardModelLabel, 0, 0, 0)
- sizer_3_2_2_2.Add(self.KeyboardModel, 0, wx.EXPAND, 0)
- sizer_3_2_2.Add(sizer_3_2_2_1, 0, 0, 0)
- sizer_3_2_2.Add((32,0))
- sizer_3_2_2.Add(sizer_3_2_2_2, 0, 0, 0)
- sizer_3_2.Add(sizer_3_2_1, 0, 0, 0)
- sizer_3_2.Add(sizer_3_2_2, 0, 0, 0)
+ sizer_3_2_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_3_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_3_2_1_1.Add(self.CurrentKeyBoard, flag=wx.ALIGN_TOP)
+ sizer_3_2_1_1.Add((0, 32))
+ sizer_3_2_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_3_2_1_2.Add((32,0))
+ sizer_3_2_1_2_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_3_2_1_2_1.Add(self.KeyboardLayoutLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_3_2_1_2_1.Add(self.KeyboardLayout, flag=wx.EXPAND)
+ sizer_3_2_1_2_2 = wx.BoxSizer(wx.VERTICAL)
+ sizer_3_2_1_2_2.Add(self.KeyboardModelLabel)
+ sizer_3_2_1_2_2.Add(self.KeyboardModel, flag=wx.EXPAND)
+ sizer_3_2_1_2.Add(sizer_3_2_1_2_1)
+ sizer_3_2_1_2.Add((32,0))
+ sizer_3_2_1_2.Add(sizer_3_2_1_2_2)
+ sizer_3_2_1.Add(sizer_3_2_1_1)
+ sizer_3_2_1.Add(sizer_3_2_1_2)
+ sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_3_3 = wx.StaticBoxSizer(self.staticbox_Sound, wx.VERTICAL)
sizer_3_3_1 = wx.GridBagSizer(vgap=4, hgap=2)
@@ -546,67 +559,79 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_3_3_1.Add(self.Esd, pos=(3,0), flag=wx.RIGHT, border=16, )
sizer_3_3_1.Add(self.DefaultSoundPort, pos=(1,1), )
sizer_3_3_1_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_3_3_1_1.Add(self.SoundPortLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
+ sizer_3_3_1_1.Add(self.SoundPortLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_3_3_1_1.Add((8, -1))
- sizer_3_3_1_1.Add(self.SoundPort, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
+ sizer_3_3_1_1.Add(self.SoundPort, flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_3_3_1.Add(sizer_3_3_1_1, pos=(2,1), )
- sizer_3_3.Add(sizer_3_3_1, 0, 0, 0)
+ sizer_3_3.Add(sizer_3_3_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_3_4 = wx.StaticBoxSizer(self.staticbox_Printing, wx.VERTICAL)
- sizer_3_4.Add(self.ClientSidePrinting, 0, 0, 0)
+ sizer_3_4.Add(self.ClientSidePrinting, flag=wx.EXPAND|wx.ALL, border=7)
- sizer_3.Add(sizer_3_1, 0, wx.EXPAND, 0)
- sizer_3.Add(sizer_3_2, 1, wx.EXPAND, 0)
- sizer_3.Add(sizer_3_3, 1, wx.EXPAND, 0)
- sizer_3.Add(sizer_3_4, 0, wx.EXPAND, 0)
+ sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_3.Add(sizer_3_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_3.Add(sizer_3_3, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_3.Add(sizer_3_4, flag=wx.EXPAND|wx.ALL, border=5)
self.tab_Settings.SetSizerAndFit(sizer_3)
self.tab_Settings.Layout()
# FOLDERSHARING TAB
sizer_4 = wx.BoxSizer(wx.VERTICAL)
sizer_4_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL)
- sizer_4_1_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_4_1_1.Add(self.UseLocalFolderSharing, 0, 0, 0)
- sizer_4_1_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_4_1_2.Add(self.SharedFolderPathLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_1_2.Add(self.SharedFolderPath, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_1_2.Add(self.SharedFolderPathBrowseButton, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_1_2.Add(self.AddSharedFolderPathButton, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_1_2.Add(self.DeleteSharedFolderPathButton, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_1_3 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_4_1_3.Add(self.SharedFoldersList, 1, wx.EXPAND, 0)
- sizer_4_1_4 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_4_1_4.Add(self.UseEncodingConverter, 0, 0, 0)
- sizer_4_1_5 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_4_1_5.Add(self.ClientEncodingLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_1_5.Add((8,0))
- sizer_4_1_5.Add(self.ClientEncoding, 0, 0, 0)
- sizer_4_1_5.Add((16,0))
- sizer_4_1_5.Add(self.ServerEncodingLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_1_5.Add((8,0))
- sizer_4_1_5.Add(self.ServerEncoding, 0, 0, 0)
- sizer_4_1.Add(sizer_4_1_1, 0, wx.EXPAND, 0)
- sizer_4_1.Add(sizer_4_1_2, 0, wx.EXPAND, 0)
- sizer_4_1.Add(sizer_4_1_3, 0, wx.EXPAND, 0)
- sizer_4_1.Add(sizer_4_1_4, 0, wx.EXPAND, 0)
- sizer_4_1.Add(sizer_4_1_5, 0, wx.EXPAND, 0)
+ sizer_4_1_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_4_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_1_1.Add(self.UseLocalFolderSharing)
+ sizer_4_1_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_1_2_1.Add(self.SharedFolderPathLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_1_1_2_1.Add(self.SharedFolderPath, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT|wx.RIGHT, border=5)
+ sizer_4_1_1_2_1.Add(self.SharedFolderPathBrowseButton, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_1_1_2.Add(sizer_4_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT)
+ sizer_4_1_1_2.Add(sizer_4_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT)
+ sizer_4_1_1_2.Add(sizer_4_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT)
+ sizer_4_1_1_3 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_1_3.Add(self.SharedFoldersList, proportion=1, flag=wx.EXPAND)
+ sizer_4_1_1.Add(sizer_4_1_1_1, flag=wx.EXPAND|wx.BOTTOM, border=12)
+ sizer_4_1_1.Add(sizer_4_1_1_2, flag=wx.EXPAND)
+ sizer_4_1_1.Add(sizer_4_1_1_3, flag=wx.EXPAND|wx.TOP|wx.BOTTOM, border=5)
+ sizer_4_1_2 = wx.BoxSizer(wx.VERTICAL)
+ sizer_4_1_2_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_2_1.Add(self.UseEncodingConverter, flag=wx.BOTTOM, border=5)
+ sizer_4_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_1_2_2.Add(self.ClientEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_1_2_2.Add((8,0))
+ sizer_4_1_2_2.Add(self.ClientEncoding)
+ sizer_4_1_2_2.Add((16,0))
+ sizer_4_1_2_2.Add(self.ServerEncodingLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_1_2_2.Add((8,0))
+ sizer_4_1_2_2.Add(self.ServerEncoding)
+ sizer_4_1_2.Add(sizer_4_1_2_1, flag=wx.EXPAND)
+ sizer_4_1_2.Add(sizer_4_1_2_2, flag=wx.EXPAND)
+ sizer_4_1.Add(sizer_4_1_1, flag=wx.EXPAND|wx.ALL, border=7)
+ sizer_4_1.Add(sizer_4_1_2, flag=wx.EXPAND|wx.ALL, border=7)
sizer_4_2 = wx.StaticBoxSizer(self.staticbox_FileDropbox, wx.VERTICAL)
- sizer_4_2_1 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_4_2_1.Add(self.UseFileDropbox, 0, 0, 0)
- sizer_4_2_2 = wx.BoxSizer(wx.HORIZONTAL)
- sizer_4_2_2.Add(self.FileDropboxExtensionsLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_2_2.Add((8,0))
- sizer_4_2_2.Add(self.FileDropboxExtensions, 0, 0, 0)
- sizer_4_2_2.Add((16,0))
- sizer_4_2_2.Add(self.FileDropboxActionLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_4_2_2.Add((8,0))
- sizer_4_2_2.Add(self.FileDropboxAction, 0, 0, 0)
- sizer_4_2.Add(sizer_4_2_1, 0, wx.EXPAND, 0)
- sizer_4_2.Add(sizer_4_2_2, 0, wx.EXPAND, 0)
-
- sizer_4.Add(sizer_4_1, 0, wx.EXPAND, 0)
- sizer_4.Add(sizer_4_2, 1, wx.EXPAND, 0)
+ sizer_4_2_1 = wx.BoxSizer(wx.VERTICAL)
+ sizer_4_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_2_1_1.Add(self.UseFileDropbox, flag=wx.BOTTOM, border=5)
+ sizer_4_2_1_2 = wx.BoxSizer(wx.HORIZONTAL)
+ sizer_4_2_1_2.Add(self.FileDropboxExtensionsLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_2_1_2.Add((8,0))
+ sizer_4_2_1_2.Add(self.FileDropboxExtensions)
+ sizer_4_2_1_2.Add((16,0))
+ sizer_4_2_1_2.Add(self.FileDropboxActionLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
+ sizer_4_2_1_2.Add((8,0))
+ sizer_4_2_1_2.Add(self.FileDropboxAction)
+ sizer_4_2_1.Add(sizer_4_2_1_1, flag=wx.EXPAND)
+ sizer_4_2_1.Add(sizer_4_2_1_2, flag=wx.EXPAND)
+ sizer_4_2.Add(sizer_4_2_1, flag=wx.EXPAND|wx.ALL, border=7)
+
+ sizer_4.Add(sizer_4_1, flag=wx.EXPAND|wx.ALL, border=5)
+ sizer_4.Add(sizer_4_2, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
self.tab_SharedFilesAndFolders.SetSizerAndFit(sizer_4)
self.tab_SharedFilesAndFolders.Layout()
@@ -618,15 +643,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
# the bottom area with OK, Defaults and Cancel buttons
sizer_B = wx.BoxSizer(wx.HORIZONTAL)
sizer_B_1 = wx.GridSizer(1, 3, 7, 14)
- sizer_B_1.Add(self.OKButton, 0, 0, 0)
- sizer_B_1.Add(self.DefaultButton, 0, 0, 0)
- sizer_B_1.Add(self.CancelButton, 0, 0, 0)
- sizer_B.Add(sizer_B_1, 1, wx.EXPAND, 0)
+ sizer_B_1.Add(self.OKButton)
+ sizer_B_1.Add(self.DefaultButton)
+ sizer_B_1.Add(self.CancelButton)
+ sizer_B.Add(sizer_B_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
# put it all together...
MainSizer = wx.BoxSizer(wx.VERTICAL)
- MainSizer.Add(self.X2goTabs, 1, wx.EXPAND|wx.FIXED_MINSIZE, 0)
- MainSizer.Add(sizer_B, 0, wx.ALIGN_RIGHT, 0)
+ MainSizer.Add(self.X2goTabs, proportion=1, flag=wx.EXPAND|wx.FIXED_MINSIZE)
+ MainSizer.Add(sizer_B, flag=wx.ALIGN_RIGHT)
self.SetSizerAndFit(MainSizer)
max1_x, max1_y = self.tab_Session.GetBestSize()
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